PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/Font.php

Doc Comments +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
      * Calculate an (approximate) OpenXML column width, based on font size and text contained
      *
      * @param     \PhpOffice\PhpSpreadsheet\Style\Font            $font            Font object
-     * @param     \PhpOffice\PhpSpreadsheet\RichText|string    $cellText        Text to calculate width
+     * @param     string    $cellText        Text to calculate width
      * @param     int                        $rotation        Rotation angle
      * @param     \PhpOffice\PhpSpreadsheet\Style\Font|null    $defaultFont    Font object
      * @return     int        Column width

src/PhpSpreadsheet/Shared/OLE/PPS.php

Indentation +15 added lines, -15 removed lines

@@ -164,21 +164,21 @@
         $ret = str_pad($this->Name, 64, "\x00");
 
         $ret .= pack('v', strlen($this->Name) + 2)  // 66
-              . pack('c', $this->Type)              // 67
-              . pack('c', 0x00) //UK                // 68
-              . pack('V', $this->PrevPps) //Prev    // 72
-              . pack('V', $this->NextPps) //Next    // 76
-              . pack('V', $this->DirPps)  //Dir     // 80
-              . "\x00\x09\x02\x00"                  // 84
-              . "\x00\x00\x00\x00"                  // 88
-              . "\xc0\x00\x00\x00"                  // 92
-              . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
-              . "\x00\x00\x00\x00"                  // 100
-              . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st)          // 108
-              . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd)          // 116
-              . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
-              . pack('V', $this->Size)               // 124
-              . pack('V', 0); // 128
+                . pack('c', $this->Type)              // 67
+                . pack('c', 0x00) //UK                // 68
+                . pack('V', $this->PrevPps) //Prev    // 72
+                . pack('V', $this->NextPps) //Next    // 76
+                . pack('V', $this->DirPps)  //Dir     // 80
+                . "\x00\x09\x02\x00"                  // 84
+                . "\x00\x00\x00\x00"                  // 88
+                . "\xc0\x00\x00\x00"                  // 92
+                . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
+                . "\x00\x00\x00\x00"                  // 100
+                . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st)          // 108
+                . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd)          // 116
+                . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
+                . pack('V', $this->Size)               // 124
+                . pack('V', 0); // 128
         return $ret;
     }
 

src/PhpSpreadsheet/Reader/Xlsx.php

Doc Comments +12 added lines, -1 removed lines

@@ -281,6 +281,11 @@ 
         return isset($c->v) ? (string) $c->v : null;
     }
 
+    /**
+     * @param string $r
+     * @param string $cellDataType
+     * @param string $castBaseType
+     */
     private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType)
     {
         $cellDataType = 'f';
@@ -335,7 +340,7 @@ 
      *
      * @param     string         $pFilename
      * @throws    Exception
-     * @return    Spreadsheet
+     * @return    \PhpOffice\PhpSpreadsheet\Spreadsheet
      */
     public function load($pFilename)
     {
@@ -2005,6 +2010,9 @@ 
         }
     }
 
+    /**
+     * @param \PhpOffice\PhpSpreadsheet\Style\Border $docBorder
+     */
     private static function readBorder($docBorder, $eleBorder)
     {
         if (isset($eleBorder['style'])) {
@@ -2127,6 +2135,9 @@ 
         return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
     }
 
+    /**
+     * @param string $style
+     */
     private static function toCSSArray($style)
     {
         $style = str_replace(["\r", "\n"], '', $style);

src/PhpSpreadsheet/Reader/Xlsx/Chart.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
         return $chart;
     }
 
+    /**
+     * @param string $type
+     */
     private static function chartTitle($titleDetails, $namespacesChartMeta, $type)
     {
         $caption = [];

src/PhpSpreadsheet/Writer/Xlsx.php

Indentation +2 added lines, -2 removed lines

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

src/PhpSpreadsheet/Reader/Xls.php

Doc Comments +5 added lines, -5 removed lines

@@ -5157,7 +5157,7 @@ 
      * is in one piece.
      * Moves to next current position in data stream to start of next record different from a CONtINUE record
      *
-     * @return array
+     * @return integer|null
      */
     private function getSplicedRecordData()
     {
@@ -5421,7 +5421,7 @@ 
      * @param string $formulaData Formula data
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
      * @throws Exception
-     * @return array
+     * @return string
      */
     private function getNextToken($formulaData, $baseCell = 'A1')
     {
@@ -6989,7 +6989,7 @@ 
      * section 2.5.15
      *
      * @param string $subData
-     * @return array
+     * @return string
      */
     private function readBIFF8CellRangeAddressList($subData)
     {
@@ -7100,7 +7100,7 @@ 
      * section 2.5.8
      *
      * @param string $arrayData
-     * @return array
+     * @return string
      */
     private static function readBIFF8ConstantArray($arrayData)
     {
@@ -7138,7 +7138,7 @@ 
      * returns e.g. array('value' => '5', 'size' => 9)
      *
      * @param string $valueData
-     * @return array
+     * @return string
      */
     private static function readBIFF8Constant($valueData)
     {

src/PhpSpreadsheet/Reader/Xls/MD5.php

Doc Comments +5 added lines

@@ -190,6 +190,11 @@
         return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
     }
 
+    /**
+     * @param string[] $func
+     * @param integer $s
+     * @param integer $t
+     */
     private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
     {
         $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;

src/PhpSpreadsheet/Writer/Xls/Worksheet.php

Doc Comments +9 added lines, -7 removed lines

@@ -199,10 +199,12 @@ 
      * @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 bool    $preCalculateFormulas    Flag indicating whether formulas should be calculated or just written
      * @param string    $phpSheet        The worksheet to write
      * @param \PhpSpreadsheet\Worksheet $phpSheet
+     * @param integer $str_total
+     * @param integer $str_unique
      */
     public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet)
     {
@@ -611,7 +613,7 @@ 
      * @param int $row    Zero indexed row
      * @param int $col    Zero indexed column
      * @param float   $num    The number to write
-     * @param mixed   $xfIndex The optional XF format
+     * @param integer   $xfIndex The optional XF format
      * @return int
      */
     private function writeNumber($row, $col, $num, $xfIndex)
@@ -717,7 +719,7 @@ 
      * @param int $row    Zero indexed row
      * @param int $col    Zero indexed column
      * @param string  $str    The string to write
-     * @param mixed   $xfIndex The XF format index for the cell
+     * @param integer   $xfIndex The XF format index for the cell
      * @return int
      */
     private function writeLabelSst($row, $col, $str, $xfIndex)
@@ -783,7 +785,7 @@ 
      *
      * @param int $row    Zero indexed row
      * @param int $col    Zero indexed column
-     * @param mixed   $xfIndex The XF format index
+     * @param integer   $xfIndex The XF format index
      */
     public function writeBlank($row, $col, $xfIndex)
     {
@@ -830,7 +832,7 @@ 
      * @param int $row     Zero indexed row
      * @param int $col     Zero indexed column
      * @param string  $formula The formula text string
-     * @param mixed   $xfIndex  The XF format index
+     * @param integer   $xfIndex  The XF format index
      * @param mixed   $calculatedValue  Calculated value
      * @return int
      */
@@ -2299,8 +2301,8 @@ 
      * @param mixed   $bitmap  The bitmap filename or GD-image resource
      * @param int $x       The horizontal position (offset) of the image inside the cell.
      * @param int $y       The vertical position (offset) of the image inside the cell.
-     * @param float   $scale_x The horizontal scale
-     * @param float   $scale_y The vertical scale
+     * @param integer   $scale_x The horizontal scale
+     * @param integer   $scale_y The vertical scale
      */
     public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
     {

Indentation +8 added lines, -8 removed lines

@@ -1147,14 +1147,14 @@
 
         // Pack the main data stream
         $data = pack('vvvv', $row1, $row2, $col1, $col2) .
-                          $unknown1 .
-                          $link_type .
-                          $unknown2 .
-                          $up_count .
-                          $dir_short_len .
-                          $dir_short .
-                          $unknown3 .
-                          $stream_len; /*.
+                            $unknown1 .
+                            $link_type .
+                            $unknown2 .
+                            $up_count .
+                            $dir_short_len .
+                            $dir_short .
+                            $unknown3 .
+                            $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .

src/PhpSpreadsheet/Writer/Xls/Font.php

Spacing +5 added lines, -5 removed lines

@@ -85,9 +85,9 @@ 
         $bFamily = 0; // Font family
         $bCharSet = \PHPExcel\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set
 
-        $record = 0x31;        // Record identifier
-        $reserved = 0x00;    // Reserved
-        $grbit = 0x00;        // Font attributes
+        $record = 0x31; // Record identifier
+        $reserved = 0x00; // Reserved
+        $grbit = 0x00; // Font attributes
         if ($this->font->getItalic()) {
             $grbit |= 0x02;
         }
@@ -134,9 +134,9 @@ 
     private static function mapBold($bold)
     {
         if ($bold) {
-            return 0x2BC;  //  700 = Bold font weight
+            return 0x2BC; //  700 = Bold font weight
         }
-        return 0x190;      //  400 = Normal font weight
+        return 0x190; //  400 = Normal font weight
     }
 
     /**