Completed
Pull Request — develop (#29)
by Elan
22:48
created
src/PhpSpreadsheet/Reader/Xlsx/Chart.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -204,6 +204,9 @@
 block discarded – undo
204 204
         return $chart;
205 205
     }
206 206
 
207
+    /**
208
+     * @param string $type
209
+     */
207 210
     private static function chartTitle($titleDetails, $namespacesChartMeta, $type)
208 211
     {
209 212
         $caption = [];
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xlsx/Chart.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -412,6 +412,8 @@  discard block
 block discarded – undo
412 412
      * @param  string $id1
413 413
      * @param  string $id2
414 414
      * @param  bool $isMultiLevelSeries
415
+     * @param null|Axis $xAxis
416
+     * @param null|Axis $yAxis
415 417
      *
416 418
      * @throws  \PhpSpreadsheet\Writer\Exception
417 419
      */
@@ -534,6 +536,10 @@  discard block
 block discarded – undo
534 536
      * @param  string $id1
535 537
      * @param  string $id2
536 538
      * @param  bool $isMultiLevelSeries
539
+     * @param null|Axis $xAxis
540
+     * @param null|Axis $yAxis
541
+     * @param null|GridLines $majorGridlines
542
+     * @param null|GridLines $minorGridlines
537 543
      *
538 544
      * @throws  \PhpSpreadsheet\Writer\Exception
539 545
      */
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xlsx.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -140,8 +140,8 @@
 block discarded – undo
140 140
         }
141 141
 
142 142
         $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
143
-                                  'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
144
-                                  'styleHashTable',
143
+                                    'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
144
+                                    'styleHashTable',
145 145
                                 ];
146 146
 
147 147
         // Set HashTable variables
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Reader/Xls.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5157,7 +5157,7 @@  discard block
 block discarded – undo
5157 5157
      * is in one piece.
5158 5158
      * Moves to next current position in data stream to start of next record different from a CONtINUE record
5159 5159
      *
5160
-     * @return array
5160
+     * @return integer|null
5161 5161
      */
5162 5162
     private function getSplicedRecordData()
5163 5163
     {
@@ -5421,7 +5421,7 @@  discard block
 block discarded – undo
5421 5421
      * @param string $formulaData Formula data
5422 5422
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
5423 5423
      * @throws Exception
5424
-     * @return array
5424
+     * @return string
5425 5425
      */
5426 5426
     private function getNextToken($formulaData, $baseCell = 'A1')
5427 5427
     {
@@ -6989,7 +6989,7 @@  discard block
 block discarded – undo
6989 6989
      * section 2.5.15
6990 6990
      *
6991 6991
      * @param string $subData
6992
-     * @return array
6992
+     * @return string
6993 6993
      */
6994 6994
     private function readBIFF8CellRangeAddressList($subData)
6995 6995
     {
@@ -7100,7 +7100,7 @@  discard block
 block discarded – undo
7100 7100
      * section 2.5.8
7101 7101
      *
7102 7102
      * @param string $arrayData
7103
-     * @return array
7103
+     * @return string
7104 7104
      */
7105 7105
     private static function readBIFF8ConstantArray($arrayData)
7106 7106
     {
@@ -7138,7 +7138,7 @@  discard block
 block discarded – undo
7138 7138
      * returns e.g. array('value' => '5', 'size' => 9)
7139 7139
      *
7140 7140
      * @param string $valueData
7141
-     * @return array
7141
+     * @return string
7142 7142
      */
7143 7143
     private static function readBIFF8Constant($valueData)
7144 7144
     {
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Reader/Xls/MD5.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -190,6 +190,11 @@
 block discarded – undo
190 190
         return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
191 191
     }
192 192
 
193
+    /**
194
+     * @param string[] $func
195
+     * @param integer $s
196
+     * @param integer $t
197
+     */
193 198
     private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
194 199
     {
195 200
         $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xls/Parser.php 1 patch
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
      *
505 505
      * @access private
506 506
      * @param mixed $token The token to convert.
507
-     * @return mixed the converted token on success
507
+     * @return string the converted token on success
508 508
      */
509 509
     private function convert($token)
510 510
     {
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
      *
575 575
      * @access private
576 576
      * @param string $string A string for conversion to its ptg value.
577
-     * @return mixed the converted token on success
577
+     * @return string the converted token on success
578 578
      */
579 579
     private function convertString($string)
580 580
     {
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
      *
655 655
      * @access private
656 656
      * @param string $token An Excel range in the Sheet1!A1:A2 format.
657
-     * @return mixed The packed ptgArea3d token on success.
657
+     * @return string The packed ptgArea3d token on success.
658 658
      */
659 659
     private function convertRange3d($token)
660 660
     {
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
      *
727 727
      * @access private
728 728
      * @param string $cell An Excel cell reference
729
-     * @return mixed The packed ptgRef3d token on success.
729
+     * @return string The packed ptgRef3d token on success.
730 730
      */
731 731
     private function convertRef3d($cell)
732 732
     {
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
      *
835 835
      * @access private
836 836
      * @param string $ext_ref The name of the external reference
837
-     * @return mixed The reference index in packed() format on success
837
+     * @return string The reference index in packed() format on success
838 838
      */
839 839
     private function getRefIndex($ext_ref)
840 840
     {
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
      *
926 926
      * @access private
927 927
      * @param string $cell The Excel cell reference to be packed
928
-     * @return array Array containing the row and column in packed() format
928
+     * @return string[] Array containing the row and column in packed() format
929 929
      */
930 930
     private function cellToPackedRowcol($cell)
931 931
     {
@@ -954,7 +954,7 @@  discard block
 block discarded – undo
954 954
      *
955 955
      * @access private
956 956
      * @param string $range The Excel range to be packed
957
-     * @return array Array containing (row1,col1,row2,col2) in packed() format
957
+     * @return string[] Array containing (row1,col1,row2,col2) in packed() format
958 958
      */
959 959
     private function rangeToPackedRange($range)
960 960
     {
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
      * Checks if it's a valid token.
1076 1076
      *
1077 1077
      * @access private
1078
-     * @param mixed $token The token to check.
1078
+     * @param string $token The token to check.
1079 1079
      * @return mixed       The checked token or false on failure
1080 1080
      */
1081 1081
     private function match($token)
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
      * @access public
1158 1158
      * @param string $formula The formula to parse, without the initial equal
1159 1159
      *                        sign (=).
1160
-     * @return mixed true on success
1160
+     * @return boolean true on success
1161 1161
      */
1162 1162
     public function parse($formula)
1163 1163
     {
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xls/Workbook.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -233,6 +233,7 @@  discard block
 block discarded – undo
233 233
      *
234 234
      * @param \PhpOffice\PhpSpreadsheet\Style
235 235
      * @param bool Is it a style XF?
236
+     * @param \PhpOffice\PhpSpreadsheet\Style $style
236 237
      * @return int Index to XF record
237 238
      */
238 239
     public function addXfWriter($style, $isStyleXf = false)
@@ -783,7 +784,7 @@  discard block
 block discarded – undo
783 784
      *
784 785
      * @param    string        $name            The name in UTF-8
785 786
      * @param    string        $formulaData    The binary formula data
786
-     * @param    string        $sheetIndex        1-based sheet index the defined name applies to. 0 = global
787
+     * @param    integer        $sheetIndex        1-based sheet index the defined name applies to. 0 = global
787 788
      * @param    bool        $isBuiltIn        Built-in name?
788 789
      * @return    string    Complete binary record data
789 790
      */
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xls/Worksheet.php 2 patches
Doc Comments   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -199,10 +199,12 @@  discard block
 block discarded – undo
199 199
      * @param int        &$str_unique    Total number of unique strings
200 200
      * @param array        &$str_table        String Table
201 201
      * @param array        &$colors        Colour Table
202
-     * @param mixed        $parser            The formula parser created for the Workbook
202
+     * @param Parser        $parser            The formula parser created for the Workbook
203 203
      * @param bool    $preCalculateFormulas    Flag indicating whether formulas should be calculated or just written
204 204
      * @param string    $phpSheet        The worksheet to write
205 205
      * @param \PhpSpreadsheet\Worksheet $phpSheet
206
+     * @param integer $str_total
207
+     * @param integer $str_unique
206 208
      */
207 209
     public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet)
208 210
     {
@@ -611,7 +613,7 @@  discard block
 block discarded – undo
611 613
      * @param int $row    Zero indexed row
612 614
      * @param int $col    Zero indexed column
613 615
      * @param float   $num    The number to write
614
-     * @param mixed   $xfIndex The optional XF format
616
+     * @param integer   $xfIndex The optional XF format
615 617
      * @return int
616 618
      */
617 619
     private function writeNumber($row, $col, $num, $xfIndex)
@@ -717,7 +719,7 @@  discard block
 block discarded – undo
717 719
      * @param int $row    Zero indexed row
718 720
      * @param int $col    Zero indexed column
719 721
      * @param string  $str    The string to write
720
-     * @param mixed   $xfIndex The XF format index for the cell
722
+     * @param integer   $xfIndex The XF format index for the cell
721 723
      * @return int
722 724
      */
723 725
     private function writeLabelSst($row, $col, $str, $xfIndex)
@@ -783,7 +785,7 @@  discard block
 block discarded – undo
783 785
      *
784 786
      * @param int $row    Zero indexed row
785 787
      * @param int $col    Zero indexed column
786
-     * @param mixed   $xfIndex The XF format index
788
+     * @param integer   $xfIndex The XF format index
787 789
      */
788 790
     public function writeBlank($row, $col, $xfIndex)
789 791
     {
@@ -830,7 +832,7 @@  discard block
 block discarded – undo
830 832
      * @param int $row     Zero indexed row
831 833
      * @param int $col     Zero indexed column
832 834
      * @param string  $formula The formula text string
833
-     * @param mixed   $xfIndex  The XF format index
835
+     * @param integer   $xfIndex  The XF format index
834 836
      * @param mixed   $calculatedValue  Calculated value
835 837
      * @return int
836 838
      */
@@ -2299,8 +2301,8 @@  discard block
 block discarded – undo
2299 2301
      * @param mixed   $bitmap  The bitmap filename or GD-image resource
2300 2302
      * @param int $x       The horizontal position (offset) of the image inside the cell.
2301 2303
      * @param int $y       The vertical position (offset) of the image inside the cell.
2302
-     * @param float   $scale_x The horizontal scale
2303
-     * @param float   $scale_y The vertical scale
2304
+     * @param integer   $scale_x The horizontal scale
2305
+     * @param integer   $scale_y The vertical scale
2304 2306
      */
2305 2307
     public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
2306 2308
     {
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1147,14 +1147,14 @@
 block discarded – undo
1147 1147
 
1148 1148
         // Pack the main data stream
1149 1149
         $data = pack('vvvv', $row1, $row2, $col1, $col2) .
1150
-                          $unknown1 .
1151
-                          $link_type .
1152
-                          $unknown2 .
1153
-                          $up_count .
1154
-                          $dir_short_len .
1155
-                          $dir_short .
1156
-                          $unknown3 .
1157
-                          $stream_len; /*.
1150
+                            $unknown1 .
1151
+                            $link_type .
1152
+                            $unknown2 .
1153
+                            $up_count .
1154
+                            $dir_short_len .
1155
+                            $dir_short .
1156
+                            $unknown3 .
1157
+                            $stream_len; /*.
1158 1158
                           $dir_long_len .
1159 1159
                           $unknown4     .
1160 1160
                           $dir_long     .
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xls/Font.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
         $bFamily = 0; // Font family
86 86
         $bCharSet = \PHPExcel\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set
87 87
 
88
-        $record = 0x31;        // Record identifier
89
-        $reserved = 0x00;    // Reserved
90
-        $grbit = 0x00;        // Font attributes
88
+        $record = 0x31; // Record identifier
89
+        $reserved = 0x00; // Reserved
90
+        $grbit = 0x00; // Font attributes
91 91
         if ($this->font->getItalic()) {
92 92
             $grbit |= 0x02;
93 93
         }
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
134 134
     private static function mapBold($bold)
135 135
     {
136 136
         if ($bold) {
137
-            return 0x2BC;  //  700 = Bold font weight
137
+            return 0x2BC; //  700 = Bold font weight
138 138
         }
139
-        return 0x190;      //  400 = Normal font weight
139
+        return 0x190; //  400 = Normal font weight
140 140
     }
141 141
 
142 142
     /**
Please login to merge, or discard this patch.