Remove duplicated declarations of interface implementation

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -40,14 +40,14 @@ class Calculation
     /**
      * Instance of this class.
      *
-     * @var \PhpOffice\PhpSpreadsheet\Calculation
+     * @var Calculation
      */
     private static $instance;
 
     /**
      * Instance of the spreadsheet this Calculation Engine is using.
      *
-     * @var PhpSpreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 

src/PhpSpreadsheet/Reader/Csv.php

@@ -6,7 +6,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-class Csv extends BaseReader implements IReader
+class Csv extends BaseReader
 {
     /**
      * Input encoding.

src/PhpSpreadsheet/Reader/Gnumeric.php

@@ -18,7 +18,7 @@ use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use XMLReader;
 
-class Gnumeric extends BaseReader implements IReader
+class Gnumeric extends BaseReader
 {
     /**
      * Shared Expressions.

src/PhpSpreadsheet/Reader/Html.php

@@ -14,7 +14,7 @@ use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 /** PhpSpreadsheet root directory */
-class Html extends BaseReader implements IReader
+class Html extends BaseReader
 {
     /**
      * Sample size to read to determine if it's HTML or not.

src/PhpSpreadsheet/Reader/IReader.php

@@ -4,6 +4,11 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 
 interface IReader
 {
+    /**
+     * IReader constructor.
+     */
+    public function __construct();
+
     /**
      * Can the current IReader read the file?
      *

src/PhpSpreadsheet/Reader/Ods.php

@@ -17,7 +17,7 @@ use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use XMLReader;
 use ZipArchive;
 
-class Ods extends BaseReader implements IReader
+class Ods extends BaseReader
 {
     /**
      * Create a new Ods Reader instance.

src/PhpSpreadsheet/Reader/Slk.php

@@ -8,7 +8,7 @@ use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 
-class Slk extends BaseReader implements IReader
+class Slk extends BaseReader
 {
     /**
      * Input encoding.

src/PhpSpreadsheet/Reader/Xls.php

@@ -58,7 +58,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 //         Patch code for user-defined named cells supports single cells only.
 //         NOTE: this patch only works for BIFF8 as BIFF5-7 use a different
 //         external sheet reference structure
-class Xls extends BaseReader implements IReader
+class Xls extends BaseReader
 {
     // ParseXL definitions
     const XLS_BIFF8 = 0x0600;

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -28,7 +28,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use XMLReader;
 use ZipArchive;
 
-class Xlsx extends BaseReader implements IReader
+class Xlsx extends BaseReader
 {
     /**
      * ReferenceHelper instance.

src/PhpSpreadsheet/Reader/Xml.php

@@ -18,7 +18,7 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
 /**
  * Reader for SpreadsheetML, the XML schema for Microsoft Office Excel 2003.
  */
-class Xml extends BaseReader implements IReader
+class Xml extends BaseReader
 {
     /**
      * Formats.

src/PhpSpreadsheet/Style/Alignment.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Alignment extends Supervisor implements IComparable
+class Alignment extends Supervisor
 {
     // Horizontal alignment styles
     const HORIZONTAL_GENERAL = 'general';

src/PhpSpreadsheet/Style/Border.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Border extends Supervisor implements IComparable
+class Border extends Supervisor
 {
     // Border style
     const BORDER_NONE = 'none';

src/PhpSpreadsheet/Style/Borders.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Borders extends Supervisor implements IComparable
+class Borders extends Supervisor
 {
     // Diagonal directions
     const DIAGONAL_NONE = 0;

src/PhpSpreadsheet/Style/Color.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Color extends Supervisor implements IComparable
+class Color extends Supervisor
 {
     // Colors
     const COLOR_BLACK = 'FF000000';

src/PhpSpreadsheet/Style/Fill.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Fill extends Supervisor implements IComparable
+class Fill extends Supervisor
 {
     // Fill types
     const FILL_NONE = 'none';

src/PhpSpreadsheet/Style/Font.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Font extends Supervisor implements IComparable
+class Font extends Supervisor
 {
     // Underline types
     const UNDERLINE_NONE = 'none';

src/PhpSpreadsheet/Style/NumberFormat.php

@@ -4,11 +4,10 @@ namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
-class NumberFormat extends Supervisor implements IComparable
+class NumberFormat extends Supervisor
 {
     // Pre-defined formats
     const FORMAT_GENERAL = 'General';

src/PhpSpreadsheet/Style/Protection.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Protection extends Supervisor implements IComparable
+class Protection extends Supervisor
 {
     /** Protection styles */
     const PROTECTION_INHERIT = 'inherit';

src/PhpSpreadsheet/Style/Style.php

@@ -3,10 +3,9 @@
 namespace PhpOffice\PhpSpreadsheet\Style;
 
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
-use PhpOffice\PhpSpreadsheet\IComparable;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-class Style extends Supervisor implements IComparable
+class Style extends Supervisor
 {
     /**
      * Font.

src/PhpSpreadsheet/Style/Supervisor.php

@@ -2,7 +2,9 @@
 
 namespace PhpOffice\PhpSpreadsheet\Style;
 
-abstract class Supervisor
+use PhpOffice\PhpSpreadsheet\IComparable;
+
+abstract class Supervisor implements IComparable
 {
     /**
      * Supervisor?

src/PhpSpreadsheet/Worksheet/CellIterator.php

@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
-abstract class CellIterator
+abstract class CellIterator implements \Iterator
 {
     /**
      * Worksheet to iterate.

src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php

@@ -5,7 +5,7 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
-class ColumnCellIterator extends CellIterator implements \Iterator
+class ColumnCellIterator extends CellIterator
 {
     /**
      * Column index.

src/PhpSpreadsheet/Worksheet/Drawing.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class Drawing extends BaseDrawing implements IComparable
+class Drawing extends BaseDrawing
 {
     /**
      * Path.

src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php

@@ -3,9 +3,8 @@
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
-use PhpOffice\PhpSpreadsheet\IComparable;
 
-class HeaderFooterDrawing extends Drawing implements IComparable
+class HeaderFooterDrawing extends Drawing
 {
     /**
      * Path.

src/PhpSpreadsheet/Worksheet/MemoryDrawing.php

@@ -2,9 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Worksheet;
 
-use PhpOffice\PhpSpreadsheet\IComparable;
+class MemoryDrawing extends BaseDrawing
-
-class MemoryDrawing extends BaseDrawing implements IComparable
 {
     // Rendering functions
     const RENDERING_DEFAULT = 'imagepng';

src/PhpSpreadsheet/Worksheet/RowCellIterator.php

@@ -5,7 +5,7 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
-class RowCellIterator extends CellIterator implements \Iterator
+class RowCellIterator extends CellIterator
 {
     /**
      * Row index.

src/PhpSpreadsheet/Writer/Csv.php

@@ -5,12 +5,12 @@ namespace PhpOffice\PhpSpreadsheet\Writer;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
-class Csv extends BaseWriter implements IWriter
+class Csv extends BaseWriter
 {
     /**
      * PhpSpreadsheet object.
      *
-     * @var PhpSpreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 

src/PhpSpreadsheet/Writer/Html.php

@@ -24,7 +24,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
-class Html extends BaseWriter implements IWriter
+class Html extends BaseWriter
 {
     /**
      * Spreadsheet object.

src/PhpSpreadsheet/Writer/Ods.php

@@ -14,7 +14,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Ods\Styles;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Thumbnails;
 use ZipArchive;
 
-class Ods extends BaseWriter implements IWriter
+class Ods extends BaseWriter
 {
     /**
      * Private writer parts.
@@ -26,7 +26,7 @@ class Ods extends BaseWriter implements IWriter
     /**
      * Private PhpSpreadsheet.
      *
-     * @var PhpSpreadsheet
+     * @var Spreadsheet
      */
     private $spreadSheet;
 

src/PhpSpreadsheet/Writer/Pdf.php

@@ -8,7 +8,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
-abstract class Pdf extends Html implements IWriter
+abstract class Pdf extends Html
 {
     /**
      * Temporary storage directory.

src/PhpSpreadsheet/Writer/Pdf/Dompdf.php

@@ -3,10 +3,9 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
-use PhpOffice\PhpSpreadsheet\Writer\IWriter;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
-class Dompdf extends Pdf implements IWriter
+class Dompdf extends Pdf
 {
     /**
      * Save Spreadsheet to file.

src/PhpSpreadsheet/Writer/Pdf/Mpdf.php

@@ -4,10 +4,9 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
-use PhpOffice\PhpSpreadsheet\Writer\IWriter;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
-class Mpdf extends Pdf implements IWriter
+class Mpdf extends Pdf
 {
     /**
      * Save Spreadsheet to file.

src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php

@@ -3,10 +3,9 @@
 namespace PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
-use PhpOffice\PhpSpreadsheet\Writer\IWriter;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
-class Tcpdf extends Pdf implements IWriter
+class Tcpdf extends Pdf
 {
     /**
      * Save Spreadsheet to file.

src/PhpSpreadsheet/Writer/Xls.php

@@ -25,7 +25,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
 use RuntimeException;
 
-class Xls extends BaseWriter implements IWriter
+class Xls extends BaseWriter
 {
     /**
      * PhpSpreadsheet object.

src/PhpSpreadsheet/Writer/Xlsx.php

@@ -25,7 +25,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Workbook;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet;
 use ZipArchive;
 
-class Xlsx extends BaseWriter implements IWriter
+class Xlsx extends BaseWriter
 {
     /**
      * Office2003 compatibility.