Completed
Pull Request — develop (#29)
by Elan
22:48
created
src/PhpSpreadsheet/Worksheet.php 1 patch
Doc Comments   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
      *
585 585
      * @param string $index Chart index position
586 586
      * @throws Exception
587
-     * @return false|Chart
587
+     * @return null|Chart
588 588
      */
589 589
     public function getChartByIndex($index = null)
590 590
     {
@@ -1085,7 +1085,7 @@  discard block
 block discarded – undo
1085 1085
      * Set a cell value
1086 1086
      *
1087 1087
      * @param string $pCoordinate Coordinate of the cell
1088
-     * @param mixed $pValue Value of the cell
1088
+     * @param integer $pValue Value of the cell
1089 1089
      * @param bool $returnCell   Return the worksheet (false, default) or the cell (true)
1090 1090
      * @return Worksheet|Cell    Depending on the last parameter being specified
1091 1091
      */
@@ -1196,8 +1196,8 @@  discard block
 block discarded – undo
1196 1196
     /**
1197 1197
      * Get cell at a specific coordinate by using numeric cell coordinates
1198 1198
      *
1199
-     * @param  string $pColumn Numeric column coordinate of the cell
1200
-     * @param string $pRow Numeric row coordinate of the cell
1199
+     * @param  integer $pColumn Numeric column coordinate of the cell
1200
+     * @param integer $pRow Numeric row coordinate of the cell
1201 1201
      * @param bool $createIfNotExists  Flag indicating whether a new cell should be created if it doesn't
1202 1202
      *                                       already exist, or a null should be returned instead
1203 1203
      * @return null|Cell Cell that was found/created or null
@@ -1305,8 +1305,8 @@  discard block
 block discarded – undo
1305 1305
     /**
1306 1306
      * Cell at a specific coordinate by using numeric cell coordinates exists?
1307 1307
      *
1308
-     * @param string $pColumn Numeric column coordinate of the cell
1309
-     * @param string $pRow Numeric row coordinate of the cell
1308
+     * @param integer $pColumn Numeric column coordinate of the cell
1309
+     * @param integer $pRow Numeric row coordinate of the cell
1310 1310
      * @return bool
1311 1311
      */
1312 1312
     public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
@@ -1923,7 +1923,7 @@  discard block
 block discarded – undo
1923 1923
     /**
1924 1924
      *    Set AutoFilter
1925 1925
      *
1926
-     *    @param    Worksheet\AutoFilter|string   $pValue
1926
+     *    @param    string   $pValue
1927 1927
      *            A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
1928 1928
      *    @throws Exception
1929 1929
      *    @return Worksheet
@@ -2954,7 +2954,7 @@  discard block
 block discarded – undo
2954 2954
      *
2955 2955
      * @param null|string Same rule as Title minus space not allowed (but, like Excel, change silently space to underscore)
2956 2956
      * @throws Exception
2957
-     * @return objWorksheet
2957
+     * @return Worksheet
2958 2958
      */
2959 2959
     public function setCodeName($pValue = null)
2960 2960
     {
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Worksheet/AutoFilter.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -567,6 +567,11 @@
 block discarded – undo
567 567
         return ['method' => 'filterTestInCustomDataSet', 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND]];
568 568
     }
569 569
 
570
+    /**
571
+     * @param integer $columnID
572
+     * @param integer $startRow
573
+     * @param string $ruleType
574
+     */
570 575
     private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
571 576
     {
572 577
         $range = $columnID . $startRow . ':' . $columnID . $endRow;
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Worksheet/ColumnDimension.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
     /**
102 102
      * Set Row Height
103 103
      *
104
-     * @param float $pValue
104
+     * @param integer $pValue
105 105
      * @return RowDimension
106 106
      */
107 107
     public function setRowHeight($pValue = -1)
Please login to merge, or discard this patch.
tests/PhpSpreadsheetTests/Shared/StringTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
     public function testGetCurrencyCode()
66 66
     {
67 67
         $localeconv = localeconv();
68
-        $expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol']: '$'));
68
+        $expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol'] : '$'));
69 69
         $result = call_user_func([StringHelper::class, 'getCurrencyCode']);
70 70
         $this->assertEquals($expectedResult, $result);
71 71
     }
Please login to merge, or discard this patch.
tests/PhpSpreadsheetTests/Worksheet/ColumnIteratorTest.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
             ->getMock();
19 19
 
20 20
         $this->mockWorksheet->expects($this->any())
21
-                 ->method('getHighestColumn')
22
-                 ->will($this->returnValue('E'));
21
+                    ->method('getHighestColumn')
22
+                    ->will($this->returnValue('E'));
23 23
         $this->mockWorksheet->expects($this->any())
24
-                 ->method('current')
25
-                 ->will($this->returnValue($this->mockColumn));
24
+                    ->method('current')
25
+                    ->will($this->returnValue($this->mockColumn));
26 26
     }
27 27
 
28 28
 
Please login to merge, or discard this patch.
tests/PhpSpreadsheetTests/Worksheet/RowCellIteratorTest.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
             ->getMock();
19 19
 
20 20
         $this->mockWorksheet->expects($this->any())
21
-                 ->method('getHighestColumn')
22
-                 ->will($this->returnValue('E'));
21
+                    ->method('getHighestColumn')
22
+                    ->will($this->returnValue('E'));
23 23
         $this->mockWorksheet->expects($this->any())
24
-                 ->method('getCellByColumnAndRow')
25
-                 ->will($this->returnValue($this->mockCell));
24
+                    ->method('getCellByColumnAndRow')
25
+                    ->will($this->returnValue($this->mockCell));
26 26
     }
27 27
 
28 28
 
Please login to merge, or discard this patch.
tests/PhpSpreadsheetTests/Worksheet/ColumnCellIteratorTest.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
             ->getMock();
19 19
 
20 20
         $this->mockWorksheet->expects($this->any())
21
-                 ->method('getHighestRow')
22
-                 ->will($this->returnValue(5));
21
+                    ->method('getHighestRow')
22
+                    ->will($this->returnValue(5));
23 23
         $this->mockWorksheet->expects($this->any())
24
-                 ->method('getCellByColumnAndRow')
25
-                 ->will($this->returnValue($this->mockCell));
24
+                    ->method('getCellByColumnAndRow')
25
+                    ->will($this->returnValue($this->mockCell));
26 26
     }
27 27
 
28 28
 
Please login to merge, or discard this patch.
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     {
114 114
         $attributeSet = ['val' => 100,
115 115
                                 'maxVal' => 200,
116
-                             ];
116
+                                ];
117 117
 
118 118
         //    Setters return the instance to implement the fluent interface
119 119
         $result = $this->testAutoFilterColumnObject->setAttributes($attributeSet);
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     {
125 125
         $attributeSet = ['val' => 100,
126 126
                                 'maxVal' => 200,
127
-                             ];
127
+                                ];
128 128
 
129 129
         $this->testAutoFilterColumnObject->setAttributes($attributeSet);
130 130
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
     {
138 138
         $attributeSet = ['val' => 100,
139 139
                                 'maxVal' => 200,
140
-                             ];
140
+                                ];
141 141
 
142 142
         foreach ($attributeSet as $attributeName => $attributeValue) {
143 143
             //    Setters return the instance to implement the fluent interface
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     {
151 151
         $attributeSet = ['val' => 100,
152 152
                                 'maxVal' => 200,
153
-                             ];
153
+                                ];
154 154
 
155 155
         $this->testAutoFilterColumnObject->setAttributes($attributeSet);
156 156
 
Please login to merge, or discard this patch.
tests/PhpSpreadsheetTests/Worksheet/RowIteratorTest.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
             ->getMock();
19 19
 
20 20
         $this->mockWorksheet->expects($this->any())
21
-                 ->method('getHighestRow')
22
-                 ->will($this->returnValue(5));
21
+                    ->method('getHighestRow')
22
+                    ->will($this->returnValue(5));
23 23
         $this->mockWorksheet->expects($this->any())
24
-                 ->method('current')
25
-                 ->will($this->returnValue($this->mockRow));
24
+                    ->method('current')
25
+                    ->will($this->returnValue($this->mockRow));
26 26
     }
27 27
 
28 28
 
Please login to merge, or discard this patch.