Completed
Pull Request — develop (#533)
by
unknown
78:57 queued 15:44
created
src/PhpSpreadsheet/Worksheet/BaseDrawing.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -137,8 +137,7 @@
 block discarded – undo
137 137
         $this->rotation = 0;
138 138
         $this->shadow = new Drawing\Shadow();
139 139
 
140
-        // Set image index
141
-        ++self::$imageCounter;
140
+        // Set image index++self::$imageCounter;
142 141
         $this->imageIndex = self::$imageCounter;
143 142
     }
144 143
 
Please login to merge, or discard this patch.
tests/data/Calculation/DateTime/DAY.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -4,53 +4,53 @@
 block discarded – undo
4 4
 
5 5
 return [
6 6
     [
7
-        19,         // Result for Excel
8
-        19,         // Result for OpenOffice
7
+        19, // Result for Excel
8
+        19, // Result for OpenOffice
9 9
         22269,
10 10
     ],
11 11
     [
12
-        1,          // Result for Excel
13
-        1,          // Result for OpenOffice
12
+        1, // Result for Excel
13
+        1, // Result for OpenOffice
14 14
         30348,
15 15
     ],
16 16
     [
17
-        10,         // Result for Excel
18
-        10,         // Result for OpenOffice
17
+        10, // Result for Excel
18
+        10, // Result for OpenOffice
19 19
         30843,
20 20
     ],
21 21
     [
22
-        11,         // Result for Excel
23
-        11,         // Result for OpenOffice
22
+        11, // Result for Excel
23
+        11, // Result for OpenOffice
24 24
         '11-Nov-1918',
25 25
     ],
26 26
     [
27
-        28,         // Result for Excel
28
-        28,         // Result for OpenOffice
27
+        28, // Result for Excel
28
+        28, // Result for OpenOffice
29 29
         '28-Feb-1904',
30 30
     ],
31 31
     [
32
-        '#VALUE!',  // Result for Excel
33
-        '#VALUE!',  // Result for OpenOffice
32
+        '#VALUE!', // Result for Excel
33
+        '#VALUE!', // Result for OpenOffice
34 34
         'Invalid',
35 35
     ],
36 36
     [
37
-        '#NUM!',  // Result for Excel
38
-        29,       // Result for OpenOffice
37
+        '#NUM!', // Result for Excel
38
+        29, // Result for OpenOffice
39 39
         -1,
40 40
     ],
41 41
     [
42
-        1,         // Result for Excel
43
-        31,        // Result for OpenOffice
42
+        1, // Result for Excel
43
+        31, // Result for OpenOffice
44 44
         1,
45 45
     ],
46 46
     [
47
-        0,         // Result for Excel
48
-        30,        // Result for OpenOffice
47
+        0, // Result for Excel
48
+        30, // Result for OpenOffice
49 49
         0.5,
50 50
     ],
51 51
     [
52
-        0,         // Result for Excel
53
-        30,        // Result for OpenOffice
52
+        0, // Result for Excel
53
+        30, // Result for OpenOffice
54 54
         0,
55 55
     ],
56 56
 ];
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Reader/Xlsx.php 3 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1243,15 +1243,15 @@
 block discarded – undo
1243 1243
                                 if (isset ($xmlSheet->extLst, $xmlSheet->extLst->ext, $xmlSheet->extLst->ext['uri'])
1244 1244
                                 && $xmlSheet->extLst->ext['uri'] == "{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}" )
1245 1245
                                 {
1246
-                                  // retreive MS extension data to create a node that matches expectations.
1247
-                                  foreach ($xmlSheet->extLst->ext->children('x14', TRUE)->dataValidations->dataValidation as $item)
1248
-                                  {
1246
+                                    // retreive MS extension data to create a node that matches expectations.
1247
+                                    foreach ($xmlSheet->extLst->ext->children('x14', TRUE)->dataValidations->dataValidation as $item)
1248
+                                    {
1249 1249
                                     $node = $xmlSheet->dataValidations->addChild('dataValidation');
1250 1250
                                     foreach ($item->attributes() as $attr)
1251
-                                      $node->addAttribute($attr->getName(), $attr);
1251
+                                        $node->addAttribute($attr->getName(), $attr);
1252 1252
                                     $node->addAttribute('sqref', $item->children('xm',TRUE)->sqref);
1253 1253
                                     $node->addChild('formula1', $item->formula1->children('xm',TRUE)->f);
1254
-                                  }
1254
+                                    }
1255 1255
                                 }
1256 1256
 
1257 1257
                                 foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
1241 1241
                             if ($xmlSheet && $xmlSheet->dataValidations && !$this->readDataOnly) {
1242 1242
                                 // handle Microsoft extension if present
1243 1243
                                 if (isset ($xmlSheet->extLst, $xmlSheet->extLst->ext, $xmlSheet->extLst->ext['uri'])
1244
-                                && $xmlSheet->extLst->ext['uri'] == "{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}" )
1244
+                                && $xmlSheet->extLst->ext['uri'] == "{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}")
1245 1245
                                 {
1246 1246
                                   // retreive MS extension data to create a node that matches expectations.
1247 1247
                                   foreach ($xmlSheet->extLst->ext->children('x14', TRUE)->dataValidations->dataValidation as $item)
@@ -1249,8 +1249,8 @@  discard block
 block discarded – undo
1249 1249
                                     $node = $xmlSheet->dataValidations->addChild('dataValidation');
1250 1250
                                     foreach ($item->attributes() as $attr)
1251 1251
                                       $node->addAttribute($attr->getName(), $attr);
1252
-                                    $node->addAttribute('sqref', $item->children('xm',TRUE)->sqref);
1253
-                                    $node->addChild('formula1', $item->formula1->children('xm',TRUE)->f);
1252
+                                    $node->addAttribute('sqref', $item->children('xm', TRUE)->sqref);
1253
+                                    $node->addChild('formula1', $item->formula1->children('xm', TRUE)->f);
1254 1254
                                   }
1255 1255
                                 }
1256 1256
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1247,8 +1247,9 @@
 block discarded – undo
1247 1247
                                   foreach ($xmlSheet->extLst->ext->children('x14', TRUE)->dataValidations->dataValidation as $item)
1248 1248
                                   {
1249 1249
                                     $node = $xmlSheet->dataValidations->addChild('dataValidation');
1250
-                                    foreach ($item->attributes() as $attr)
1251
-                                      $node->addAttribute($attr->getName(), $attr);
1250
+                                    foreach ($item->attributes() as $attr) {
1251
+                                                                          $node->addAttribute($attr->getName(), $attr);
1252
+                                    }
1252 1253
                                     $node->addAttribute('sqref', $item->children('xm',TRUE)->sqref);
1253 1254
                                     $node->addChild('formula1', $item->formula1->children('xm',TRUE)->f);
1254 1255
                                   }
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Calculation/Calculation.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3804,8 +3804,9 @@
 block discarded – undo
3804 3804
                     $pCell->attach($pCellParent);
3805 3805
                     $this->debugLog->writeDebugLog('Evaluation Result for named range ', $namedRange, ' is ', $this->showTypeDetails($cellValue));
3806 3806
                     $stack->push('Named Range', $cellValue, $namedRange);
3807
-                    if ($cellValue === Functions::REF())
3808
-                        $this->formulaErrorDetails[] = $stack->last();
3807
+                    if ($cellValue === Functions::REF()) {
3808
+                                            $this->formulaErrorDetails[] = $stack->last();
3809
+                    }
3809 3810
                 } else {
3810 3811
                     return $this->raiseFormulaError("undefined variable '$token'");
3811 3812
                 }
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Worksheet/Worksheet.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -553,11 +553,11 @@
 block discarded – undo
553 553
         $this->drawingCollection = new \ArrayObject();
554 554
     }
555 555
 
556
-     /**
557
-     * Get collection of charts.
558
-     *
559
-     * @return Chart[]
560
-     */
556
+        /**
557
+         * Get collection of charts.
558
+         *
559
+         * @return Chart[]
560
+         */
561 561
     public function getChartCollection()
562 562
     {
563 563
         return $this->chartCollection;
Please login to merge, or discard this patch.