Failed Conditions
Pull Request — master (#2529)
by Einar
15:19 queued 15s
created
tests/data/Calculation/Calculation.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@
 block discarded – undo
35 35
     $set6 = [0, $dataArray3, '=IF(A1+B1>3,C1,0)', 'E5'];
36 36
 
37 37
     $dataArray4 = [
38
-        ['noflag',    0, 0],
39
-        [127000,    0, 0],
40
-        [10000,  0.03, 0],
41
-        [20000,  0.06, 0],
42
-        [40000,  0.09, 0],
43
-        [70000,  0.12, 0],
44
-        [90000,  0.03, 0],
38
+        ['noflag', 0, 0],
39
+        [127000, 0, 0],
40
+        [10000, 0.03, 0],
41
+        [20000, 0.06, 0],
42
+        [40000, 0.09, 0],
43
+        [70000, 0.12, 0],
44
+        [90000, 0.03, 0],
45 45
     ];
46 46
     $formula2 = '=IF(A1="flag",IF(A2<10, 0) + IF(A3<10000, 0))';
47 47
     $set7 = [false, $dataArray4, $formula2, 'E5'];
Please login to merge, or discard this patch.
tests/data/Calculation/MathTrig/MMULT.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
     ],
18 18
     [
19 19
         [
20
-            [30,  36,  42],
21
-            [66,  81,  96],
20
+            [30, 36, 42],
21
+            [66, 81, 96],
22 22
             [102, 126, 150],
23 23
         ],
24 24
         [
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     ],
63 63
     [
64 64
         [
65
-            [62.00,  49.46],
65
+            [62.00, 49.46],
66 66
             [176.40, 144.50],
67 67
         ],
68 68
         [
Please login to merge, or discard this patch.
tests/data/Calculation/LookupRef/LOOKUP.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 return [
4
-    [ // Office reference example #1
4
+    [// Office reference example #1
5 5
         'orange',
6 6
         4.19,
7 7
         [
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
             ['blue'],
20 20
         ],
21 21
     ],
22
-    [ // Office reference example #2
22
+    [// Office reference example #2
23 23
         'yellow',
24 24
         5.75,
25 25
         [
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
             ['blue'],
38 38
         ],
39 39
     ],
40
-    [ // Office reference example #3
40
+    [// Office reference example #3
41 41
         'blue',
42 42
         7.66,
43 43
         [
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             ['blue'],
56 56
         ],
57 57
     ],
58
-    [ // Office reference example #4
58
+    [// Office reference example #4
59 59
         '#N/A',
60 60
         0,
61 61
         [
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
             ['blue'],
74 74
         ],
75 75
     ],
76
-    [ // Array form test
76
+    [// Array form test
77 77
         'orange',
78 78
         4.2,
79 79
         [
Please login to merge, or discard this patch.
tests/data/Calculation/LookupRef/MATCH.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
         [8, 8, 3, 2],
95 95
         -1,
96 96
     ],
97
-    [ // Default matchtype
97
+    [// Default matchtype
98 98
         4, // Expected
99 99
         4, // Input
100 100
         [2, 0, 0, 3],
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xls/Worksheet.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2948,8 +2948,8 @@
 block discarded – undo
2948 2948
     private function writeCFRule(Conditional $conditional): void
2949 2949
     {
2950 2950
         $record = 0x01B1; // Record identifier
2951
-        $type = null;  //  Type of the CF
2952
-        $operatorType = null;   //  Comparison operator
2951
+        $type = null; //  Type of the CF
2952
+        $operatorType = null; //  Comparison operator
2953 2953
 
2954 2954
         if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION) {
2955 2955
             $type = 0x02;
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Writer/Xls/Style/CellFill.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         Fill::FILL_PATTERN_GRAY125 => 0x11,
31 31
         Fill::FILL_PATTERN_GRAY0625 => 0x12,
32 32
         Fill::FILL_GRADIENT_LINEAR => 0x00, // does not exist in BIFF8
33
-        Fill::FILL_GRADIENT_PATH => 0x00,   // does not exist in BIFF8
33
+        Fill::FILL_GRADIENT_PATH => 0x00, // does not exist in BIFF8
34 34
     ];
35 35
 
36 36
     public static function style(Fill $fill): int
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Document/Properties.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -457,32 +457,32 @@
 block discarded – undo
457 457
     }
458 458
 
459 459
     private const PROPERTY_TYPE_ARRAY = [
460
-        'i' => self::PROPERTY_TYPE_INTEGER,      //    Integer
461
-        'i1' => self::PROPERTY_TYPE_INTEGER,     //    1-Byte Signed Integer
462
-        'i2' => self::PROPERTY_TYPE_INTEGER,     //    2-Byte Signed Integer
463
-        'i4' => self::PROPERTY_TYPE_INTEGER,     //    4-Byte Signed Integer
464
-        'i8' => self::PROPERTY_TYPE_INTEGER,     //    8-Byte Signed Integer
465
-        'int' => self::PROPERTY_TYPE_INTEGER,    //    Integer
466
-        'ui1' => self::PROPERTY_TYPE_INTEGER,    //    1-Byte Unsigned Integer
467
-        'ui2' => self::PROPERTY_TYPE_INTEGER,    //    2-Byte Unsigned Integer
468
-        'ui4' => self::PROPERTY_TYPE_INTEGER,    //    4-Byte Unsigned Integer
469
-        'ui8' => self::PROPERTY_TYPE_INTEGER,    //    8-Byte Unsigned Integer
470
-        'uint' => self::PROPERTY_TYPE_INTEGER,   //    Unsigned Integer
471
-        'f' => self::PROPERTY_TYPE_FLOAT,        //    Real Number
472
-        'r4' => self::PROPERTY_TYPE_FLOAT,       //    4-Byte Real Number
473
-        'r8' => self::PROPERTY_TYPE_FLOAT,       //    8-Byte Real Number
474
-        'decimal' => self::PROPERTY_TYPE_FLOAT,  //    Decimal
475
-        's' => self::PROPERTY_TYPE_STRING,       //    String
476
-        'empty' => self::PROPERTY_TYPE_STRING,   //    Empty
477
-        'null' => self::PROPERTY_TYPE_STRING,    //    Null
478
-        'lpstr' => self::PROPERTY_TYPE_STRING,   //    LPSTR
479
-        'lpwstr' => self::PROPERTY_TYPE_STRING,  //    LPWSTR
480
-        'bstr' => self::PROPERTY_TYPE_STRING,    //    Basic String
481
-        'd' => self::PROPERTY_TYPE_DATE,         //    Date and Time
482
-        'date' => self::PROPERTY_TYPE_DATE,      //    Date and Time
483
-        'filetime' => self::PROPERTY_TYPE_DATE,  //    File Time
484
-        'b' => self::PROPERTY_TYPE_BOOLEAN,      //    Boolean
485
-        'bool' => self::PROPERTY_TYPE_BOOLEAN,   //    Boolean
460
+        'i' => self::PROPERTY_TYPE_INTEGER, //    Integer
461
+        'i1' => self::PROPERTY_TYPE_INTEGER, //    1-Byte Signed Integer
462
+        'i2' => self::PROPERTY_TYPE_INTEGER, //    2-Byte Signed Integer
463
+        'i4' => self::PROPERTY_TYPE_INTEGER, //    4-Byte Signed Integer
464
+        'i8' => self::PROPERTY_TYPE_INTEGER, //    8-Byte Signed Integer
465
+        'int' => self::PROPERTY_TYPE_INTEGER, //    Integer
466
+        'ui1' => self::PROPERTY_TYPE_INTEGER, //    1-Byte Unsigned Integer
467
+        'ui2' => self::PROPERTY_TYPE_INTEGER, //    2-Byte Unsigned Integer
468
+        'ui4' => self::PROPERTY_TYPE_INTEGER, //    4-Byte Unsigned Integer
469
+        'ui8' => self::PROPERTY_TYPE_INTEGER, //    8-Byte Unsigned Integer
470
+        'uint' => self::PROPERTY_TYPE_INTEGER, //    Unsigned Integer
471
+        'f' => self::PROPERTY_TYPE_FLOAT, //    Real Number
472
+        'r4' => self::PROPERTY_TYPE_FLOAT, //    4-Byte Real Number
473
+        'r8' => self::PROPERTY_TYPE_FLOAT, //    8-Byte Real Number
474
+        'decimal' => self::PROPERTY_TYPE_FLOAT, //    Decimal
475
+        's' => self::PROPERTY_TYPE_STRING, //    String
476
+        'empty' => self::PROPERTY_TYPE_STRING, //    Empty
477
+        'null' => self::PROPERTY_TYPE_STRING, //    Null
478
+        'lpstr' => self::PROPERTY_TYPE_STRING, //    LPSTR
479
+        'lpwstr' => self::PROPERTY_TYPE_STRING, //    LPWSTR
480
+        'bstr' => self::PROPERTY_TYPE_STRING, //    Basic String
481
+        'd' => self::PROPERTY_TYPE_DATE, //    Date and Time
482
+        'date' => self::PROPERTY_TYPE_DATE, //    Date and Time
483
+        'filetime' => self::PROPERTY_TYPE_DATE, //    File Time
484
+        'b' => self::PROPERTY_TYPE_BOOLEAN, //    Boolean
485
+        'bool' => self::PROPERTY_TYPE_BOOLEAN, //    Boolean
486 486
     ];
487 487
 
488 488
     private const SPECIAL_TYPES = [
Please login to merge, or discard this patch.
src/PhpSpreadsheet/Worksheet/BaseDrawing.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -132,8 +132,7 @@
 block discarded – undo
132 132
         $this->shadow = new Drawing\Shadow();
133 133
         $this->type = IMAGETYPE_UNKNOWN;
134 134
 
135
-        // Set image index
136
-        ++self::$imageCounter;
135
+        // Set image index++self::$imageCounter;
137 136
         $this->imageIndex = self::$imageCounter;
138 137
     }
139 138
 
Please login to merge, or discard this patch.