PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
     /**
      * Return the current cell in this worksheet column
      *
-     * @return Row
+     * @return null|\PhpSpreadsheet\Cell
      */
     public function current()
     {

src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php

Doc Comments +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
     /**
      * Set Color
      *
-     * @param    \PhpSpreadsheet\Style_Color $pValue
+     * @param    \PhpSpreadsheet\Style\Color $pValue
      * @throws   \PhpSpreadsheet\Exception
      * @return   Shadow
      */

src/PhpSpreadsheet/Writer/CSV.php

Doc Comments +1 added lines, -1 removed lines

@@ -311,7 +311,7 @@
     /**
      * Write line to CSV file
      *
-     * @param    mixed    $pFileHandle    PHP filehandle
+     * @param    resource    $pFileHandle    PHP filehandle
      * @param    array    $pValues        Array containing values in a row
      * @throws    Exception
      */

Spacing +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@
         }
 
         if ($this->excelCompatibility) {
-            $this->setUseBOM(true);                //  Enforce UTF-8 BOM Header
-            $this->setIncludeSeparatorLine(true);  //  Set separator line
-            $this->setEnclosure('"');              //  Set enclosure to "
-            $this->setDelimiter(';');              //  Set delimiter to a semi-colon
+            $this->setUseBOM(true); //  Enforce UTF-8 BOM Header
+            $this->setIncludeSeparatorLine(true); //  Set separator line
+            $this->setEnclosure('"'); //  Set enclosure to "
+            $this->setDelimiter(';'); //  Set delimiter to a semi-colon
             $this->setLineEnding("\r\n");
         }
         if ($this->useBOM) {

src/PhpSpreadsheet/Writer/Excel2007.php

Doc Comments +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
     /**
      * Get PhpSpreadsheet object
      *
-     * @return PhpSpreadsheet
+     * @return \PhpSpreadsheet\Spreadsheet
      * @throws \PhpSpreadsheet\Writer\Exception
      */
     public function getPhpSpreadsheet()

Indentation +2 added lines, -2 removed lines

@@ -138,8 +138,8 @@
         }
 
         $hashTablesArray = ['stylesConditionalHashTable',    'fillHashTable',        'fontHashTable',
-                                  'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
-                                  'styleHashTable',
+                                    'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
+                                    'styleHashTable',
                                 ];
 
         // Set HashTable variables

Spacing +4 added lines, -4 removed lines

@@ -137,8 +137,8 @@ 
             $this->writerParts[$writer] = new $class($this);
         }
 
-        $hashTablesArray = ['stylesConditionalHashTable',    'fillHashTable',        'fontHashTable',
-                                  'bordersHashTable',                'numFmtHashTable',        'drawingHashTable',
+        $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
+                                  'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
                                   'styleHashTable',
                                 ];
 
@@ -235,7 +235,7 @@ 
                 $macrosCode = $this->spreadSheet->getMacrosCode();
                 if (!is_null($macrosCode)) {
                     // we have the code ?
-                    $objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin
+                    $objZip->addFromString('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
                     if ($this->spreadSheet->hasMacrosCertificate()) {
                         //signed macros ?
                         // Yes : add the certificate file and the related rels file
@@ -250,7 +250,7 @@ 
                 $objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
                 if ($this->spreadSheet->hasRibbonBinObjects()) {
                     $tmpRootPath = dirname($tmpRibbonTarget) . '/';
-                    $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data');//the files to write
+                    $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
                     foreach ($ribbonBinObjects as $aPath => $aContent) {
                         $objZip->addFromString($tmpRootPath . $aPath, $aContent);
                     }

src/PhpSpreadsheet/Writer/Excel2007/Chart.php

Doc Comments +6 added lines, -1 removed lines

@@ -411,6 +411,8 @@ 
      * @param  string $id1
      * @param  string $id2
      * @param  boolean $isMultiLevelSeries
+     * @param null|Axis $xAxis
+     * @param null|Axis $yAxis
      *
      * @throws  \PhpSpreadsheet\Writer\Exception
      */
@@ -533,6 +535,10 @@ 
      * @param  string $id1
      * @param  string $id2
      * @param  boolean $isMultiLevelSeries
+     * @param null|Axis $xAxis
+     * @param null|Axis $yAxis
+     * @param null|GridLines $majorGridlines
+     * @param null|GridLines $minorGridlines
      *
      * @throws  \PhpSpreadsheet\Writer\Exception
      */
@@ -1259,7 +1265,6 @@ 
      * @param  \PhpSpreadsheet\Shared\XMLWriter $objWriter XML Writer
      * @param  string $groupType Type of plot for dataseries
      * @param  string $dataType Datatype of series values
-     * @param  \PhpSpreadsheet\Worksheet $pSheet
      *
      * @throws  \PhpSpreadsheet\Writer\Exception
      */

src/PhpSpreadsheet/Writer/Excel5/Workbook.php

Doc Comments +5 added lines, -2 removed lines

@@ -191,7 +191,9 @@ 
      * @param int        &$str_unique    Total number of unique strings
      * @param array        &$str_table        String Table
      * @param array        &$colors        Colour Table
-     * @param mixed        $parser            The formula parser created for the Workbook
+     * @param Parser        $parser            The formula parser created for the Workbook
+     * @param integer $str_total
+     * @param integer $str_unique
      */
     public function __construct(\PhpSpreadsheet\Spreadsheet $spreadsheet, &$str_total, &$str_unique, &$str_table, &$colors, $parser)
     {
@@ -238,6 +240,7 @@ 
      *
      * @param \PhpSpreadsheet\Style
      * @param boolean Is it a style XF?
+     * @param \PhpSpreadsheet\Style $style
      * @return int Index to XF record
      */
     public function addXfWriter($style, $isStyleXf = false)
@@ -790,7 +793,7 @@ 
      *
      * @param    string        $name            The name in UTF-8
      * @param    string        $formulaData    The binary formula data
-     * @param    string        $sheetIndex        1-based sheet index the defined name applies to. 0 = global
+     * @param    integer        $sheetIndex        1-based sheet index the defined name applies to. 0 = global
      * @param    boolean        $isBuiltIn        Built-in name?
      * @return    string    Complete binary record data
      */

Spacing +76 added lines, -76 removed lines

@@ -219,11 +219,11 @@ 
         for ($i = 0; $i < $countSheets; ++$i) {
             $phpSheet = $spreadsheet->getSheet($i);
 
-            $this->parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
+            $this->parser->setExtSheet($phpSheet->getTitle(), $i); // Register worksheet name with parser
 
             $supbook_index = 0x00;
             $ref = pack('vvv', $supbook_index, $i, $i);
-            $this->parser->references[] = $ref;  // Register reference with parser
+            $this->parser->references[] = $ref; // Register reference with parser
 
             // Sheet tab colors?
             if ($phpSheet->isTabColorSet()) {
@@ -467,7 +467,7 @@ 
      */
     private function calcSheetOffsets()
     {
-        $boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
+        $boundsheet_length = 10; // fixed length for a BOUNDSHEET record
 
         // size of Workbook globals part 1 + 3
         $offset = $this->_datasize;
@@ -831,7 +831,7 @@ 
         $record = 0x0018;
 
         // option flags
-        $options = ($isHidden  ? 0x21 : 0x00);
+        $options = ($isHidden ? 0x21 : 0x00);
 
         $extra = pack(
             'Cvvvvv',
@@ -861,9 +861,9 @@ 
      */
     private function writeCodepage()
     {
-        $record = 0x0042;             // Record identifier
-        $length = 0x0002;             // Number of bytes to follow
-        $cv = $this->codepage;   // The code page
+        $record = 0x0042; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
+        $cv = $this->codepage; // The code page
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $cv);
@@ -876,24 +876,24 @@ 
      */
     private function writeWindow1()
     {
-        $record = 0x003D;   // Record identifier
-        $length = 0x0012;   // Number of bytes to follow
+        $record = 0x003D; // Record identifier
+        $length = 0x0012; // Number of bytes to follow
 
-        $xWn = 0x0000;     // Horizontal position of window
-        $yWn = 0x0000;     // Vertical position of window
-        $dxWn = 0x25BC;     // Width of window
-        $dyWn = 0x1572;     // Height of window
+        $xWn = 0x0000; // Horizontal position of window
+        $yWn = 0x0000; // Vertical position of window
+        $dxWn = 0x25BC; // Width of window
+        $dyWn = 0x1572; // Height of window
 
-        $grbit = 0x0038;    // Option flags
+        $grbit = 0x0038; // Option flags
 
         // not supported by PhpSpreadsheet, so there is only one selected sheet, the active
-        $ctabsel = 1;       // Number of workbook tabs selected
+        $ctabsel = 1; // Number of workbook tabs selected
 
-        $wTabRatio = 0x0258;    // Tab to scrollbar ratio
+        $wTabRatio = 0x0258; // Tab to scrollbar ratio
 
         // not supported by PhpSpreadsheet, set to 0
-        $itabFirst = 0;     // 1st displayed worksheet
-        $itabCur = $this->spreadsheet->getActiveSheetIndex();    // Active worksheet
+        $itabFirst = 0; // 1st displayed worksheet
+        $itabCur = $this->spreadsheet->getActiveSheetIndex(); // Active worksheet
 
         $header = pack('vv', $record, $length);
         $data = pack('vvvvvvvvv', $xWn, $yWn, $dxWn, $dyWn, $grbit, $itabCur, $itabFirst, $ctabsel, $wTabRatio);
@@ -909,7 +909,7 @@ 
     private function writeBoundSheet($sheet, $offset)
     {
         $sheetname = $sheet->getTitle();
-        $record = 0x0085;                    // Record identifier
+        $record = 0x0085; // Record identifier
 
         // sheet state
         switch ($sheet->getSheetState()) {
@@ -930,7 +930,7 @@ 
         // sheet type
         $st = 0x00;
 
-        $grbit = 0x0000;                    // Visibility and sheet type
+        $grbit = 0x0000; // Visibility and sheet type
 
         $data = pack('VCC', $offset, $ss, $st);
         $data .= \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeShort($sheetname);
@@ -945,8 +945,8 @@ 
      */
     private function writeSupbookInternal()
     {
-        $record = 0x01AE;   // Record identifier
-        $length = 0x0004;   // Bytes to follow
+        $record = 0x01AE; // Record identifier
+        $length = 0x0004; // Bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', $this->spreadsheet->getSheetCount(), 0x0401);
@@ -961,10 +961,10 @@ 
     private function writeExternalsheetBiff8()
     {
         $totalReferences = count($this->parser->references);
-        $record = 0x0017;                     // Record identifier
-        $length = 2 + 6 * $totalReferences;  // Number of bytes to follow
+        $record = 0x0017; // Record identifier
+        $length = 2 + 6 * $totalReferences; // Number of bytes to follow
 
-        $supbook_index = 0;           // FIXME: only using internal SUPBOOK record
+        $supbook_index = 0; // FIXME: only using internal SUPBOOK record
         $header = pack('vv', $record, $length);
         $data = pack('v', $totalReferences);
         for ($i = 0; $i < $totalReferences; ++$i) {
@@ -979,12 +979,12 @@ 
      */
     private function writeStyle()
     {
-        $record = 0x0293;   // Record identifier
-        $length = 0x0004;   // Bytes to follow
+        $record = 0x0293; // Record identifier
+        $length = 0x0004; // Bytes to follow
 
-        $ixfe = 0x8000;  // Index to cell style XF
-        $BuiltIn = 0x00;     // Built-in style
-        $iLevel = 0xff;     // Outline style level
+        $ixfe = 0x8000; // Index to cell style XF
+        $BuiltIn = 0x00; // Built-in style
+        $iLevel = 0xff; // Outline style level
 
         $header = pack('vv', $record, $length);
         $data = pack('vCC', $ixfe, $BuiltIn, $iLevel);
@@ -999,10 +999,10 @@ 
      */
     private function writeNumberFormat($format, $ifmt)
     {
-        $record = 0x041E;    // Record identifier
+        $record = 0x041E; // Record identifier
 
         $numberFormatString = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($format);
-        $length = 2 + strlen($numberFormatString);    // Number of bytes to follow
+        $length = 2 + strlen($numberFormatString); // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $ifmt) . $numberFormatString;
@@ -1014,12 +1014,12 @@ 
      */
     private function writeDateMode()
     {
-        $record = 0x0022;   // Record identifier
-        $length = 0x0002;   // Bytes to follow
+        $record = 0x0022; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
         $f1904 = (\PhpSpreadsheet\Shared\Date::getExcelCalendar() == \PhpSpreadsheet\Shared\Date::CALENDAR_MAC_1904)
             ? 1
-            : 0;   // Flag for 1904 date system
+            : 0; // Flag for 1904 date system
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $f1904);
@@ -1040,8 +1040,8 @@ 
      */
     private function writeExternalCount($cxals)
     {
-        $record = 0x0016;   // Record identifier
-        $length = 0x0002;   // Number of bytes to follow
+        $record = 0x0016; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $cxals);
@@ -1059,11 +1059,11 @@ 
      */
     private function writeExternalSheet($sheetname)
     {
-        $record = 0x0017;                     // Record identifier
-        $length = 0x02 + strlen($sheetname);  // Number of bytes to follow
+        $record = 0x0017; // Record identifier
+        $length = 0x02 + strlen($sheetname); // Number of bytes to follow
 
-        $cch = strlen($sheetname);         // Length of sheet name
-        $rgch = 0x03;                       // Filename encoding
+        $cch = strlen($sheetname); // Length of sheet name
+        $rgch = 0x03; // Filename encoding
 
         $header = pack('vv', $record, $length);
         $data = pack('CC', $cch, $rgch);
@@ -1083,20 +1083,20 @@ 
      */
     private function writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
     {
-        $record = 0x0018;       // Record identifier
-        $length = 0x0024;       // Number of bytes to follow
-
-        $grbit = 0x0020;       // Option flags
-        $chKey = 0x00;         // Keyboard shortcut
-        $cch = 0x01;         // Length of text name
-        $cce = 0x0015;       // Length of text definition
-        $ixals = $index + 1;   // Sheet index
-        $itab = $ixals;       // Equal to ixals
-        $cchCustMenu = 0x00;         // Length of cust menu text
-        $cchDescription = 0x00;         // Length of description text
-        $cchHelptopic = 0x00;         // Length of help topic text
-        $cchStatustext = 0x00;         // Length of status bar text
-        $rgch = $type;        // Built-in name type
+        $record = 0x0018; // Record identifier
+        $length = 0x0024; // Number of bytes to follow
+
+        $grbit = 0x0020; // Option flags
+        $chKey = 0x00; // Keyboard shortcut
+        $cch = 0x01; // Length of text name
+        $cce = 0x0015; // Length of text definition
+        $ixals = $index + 1; // Sheet index
+        $itab = $ixals; // Equal to ixals
+        $cchCustMenu = 0x00; // Length of cust menu text
+        $cchDescription = 0x00; // Length of description text
+        $cchHelptopic = 0x00; // Length of help topic text
+        $cchStatustext = 0x00; // Length of status bar text
+        $rgch = $type; // Built-in name type
 
         $unknown03 = 0x3b;
         $unknown04 = 0xffff - $index;
@@ -1147,19 +1147,19 @@ 
      */
     private function writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
     {
-        $record = 0x0018;       // Record identifier
-        $length = 0x003d;       // Number of bytes to follow
-        $grbit = 0x0020;       // Option flags
-        $chKey = 0x00;         // Keyboard shortcut
-        $cch = 0x01;         // Length of text name
-        $cce = 0x002e;       // Length of text definition
-        $ixals = $index + 1;   // Sheet index
-        $itab = $ixals;       // Equal to ixals
-        $cchCustMenu = 0x00;         // Length of cust menu text
-        $cchDescription = 0x00;         // Length of description text
-        $cchHelptopic = 0x00;         // Length of help topic text
-        $cchStatustext = 0x00;         // Length of status bar text
-        $rgch = $type;        // Built-in name type
+        $record = 0x0018; // Record identifier
+        $length = 0x003d; // Number of bytes to follow
+        $grbit = 0x0020; // Option flags
+        $chKey = 0x00; // Keyboard shortcut
+        $cch = 0x01; // Length of text name
+        $cce = 0x002e; // Length of text definition
+        $ixals = $index + 1; // Sheet index
+        $itab = $ixals; // Equal to ixals
+        $cchCustMenu = 0x00; // Length of cust menu text
+        $cchDescription = 0x00; // Length of description text
+        $cchHelptopic = 0x00; // Length of help topic text
+        $cchStatustext = 0x00; // Length of status bar text
+        $rgch = $type; // Built-in name type
 
         $unknown01 = 0x29;
         $unknown02 = 0x002b;
@@ -1222,8 +1222,8 @@ 
      */
     private function writeCountry()
     {
-        $record = 0x008C;    // Record identifier
-        $length = 4;         // Number of bytes to follow
+        $record = 0x008C; // Record identifier
+        $length = 4; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         /* using the same country code always for simplicity */
@@ -1239,8 +1239,8 @@ 
      */
     private function writeRecalcId()
     {
-        $record = 0x01C1;    // Record identifier
-        $length = 8;         // Number of bytes to follow
+        $record = 0x01C1; // Record identifier
+        $length = 8; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
 
@@ -1257,10 +1257,10 @@ 
     {
         $aref = $this->palette;
 
-        $record = 0x0092;                // Record identifier
-        $length = 2 + 4 * count($aref);  // Number of bytes to follow
-        $ccv = count($aref);          // Number of RGB values to follow
-        $data = '';                      // The RGB data
+        $record = 0x0092; // Record identifier
+        $length = 2 + 4 * count($aref); // Number of bytes to follow
+        $ccv = count($aref); // Number of RGB values to follow
+        $data = ''; // The RGB data
 
         // Pack the RGB data
         foreach ($aref as $color) {

src/PhpSpreadsheet/Writer/OpenDocument.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
      * Get writer part
      *
      * @param  string  $pPartName  Writer part name
-     * @return \PhpSpreadsheet\Writer\Excel2007\WriterPart
+     * @return OpenDocument\WriterPart|null
      */
     public function getWriterPart($pPartName = '')
     {
@@ -179,7 +179,7 @@ 
      *
      * @param  \PhpSpreadsheet\Spreadsheet $spreadsheet  PhpSpreadsheet object
      * @throws \PhpSpreadsheet\Writer\Exception
-     * @return Excel2007
+     * @return OpenDocument
      */
     public function setPhpSpreadsheet(\PhpSpreadsheet\SpreadSheet $spreadsheet = null)
     {

src/PhpSpreadsheet/Shared/CodePage.php

Spacing +52 added lines, -52 removed lines

@@ -40,117 +40,117 @@
     {
         switch ($codePage) {
             case 367:
-                return 'ASCII';    //    ASCII
+                return 'ASCII'; //    ASCII
             case 437:
-                return 'CP437';    //    OEM US
+                return 'CP437'; //    OEM US
             case 720:
-                throw new \PhpSpreadsheet\Exception('Code page 720 not supported.');    //    OEM Arabic
+                throw new \PhpSpreadsheet\Exception('Code page 720 not supported.'); //    OEM Arabic
             case 737:
-                return 'CP737';    //    OEM Greek
+                return 'CP737'; //    OEM Greek
             case 775:
-                return 'CP775';    //    OEM Baltic
+                return 'CP775'; //    OEM Baltic
             case 850:
-                return 'CP850';    //    OEM Latin I
+                return 'CP850'; //    OEM Latin I
             case 852:
-                return 'CP852';    //    OEM Latin II (Central European)
+                return 'CP852'; //    OEM Latin II (Central European)
             case 855:
-                return 'CP855';    //    OEM Cyrillic
+                return 'CP855'; //    OEM Cyrillic
             case 857:
-                return 'CP857';    //    OEM Turkish
+                return 'CP857'; //    OEM Turkish
             case 858:
-                return 'CP858';    //    OEM Multilingual Latin I with Euro
+                return 'CP858'; //    OEM Multilingual Latin I with Euro
             case 860:
-                return 'CP860';    //    OEM Portugese
+                return 'CP860'; //    OEM Portugese
             case 861:
-                return 'CP861';    //    OEM Icelandic
+                return 'CP861'; //    OEM Icelandic
             case 862:
-                return 'CP862';    //    OEM Hebrew
+                return 'CP862'; //    OEM Hebrew
             case 863:
-                return 'CP863';    //    OEM Canadian (French)
+                return 'CP863'; //    OEM Canadian (French)
             case 864:
-                return 'CP864';    //    OEM Arabic
+                return 'CP864'; //    OEM Arabic
             case 865:
-                return 'CP865';    //    OEM Nordic
+                return 'CP865'; //    OEM Nordic
             case 866:
-                return 'CP866';    //    OEM Cyrillic (Russian)
+                return 'CP866'; //    OEM Cyrillic (Russian)
             case 869:
-                return 'CP869';    //    OEM Greek (Modern)
+                return 'CP869'; //    OEM Greek (Modern)
             case 874:
-                return 'CP874';    //    ANSI Thai
+                return 'CP874'; //    ANSI Thai
             case 932:
-                return 'CP932';    //    ANSI Japanese Shift-JIS
+                return 'CP932'; //    ANSI Japanese Shift-JIS
             case 936:
-                return 'CP936';    //    ANSI Chinese Simplified GBK
+                return 'CP936'; //    ANSI Chinese Simplified GBK
             case 949:
-                return 'CP949';    //    ANSI Korean (Wansung)
+                return 'CP949'; //    ANSI Korean (Wansung)
             case 950:
-                return 'CP950';    //    ANSI Chinese Traditional BIG5
+                return 'CP950'; //    ANSI Chinese Traditional BIG5
             case 1200:
                 return 'UTF-16LE'; //    UTF-16 (BIFF8)
             case 1250:
-                return 'CP1250';   //    ANSI Latin II (Central European)
+                return 'CP1250'; //    ANSI Latin II (Central European)
             case 1251:
-                return 'CP1251';   //    ANSI Cyrillic
+                return 'CP1251'; //    ANSI Cyrillic
             case 0:
                 //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
             case 1252:
-                return 'CP1252';   //    ANSI Latin I (BIFF4-BIFF7)
+                return 'CP1252'; //    ANSI Latin I (BIFF4-BIFF7)
             case 1253:
-                return 'CP1253';   //    ANSI Greek
+                return 'CP1253'; //    ANSI Greek
             case 1254:
-                return 'CP1254';   //    ANSI Turkish
+                return 'CP1254'; //    ANSI Turkish
             case 1255:
-                return 'CP1255';   //    ANSI Hebrew
+                return 'CP1255'; //    ANSI Hebrew
             case 1256:
-                return 'CP1256';   //    ANSI Arabic
+                return 'CP1256'; //    ANSI Arabic
             case 1257:
-                return 'CP1257';   //    ANSI Baltic
+                return 'CP1257'; //    ANSI Baltic
             case 1258:
-                return 'CP1258';   //    ANSI Vietnamese
+                return 'CP1258'; //    ANSI Vietnamese
             case 1361:
-                return 'CP1361';   //    ANSI Korean (Johab)
+                return 'CP1361'; //    ANSI Korean (Johab)
             case 10000:
-                return 'MAC';      //    Apple Roman
+                return 'MAC'; //    Apple Roman
             case 10001:
-                return 'CP932';    //    Macintosh Japanese
+                return 'CP932'; //    Macintosh Japanese
             case 10002:
-                return 'CP950';    //    Macintosh Chinese Traditional
+                return 'CP950'; //    Macintosh Chinese Traditional
             case 10003:
-                return 'CP1361';   //    Macintosh Korean
+                return 'CP1361'; //    Macintosh Korean
             case 10004:
                 return 'MACARABIC'; //    Apple Arabic
             case 10005:
                 return 'MACHEBREW'; //    Apple Hebrew
             case 10006:
-                return 'MACGREEK';  //    Macintosh Greek
+                return 'MACGREEK'; //    Macintosh Greek
             case 10007:
-                return 'MACCYRILLIC';  //    Macintosh Cyrillic
+                return 'MACCYRILLIC'; //    Macintosh Cyrillic
             case 10008:
-                return 'CP936';  //    Macintosh - Simplified Chinese (GB 2312)
+                return 'CP936'; //    Macintosh - Simplified Chinese (GB 2312)
             case 10010:
-                return 'MACROMANIA';    //    Macintosh Romania
+                return 'MACROMANIA'; //    Macintosh Romania
             case 10017:
-                return 'MACUKRAINE';    //    Macintosh Ukraine
+                return 'MACUKRAINE'; //    Macintosh Ukraine
             case 10021:
-                return 'MACTHAI';    //    Macintosh Thai
+                return 'MACTHAI'; //    Macintosh Thai
             case 10029:
-                return 'MACCENTRALEUROPE';  //    Macintosh Central Europe
+                return 'MACCENTRALEUROPE'; //    Macintosh Central Europe
             case 10079:
-                return 'MACICELAND';  //    Macintosh Icelandic
+                return 'MACICELAND'; //    Macintosh Icelandic
             case 10081:
-                return 'MACTURKISH';  //    Macintosh Turkish
+                return 'MACTURKISH'; //    Macintosh Turkish
             case 10082:
-                return 'MACCROATIAN';    //    Macintosh Croatian
+                return 'MACCROATIAN'; //    Macintosh Croatian
             case 21010:
-                return 'UTF-16LE';  //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
+                return 'UTF-16LE'; //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
             case 32768:
-                return 'MAC';      //    Apple Roman
+                return 'MAC'; //    Apple Roman
             case 32769:
-                throw new \PhpSpreadsheet\Exception('Code page 32769 not supported.');  //    ANSI Latin I (BIFF2-BIFF3)
+                throw new \PhpSpreadsheet\Exception('Code page 32769 not supported.'); //    ANSI Latin I (BIFF2-BIFF3)
             case 65000:
-                return 'UTF-7';    //    Unicode (UTF-7)
+                return 'UTF-7'; //    Unicode (UTF-7)
             case 65001:
-                return 'UTF-8';    //    Unicode (UTF-8)
+                return 'UTF-8'; //    Unicode (UTF-8)
         }
         throw new \PhpSpreadsheet\Exception('Unknown codepage: ' . $codePage);
     }

src/PhpSpreadsheet/Calculation/DateTime.php

Doc Comments +18 added lines, -26 removed lines

@@ -460,7 +460,7 @@ 
      *        DATEVALUE(dateValue)
      *
      * @category Date/Time Functions
-     * @param    string    $dateValue        Text that represents a date in a Microsoft Excel date format.
+     * @param    integer    $dateValue        Text that represents a date in a Microsoft Excel date format.
      *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
      *                                    quotation marks that represent dates. Using the default date
      *                                    system in Excel for Windows, date_text must represent a date from
@@ -644,9 +644,9 @@ 
     /**
      * DATEDIF
      *
-     * @param    mixed    $startDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
+     * @param    integer    $startDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
-     * @param    mixed    $endDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
+     * @param    integer    $endDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
      * @param    string    $unit
      * @return    int    Interval between the dates
@@ -757,9 +757,9 @@ 
      *        DAYS360(startDate,endDate[,method])
      *
      * @category Date/Time Functions
-     * @param    mixed        $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer        $startDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param    mixed        $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer        $endDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
      * @param    bool        $method            US or European Method
      *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
@@ -816,9 +816,9 @@ 
      *        YEARFRAC(startDate,endDate[,method])
      *
      * @category Date/Time Functions
-     * @param    mixed    $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $startDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param    mixed    $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $endDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @param    int    $method            Method used for the calculation
      *                                        0 or omitted    US (NASD) 30/360
@@ -918,10 +918,6 @@ 
      *                                            PHP DateTime object, or a standard date string
      * @param    mixed            $endDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                            PHP DateTime object, or a standard date string
-     * @param    mixed            $holidays,...    Optional series of Excel date serial value (float), PHP date
-     *                                            timestamp (integer), PHP DateTime object, or a standard date
-     *                                            strings that will be excluded from the working calendar, such
-     *                                            as state and federal holidays and floating holidays.
      * @return    int            Interval between the dates
      */
     public static function NETWORKDAYS($startDate, $endDate)
@@ -1003,10 +999,6 @@ 
      * @param    int        $endDays        The number of nonweekend and nonholiday days before or after
      *                                        startDate. A positive value for days yields a future date; a
      *                                        negative value yields a past date.
-     * @param    mixed        $holidays,...    Optional series of Excel date serial value (float), PHP date
-     *                                        timestamp (integer), PHP DateTime object, or a standard date
-     *                                        strings that will be excluded from the working calendar, such
-     *                                        as state and federal holidays and floating holidays.
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
@@ -1110,7 +1102,7 @@ 
      * Excel Function:
      *        DAY(dateValue)
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Day of the month
      */
@@ -1143,7 +1135,7 @@ 
      * Excel Function:
      *        WEEKDAY(dateValue[,style])
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @param    int        $style            A number that determines the type of return value
      *                                        1 or omitted    Numbers 1 (Sunday) through 7 (Saturday).
@@ -1219,9 +1211,9 @@ 
      * Excel Function:
      *        WEEKNUM(dateValue[,style])
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param    bool    $method            Week begins on Sunday or Monday
+     * @param    integer    $method            Week begins on Sunday or Monday
      *                                        1 or omitted    Week begins on Sunday.
      *                                        2                Week begins on Monday.
      * @return    int        Week Number
@@ -1267,7 +1259,7 @@ 
      * Excel Function:
      *        MONTH(dateValue)
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Month of the year
      */
@@ -1299,7 +1291,7 @@ 
      * Excel Function:
      *        YEAR(dateValue)
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Year
      */
@@ -1330,7 +1322,7 @@ 
      * Excel Function:
      *        HOUR(timeValue)
      *
-     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Hour
      */
@@ -1370,7 +1362,7 @@ 
      * Excel Function:
      *        MINUTE(timeValue)
      *
-     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Minute
      */
@@ -1410,7 +1402,7 @@ 
      * Excel Function:
      *        SECOND(timeValue)
      *
-     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Second
      */
@@ -1452,7 +1444,7 @@ 
      * Excel Function:
      *        EDATE(dateValue,adjustmentMonths)
      *
-     * @param    mixed    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
      * @param    int        $adjustmentMonths    The number of months before or after start_date.
      *                                        A positive value for months yields a future date;
@@ -1497,7 +1489,7 @@ 
      * Excel Function:
      *        EOMONTH(dateValue,adjustmentMonths)
      *
-     * @param    mixed    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
      * @param    int        $adjustmentMonths    The number of months before or after start_date.
      *                                        A positive value for months yields a future date;

Spacing +3 added lines, -3 removed lines

@@ -424,7 +424,7 @@ 
 
                 return (float) \PhpSpreadsheet\Shared\Date::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
             case Functions::RETURNDATE_PHP_NUMERIC:
-                return (integer) \PhpSpreadsheet\Shared\Date::excelToTimestamp(\PhpSpreadsheet\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));    // -2147468400; //    -2147472000 + 3600
+                return (integer) \PhpSpreadsheet\Shared\Date::excelToTimestamp(\PhpSpreadsheet\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
             case Functions::RETURNDATE_PHP_OBJECT:
                 $dayAdjust = 0;
                 if ($hour < 0) {
@@ -1036,7 +1036,7 @@ 
 
         $startDoW = self::DAYOFWEEK($startDate, 3);
         if (self::DAYOFWEEK($startDate, 3) >= 5) {
-            $startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
+            $startDate += ($decrementing) ? -$startDoW + 4 : 7 - $startDoW;
             ($decrementing) ? $endDays++ : $endDays--;
         }
 
@@ -1046,7 +1046,7 @@ 
         //    Adjust the calculated end date if it falls over a weekend
         $endDoW = self::DAYOFWEEK($endDate, 3);
         if ($endDoW >= 5) {
-            $endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
+            $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
         }
 
         //    Test any extra holiday parameters