Completed
Pull Request — master (#1148)
by Rolands
63:19
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/MathTrig/MDETERM.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -4,109 +4,109 @@
 block discarded – undo
4 4
     [
5 5
         0,
6 6
         [
7
-            [ 1, 2, 3 ],
8
-            [ 4, 5, 6 ],
9
-            [ 7, 8, 9 ],
7
+            [1, 2, 3],
8
+            [4, 5, 6],
9
+            [7, 8, 9],
10 10
         ],
11 11
     ],
12 12
     [
13 13
         0,
14 14
         [
15
-            [ 1.1, 2.2, 3.3 ],
16
-            [ 4.4, 5.5, 6.6 ],
17
-            [ 7.7, 8.8, 9.9 ],
15
+            [1.1, 2.2, 3.3],
16
+            [4.4, 5.5, 6.6],
17
+            [7.7, 8.8, 9.9],
18 18
         ],
19 19
     ],
20 20
     [
21 21
         0,
22 22
         [
23
-            [ 10, 20, 30 ],
24
-            [ 40, 50, 60 ],
25
-            [ 70, 80, 90 ],
23
+            [10, 20, 30],
24
+            [40, 50, 60],
25
+            [70, 80, 90],
26 26
         ],
27 27
     ],
28 28
     [
29 29
         -360.0,
30 30
         [
31
-            [ 8, 1, 6 ],
32
-            [ 3, 5, 7 ],
33
-            [ 4, 9, 2 ],
31
+            [8, 1, 6],
32
+            [3, 5, 7],
33
+            [4, 9, 2],
34 34
         ],
35 35
     ],
36 36
     [
37 37
         -9,
38 38
         [
39
-            [ 5, 2 ],
40
-            [ 7, 1 ],
39
+            [5, 2],
40
+            [7, 1],
41 41
         ],
42 42
     ],
43 43
     [
44 44
         40,
45 45
         [
46
-            [ 6, 4, 2 ],
47
-            [ 3, 5, 3 ],
48
-            [ 2, 3, 4 ],
46
+            [6, 4, 2],
47
+            [3, 5, 3],
48
+            [2, 3, 4],
49 49
         ],
50 50
     ],
51 51
     [
52 52
         1.81,
53 53
         [
54
-            [ 0.20,  1.0 ],
55
-            [ 0.35, 10.8 ],
54
+            [0.20, 1.0],
55
+            [0.35, 10.8],
56 56
         ],
57 57
     ],
58 58
     [
59 59
         -2,
60 60
         [
61
-            [ 1, 2 ],
62
-            [ 3, 4 ],
61
+            [1, 2],
62
+            [3, 4],
63 63
         ],
64 64
     ],
65 65
     [
66 66
         -3,
67 67
         [
68
-            [ 1, 2, 1 ],
69
-            [ 3, 4, 2 ],
70
-            [ 1, 1, 2 ],
68
+            [1, 2, 1],
69
+            [3, 4, 2],
70
+            [1, 1, 2],
71 71
         ],
72 72
     ],
73 73
     [
74 74
         88,
75 75
         [
76
-            [ 1, 3,  8, 5 ],
77
-            [ 1, 3,  6, 1 ],
78
-            [ 1, 1,  1, 0 ],
79
-            [ 7, 3, 10, 2 ],
76
+            [1, 3, 8, 5],
77
+            [1, 3, 6, 1],
78
+            [1, 1, 1, 0],
79
+            [7, 3, 10, 2],
80 80
         ],
81 81
     ],
82 82
     [
83 83
         1,
84 84
         [
85
-            [ 3,  6, 1 ],
86
-            [ 1,  1, 0 ],
87
-            [ 3, 10, 2 ],
85
+            [3, 6, 1],
86
+            [1, 1, 0],
87
+            [3, 10, 2],
88 88
         ],
89 89
     ],
90 90
     [
91 91
         -3,
92 92
         [
93
-            [ 3, 6 ],
94
-            [ 1, 1 ],
93
+            [3, 6],
94
+            [1, 1],
95 95
         ],
96 96
     ],
97 97
     [
98 98
         '#VALUE!',
99 99
         [
100
-            [  0.20,  1.00, -0.90 ],
101
-            [  0.35, 10.80,  4.00 ],
102
-            [ -3.15,  5.00,  null ],
100
+            [0.20, 1.00, -0.90],
101
+            [0.35, 10.80, 4.00],
102
+            [ -3.15, 5.00, null],
103 103
         ],
104 104
     ],
105 105
     [
106 106
         '#VALUE!',
107 107
         [
108
-            [ 1, 3, 8, 5 ],
109
-            [ 1, 3, 6, 1 ],
108
+            [1, 3, 8, 5],
109
+            [1, 3, 6, 1],
110 110
         ],
111 111
     ],
112 112
 ];
Please login to merge, or discard this patch.
tests/data/Calculation/MathTrig/MINVERSE.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -3,112 +3,112 @@
 block discarded – undo
3 3
 return [
4 4
     [
5 5
         [
6
-            [  0.147222222222222,    -0.14444444444444399,   0.063888888888888898 ],
7
-            [ -0.061111111111111102,  0.022222222222222199,  0.105555555555556    ],
8
-            [ -0.0194444444444444,    0.18888888888888899,  -0.102777777777778    ],
6
+            [0.147222222222222, -0.14444444444444399, 0.063888888888888898],
7
+            [ -0.061111111111111102, 0.022222222222222199, 0.105555555555556],
8
+            [ -0.0194444444444444, 0.18888888888888899, -0.102777777777778],
9 9
         ],
10 10
         [
11
-            [ 8, 1, 6 ],
12
-            [ 3, 5, 7 ],
13
-            [ 4, 9, 2 ],
11
+            [8, 1, 6],
12
+            [3, 5, 7],
13
+            [4, 9, 2],
14 14
         ],
15 15
     ],
16 16
     [
17 17
         [
18
-            [ 4, -1 ],
19
-            [ 2,  0 ],
18
+            [4, -1],
19
+            [2, 0],
20 20
         ],
21 21
         [
22
-            [  0.0, 0.5 ],
23
-            [ -1.0, 2.0 ],
22
+            [0.0, 0.5],
23
+            [ -1.0, 2.0],
24 24
         ],
25 25
     ],
26 26
     [
27 27
         [
28
-            [ 1, 2,  1 ],
29
-            [ 3, 4, -1 ],
30
-            [ 0, 2,  0 ],
28
+            [1, 2, 1],
29
+            [3, 4, -1],
30
+            [0, 2, 0],
31 31
         ],
32 32
         [
33
-            [ 0.25,  0.25, -0.75 ],
34
-            [ 0.00,  0.00,  0.50 ],
35
-            [ 0.75, -0.25, -0.25 ],
33
+            [0.25, 0.25, -0.75],
34
+            [0.00, 0.00, 0.50],
35
+            [0.75, -0.25, -0.25],
36 36
         ],
37 37
     ],
38 38
     [
39 39
         [
40
-            [ -0.4545454545455, 1.8181818181818,  0.2727272727273, -0.4545454545455 ],
41
-            [ -0.4545454545455, 1.8181818181818, -0.7272727272727, -0.4545454545455 ],
42
-            [  0.9090909090909, 1.3636363636364,  0.4545454545455,  0.9090909090909 ],
43
-            [  2.2727272727273, 0.9090909090909,  5.6363636363636,  3.2727272727273 ],
40
+            [ -0.4545454545455, 1.8181818181818, 0.2727272727273, -0.4545454545455],
41
+            [ -0.4545454545455, 1.8181818181818, -0.7272727272727, -0.4545454545455],
42
+            [0.9090909090909, 1.3636363636364, 0.4545454545455, 0.9090909090909],
43
+            [2.2727272727273, 0.9090909090909, 5.6363636363636, 3.2727272727273],
44 44
         ],
45 45
         [
46
-            [  3.2, -4.8,  2.8, -1.0 ],
47
-            [  0.2,  0.2,  0.2,  0.0 ],
48
-            [  1.0, -1.0,  0.0,  0.0 ],
49
-            [ -4.0,  5.0, -2.0,  1.0 ],
46
+            [3.2, -4.8, 2.8, -1.0],
47
+            [0.2, 0.2, 0.2, 0.0],
48
+            [1.0, -1.0, 0.0, 0.0],
49
+            [ -4.0, 5.0, -2.0, 1.0],
50 50
         ],
51 51
     ],
52 52
     [
53 53
         [
54
-            [ 1, 2 ],
55
-            [ 3, 4 ],
54
+            [1, 2],
55
+            [3, 4],
56 56
         ],
57 57
         [
58
-            [ -2.0,  1.0 ],
59
-            [  1.5, -0.5 ],
58
+            [ -2.0, 1.0],
59
+            [1.5, -0.5],
60 60
         ],
61 61
     ],
62 62
     [
63 63
         [
64
-            [ 1, 2, 1 ],
65
-            [ 3, 4, 2 ],
66
-            [ 1, 1, 2 ],
64
+            [1, 2, 1],
65
+            [3, 4, 2],
66
+            [1, 1, 2],
67 67
         ],
68 68
         [
69
-            [ -2, 1, 0 ],
70
-            [ 1.3333333333333299,  -0.33333333333332998, -0.33333333333332998 ],
71
-            [ 0.33333333333332998, -0.33333333333332998,  0.66666666666666996 ],
69
+            [ -2, 1, 0],
70
+            [1.3333333333333299, -0.33333333333332998, -0.33333333333332998],
71
+            [0.33333333333332998, -0.33333333333332998, 0.66666666666666996],
72 72
         ],
73 73
     ],
74 74
     [
75 75
         [
76
-            [ 2, 3 ],
77
-            [ 4, 5 ],
76
+            [2, 3],
77
+            [4, 5],
78 78
         ],
79 79
         [
80
-            [ -2.5,  1.5 ],
81
-            [  2.0, -1.0 ],
80
+            [ -2.5, 1.5],
81
+            [2.0, -1.0],
82 82
         ],
83 83
     ],
84 84
     [
85 85
         [
86
-            [ 5, 8 ],
87
-            [ 7, 9 ],
86
+            [5, 8],
87
+            [7, 9],
88 88
         ],
89 89
         [
90
-            [ -0.81818181818181801,  0.72727272727272696 ],
91
-            [  0.63636363636363602, -0.45454545454545497 ],
90
+            [ -0.81818181818181801, 0.72727272727272696],
91
+            [0.63636363636363602, -0.45454545454545497],
92 92
         ],
93 93
     ],
94 94
     [
95 95
         [
96
-            [ 45, 78 ],
97
-            [ 17, 50 ],
96
+            [45, 78],
97
+            [17, 50],
98 98
         ],
99 99
         [
100
-            [  0.054112554112554001, -0.084415584415584    ],
101
-            [ -0.018398268398268001,  0.048701298701299002 ],
100
+            [0.054112554112554001, -0.084415584415584],
101
+            [ -0.018398268398268001, 0.048701298701299002],
102 102
         ],
103 103
     ],
104 104
     [
105 105
         [
106
-            [ 2, 2 ],
107
-            [ 2, 1 ],
106
+            [2, 2],
107
+            [2, 1],
108 108
         ],
109 109
         [
110
-            [ -0.5,  1.0 ],
111
-            [  1.0, -1.0 ],
110
+            [ -0.5, 1.0],
111
+            [1.0, -1.0],
112 112
         ],
113 113
     ],
114 114
 ];
Please login to merge, or discard this patch.
tests/data/Calculation/MathTrig/MMULT.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -3,110 +3,110 @@
 block discarded – undo
3 3
 return [
4 4
     [
5 5
         [
6
-            [  7, 10 ],
7
-            [ 15, 22 ],
6
+            [7, 10],
7
+            [15, 22],
8 8
         ],
9 9
         [
10
-            [ 1, 2 ],
11
-            [ 3, 4 ],
10
+            [1, 2],
11
+            [3, 4],
12 12
         ],
13 13
         [
14
-            [ 1, 2 ],
15
-            [ 3, 4 ],
14
+            [1, 2],
15
+            [3, 4],
16 16
         ],
17 17
     ],
18 18
     [
19 19
         [
20
-            [  30,  36,  42 ],
21
-            [  66,  81,  96 ],
22
-            [ 102, 126, 150 ],
20
+            [30, 36, 42],
21
+            [66, 81, 96],
22
+            [102, 126, 150],
23 23
         ],
24 24
         [
25
-            [ 1, 2, 3 ],
26
-            [ 4, 5, 6 ],
27
-            [ 7, 8, 9 ],
25
+            [1, 2, 3],
26
+            [4, 5, 6],
27
+            [7, 8, 9],
28 28
         ],
29 29
         [
30
-            [ 1, 2, 3 ],
31
-            [ 4, 5, 6 ],
32
-            [ 7, 8, 9 ],
30
+            [1, 2, 3],
31
+            [4, 5, 6],
32
+            [7, 8, 9],
33 33
         ],
34 34
     ],
35 35
     [
36 36
         [
37
-            [ 10.08, 14.40 ],
38
-            [ 21.60, 31.68 ],
37
+            [10.08, 14.40],
38
+            [21.60, 31.68],
39 39
         ],
40 40
         [
41
-            [ 1.2, 2.4 ],
42
-            [ 3.6, 4.8 ],
41
+            [1.2, 2.4],
42
+            [3.6, 4.8],
43 43
         ],
44 44
         [
45
-            [ 1.2, 2.4 ],
46
-            [ 3.6, 4.8 ],
45
+            [1.2, 2.4],
46
+            [3.6, 4.8],
47 47
         ],
48 48
     ],
49 49
     [
50 50
         [
51
-            [ 20.48, 30.60 ],
52
-            [ 50.40, 79.88 ],
51
+            [20.48, 30.60],
52
+            [50.40, 79.88],
53 53
         ],
54 54
         [
55
-            [ 1.2, 3.4 ],
56
-            [ 5.6, 7.8 ],
55
+            [1.2, 3.4],
56
+            [5.6, 7.8],
57 57
         ],
58 58
         [
59
-            [ 1.2, 3.4 ],
60
-            [ 5.6, 7.8 ],
59
+            [1.2, 3.4],
60
+            [5.6, 7.8],
61 61
         ],
62 62
     ],
63 63
     [
64 64
         [
65
-            [  62.00,  49.46 ],
66
-            [ 176.40, 144.50 ],
65
+            [62.00, 49.46],
66
+            [176.40, 144.50],
67 67
         ],
68 68
         [
69
-            [ 1.2, 2.3, 3.4, 4.5 ],
70
-            [ 5.6, 6.7, 7.8, 8.9 ],
69
+            [1.2, 2.3, 3.4, 4.5],
70
+            [5.6, 6.7, 7.8, 8.9],
71 71
         ],
72 72
         [
73
-            [ 9.8, 8.7 ],
74
-            [ 7.6, 6.5 ],
75
-            [ 5.4, 4.3 ],
76
-            [ 3.2, 2.1 ],
73
+            [9.8, 8.7],
74
+            [7.6, 6.5],
75
+            [5.4, 4.3],
76
+            [3.2, 2.1],
77 77
         ],
78 78
     ],
79 79
     [
80 80
         [
81
-            [ 17 ],
82
-            [ 39 ],
81
+            [17],
82
+            [39],
83 83
         ],
84 84
         [
85
-            [ 1, 2 ],
86
-            [ 3, 4 ],
85
+            [1, 2],
86
+            [3, 4],
87 87
         ],
88 88
         [
89
-            [ 5 ],
90
-            [ 6 ],
89
+            [5],
90
+            [6],
91 91
         ]
92 92
     ],
93 93
     // Mismatched dimensions (2x2) and (1x1)
94 94
     [
95 95
         '#VALUE!',
96 96
         [
97
-            [ 1, 2 ],
98
-            [ 3, 4 ],
97
+            [1, 2],
98
+            [3, 4],
99 99
         ],
100 100
         [
101
-            [ 2 ]
101
+            [2]
102 102
         ],
103 103
     ],
104 104
     // Mismatched dimensions (2x2) and individual cell
105 105
     [
106 106
         '#VALUE!',
107 107
         [
108
-            [ 1, 2 ],
109
-            [ 3, 4 ],
108
+            [1, 2],
109
+            [3, 4],
110 110
         ],
111 111
         [
112 112
             2,
Please login to merge, or discard this patch.
tests/data/Calculation/LookupRef/LOOKUP.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 return [
3 3
 
4
-    [ // Office reference example #1
4
+    [// Office reference example #1
5 5
         'orange',
6 6
         4.19,
7 7
         [
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
             [4.19],
10 10
             [5.17],
11 11
             [5.77],
12
-            [6,39],
12
+            [6, 39],
13 13
         ],
14 14
         [
15 15
             ['red'],
@@ -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
         [
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
             [4.19],
28 28
             [5.17],
29 29
             [5.77],
30
-            [6,39],
30
+            [6, 39],
31 31
         ],
32 32
         [
33 33
             ['red'],
@@ -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
         [
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             [4.19],
46 46
             [5.17],
47 47
             [5.77],
48
-            [6,39],
48
+            [6, 39],
49 49
         ],
50 50
         [
51 51
             ['red'],
@@ -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
         [
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
             [4.19],
64 64
             [5.17],
65 65
             [5.77],
66
-            [6,39],
66
+            [6, 39],
67 67
         ],
68 68
         [
69 69
             ['red'],
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         ],
75 75
     ],
76 76
 
77
-    [ // Array form test
77
+    [// Array form test
78 78
         'orange',
79 79
         4.2,
80 80
         [
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
             [4.19, 'orange'],
83 83
             [5.17, 'yellow'],
84 84
             [5.77, 'green'],
85
-            [6,39, 'blue'],
85
+            [6, 39, 'blue'],
86 86
         ]
87 87
     ],
88 88
 
Please login to merge, or discard this patch.
tests/data/Calculation/LookupRef/MATCH.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     [
108 108
         2,
109 109
         'a',
110
-        [false, 'a',1],
110
+        [false, 'a', 1],
111 111
         -1
112 112
     ],
113 113
     [
@@ -125,37 +125,37 @@  discard block
 block discarded – undo
125 125
     [
126 126
         '#N/A', // Expected
127 127
         true,
128
-        [0,1,2],
128
+        [0, 1, 2],
129 129
         -1
130 130
     ],
131 131
     [
132 132
         '#N/A', // Expected
133 133
         true,
134
-        [0,1,2],
134
+        [0, 1, 2],
135 135
         0
136 136
     ],
137 137
     [
138 138
         '#N/A', // Expected
139 139
         true,
140
-        [0,1,2],
140
+        [0, 1, 2],
141 141
         1
142 142
     ],
143 143
     [
144 144
         1, // Expected
145 145
         true,
146
-        [true,true,true],
146
+        [true, true, true],
147 147
         -1
148 148
     ],
149 149
     [
150 150
         1, // Expected
151 151
         true,
152
-        [true,true,true],
152
+        [true, true, true],
153 153
         0
154 154
     ],
155 155
     [
156 156
         3, // Expected
157 157
         true,
158
-        [true,true,true],
158
+        [true, true, true],
159 159
         1
160 160
     ],
161 161
     // lookup stops when value < searched one
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
     [
170 170
         '#N/A', // Expected
171 171
         6,
172
-        [true, false, 'a', 'z', 2, 888 ],
172
+        [true, false, 'a', 'z', 2, 888],
173 173
         -1
174 174
     ],
175 175
     [
@@ -230,19 +230,19 @@  discard block
 block discarded – undo
230 230
     [
231 231
         '#N/A', // Expected
232 232
         '?',
233
-        [1, 22,333],
233
+        [1, 22, 333],
234 234
         0
235 235
     ],
236 236
     [
237 237
         3, // Expected
238 238
         '???',
239
-        [1, 22,'aaa'],
239
+        [1, 22, 'aaa'],
240 240
         0
241 241
     ],
242 242
     [
243 243
         3, // Expected
244 244
         '*',
245
-        [1, 22,'aaa'],
245
+        [1, 22, 'aaa'],
246 246
         0
247 247
     ],
248 248
 ];
Please login to merge, or discard this patch.
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/PhpSpreadsheetTests/Calculation/CalculateFromFileTest.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@
 block discarded – undo
29 29
         $spreadsheet = $reader->load(__DIR__ . '/../../data/Reader/XLSX/calculationTest.xlsx');
30 30
         $cal = Calculation::getInstance($spreadsheet);
31 31
 
32
-        if(true === $mode){
32
+        if (true === $mode) {
33 33
             $cal->enableBranchPruning();
34
-        }else {
34
+        } else {
35 35
             $cal->disableBranchPruning();
36 36
         }
37 37
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 
32 32
         if(true === $mode){
33 33
             $cal->enableBranchPruning();
34
-        }else {
34
+        } else {
35 35
             $cal->disableBranchPruning();
36 36
         }
37 37
 
Please login to merge, or discard this patch.