Completed
Pull Request — develop (#72)
by Henrik
27:27
created
src/PhpSpreadsheet/Chart/Renderer/JpGraph.php 1 patch
Doc Comments   +62 added lines patch added patch discarded remove patch
@@ -60,6 +60,9 @@  discard block
 block discarded – undo
60 60
 
61 61
     private static $plotMark = 0;
62 62
 
63
+    /**
64
+     * @param string $markerID
65
+     */
63 66
     private function formatPointMarker($seriesPlot, $markerID)
64 67
     {
65 68
         $plotMarkKeys = array_keys(self::$markSet);
@@ -87,6 +90,9 @@  discard block
 block discarded – undo
87 90
         return $seriesPlot;
88 91
     }
89 92
 
93
+    /**
94
+     * @param integer $labelCount
95
+     */
90 96
     private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
91 97
     {
92 98
         $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
@@ -116,6 +122,9 @@  discard block
 block discarded – undo
116 122
         return $datasetLabels;
117 123
     }
118 124
 
125
+    /**
126
+     * @param integer $seriesCount
127
+     */
119 128
     private function percentageSumCalculation($groupID, $seriesCount)
120 129
     {
121 130
         //    Adjust our values to a percentage value across all series in the group
@@ -146,6 +155,9 @@  discard block
 block discarded – undo
146 155
         return $dataValues;
147 156
     }
148 157
 
158
+    /**
159
+     * @param \PhpOffice\PhpSpreadsheet\Chart\Title $captionElement
160
+     */
149 161
     private function getCaption($captionElement)
150 162
     {
151 163
         //    Read any caption
@@ -253,6 +265,9 @@  discard block
 block discarded – undo
253 265
         $this->renderTitle();
254 266
     }
255 267
 
268
+    /**
269
+     * @param integer $groupID
270
+     */
256 271
     private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d')
257 272
     {
258 273
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -316,6 +331,9 @@  discard block
 block discarded – undo
316 331
         $this->graph->Add($groupPlot);
317 332
     }
318 333
 
334
+    /**
335
+     * @param integer $groupID
336
+     */
319 337
     private function renderPlotBar($groupID, $dimensions = '2d')
320 338
     {
321 339
         $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
@@ -400,6 +418,10 @@  discard block
 block discarded – undo
400 418
         $this->graph->Add($groupPlot);
401 419
     }
402 420
 
421
+    /**
422
+     * @param integer $groupID
423
+     * @param boolean $bubble
424
+     */
403 425
     private function renderPlotScatter($groupID, $bubble)
404 426
     {
405 427
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -445,6 +467,9 @@  discard block
 block discarded – undo
445 467
         }
446 468
     }
447 469
 
470
+    /**
471
+     * @param integer $groupID
472
+     */
448 473
     private function renderPlotRadar($groupID)
449 474
     {
450 475
         $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -483,6 +508,9 @@  discard block
 block discarded – undo
483 508
         }
484 509
     }
485 510
 
511
+    /**
512
+     * @param integer $groupID
513
+     */
486 514
     private function renderPlotContour($groupID)
487 515
     {
488 516
         $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -503,6 +531,9 @@  discard block
 block discarded – undo
503 531
         $this->graph->Add($seriesPlot);
504 532
     }
505 533
 
534
+    /**
535
+     * @param integer $groupID
536
+     */
506 537
     private function renderPlotStock($groupID)
507 538
     {
508 539
         $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
@@ -542,6 +573,9 @@  discard block
 block discarded – undo
542 573
         $this->graph->Add($seriesPlot);
543 574
     }
544 575
 
576
+    /**
577
+     * @param integer $groupCount
578
+     */
545 579
     private function renderAreaChart($groupCount, $dimensions = '2d')
546 580
     {
547 581
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
@@ -553,6 +587,9 @@  discard block
 block discarded – undo
553 587
         }
554 588
     }
555 589
 
590
+    /**
591
+     * @param integer $groupCount
592
+     */
556 593
     private function renderLineChart($groupCount, $dimensions = '2d')
557 594
     {
558 595
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
@@ -564,6 +601,9 @@  discard block
 block discarded – undo
564 601
         }
565 602
     }
566 603
 
604
+    /**
605
+     * @param integer $groupCount
606
+     */
567 607
     private function renderBarChart($groupCount, $dimensions = '2d')
568 608
     {
569 609
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php';
@@ -575,6 +615,9 @@  discard block
 block discarded – undo
575 615
         }
576 616
     }
577 617
 
618
+    /**
619
+     * @param integer $groupCount
620
+     */
578 621
     private function renderScatterChart($groupCount)
579 622
     {
580 623
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
@@ -588,6 +631,9 @@  discard block
 block discarded – undo
588 631
         }
589 632
     }
590 633
 
634
+    /**
635
+     * @param integer $groupCount
636
+     */
591 637
     private function renderBubbleChart($groupCount)
592 638
     {
593 639
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
@@ -599,6 +645,9 @@  discard block
 block discarded – undo
599 645
         }
600 646
     }
601 647
 
648
+    /**
649
+     * @param integer $groupCount
650
+     */
602 651
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
603 652
     {
604 653
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie.php';
@@ -675,6 +724,9 @@  discard block
 block discarded – undo
675 724
         }
676 725
     }
677 726
 
727
+    /**
728
+     * @param integer $groupCount
729
+     */
678 730
     private function renderRadarChart($groupCount)
679 731
     {
680 732
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_radar.php';
@@ -686,6 +738,9 @@  discard block
 block discarded – undo
686 738
         }
687 739
     }
688 740
 
741
+    /**
742
+     * @param integer $groupCount
743
+     */
689 744
     private function renderStockChart($groupCount)
690 745
     {
691 746
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_stock.php';
@@ -697,6 +752,10 @@  discard block
 block discarded – undo
697 752
         }
698 753
     }
699 754
 
755
+    /**
756
+     * @param integer $groupCount
757
+     * @param string|null $dimensions
758
+     */
700 759
     private function renderContourChart($groupCount, $dimensions)
701 760
     {
702 761
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_contour.php';
@@ -708,6 +767,9 @@  discard block
 block discarded – undo
708 767
         }
709 768
     }
710 769
 
770
+    /**
771
+     * @param integer $groupCount
772
+     */
711 773
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
712 774
     {
713 775
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Shared/Font.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@
 block discarded – undo
235 235
      * Calculate an (approximate) OpenXML column width, based on font size and text contained
236 236
      *
237 237
      * @param     \PhpOffice\PhpSpreadsheet\Style\Font            $font            Font object
238
-     * @param     \PhpOffice\PhpSpreadsheet\RichText|string    $cellText        Text to calculate width
238
+     * @param     string    $cellText        Text to calculate width
239 239
      * @param     int                        $rotation        Rotation angle
240 240
      * @param     \PhpOffice\PhpSpreadsheet\Style\Font|null    $defaultFont    Font object
241 241
      * @return     int        Column width
Please login to merge, or discard this patch.
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.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/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.
src/PhpSpreadsheet/Reader/HTML.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -168,16 +168,25 @@  discard block
 block discarded – undo
168 168
         return fread($this->fileHandle, $blockSize);
169 169
     }
170 170
 
171
+    /**
172
+     * @param string $data
173
+     */
171 174
     private static function startsWithTag($data)
172 175
     {
173 176
         return '<' === substr(trim($data), 0, 1);
174 177
     }
175 178
 
179
+    /**
180
+     * @param string $data
181
+     */
176 182
     private static function endsWithTag($data)
177 183
     {
178 184
         return '>' === substr(trim($data), -1, 1);
179 185
     }
180 186
 
187
+    /**
188
+     * @param string $data
189
+     */
181 190
     private static function containsTags($data)
182 191
     {
183 192
         return strlen($data) !== strlen(strip_tags($data));
@@ -249,6 +258,10 @@  discard block
 block discarded – undo
249 258
         return array_pop($this->nestedColumn);
250 259
     }
251 260
 
261
+    /**
262
+     * @param \PhpOffice\PhpSpreadsheet\Worksheet $sheet
263
+     * @param integer $row
264
+     */
252 265
     protected function flushCell($sheet, $column, $row, &$cellContent)
253 266
     {
254 267
         if (is_string($cellContent)) {
Please login to merge, or discard this patch.