@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | 1, |
15 | 15 | 2, |
16 | 16 | /* three */ 3, |
17 | - ]; |
|
17 | + ]; |
|
18 | 18 | |
19 | 19 | $var = [ |
20 | 20 | 1 => 'one', |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | ['two'], |
60 | 60 | 'fn' => |
61 | 61 | fn ($x) => yield 'k' => $x, |
62 | - $a ?? $b, |
|
63 | - $c ? $d : $e, |
|
62 | + $a ?? $b, |
|
63 | + $c ? $d : $e, |
|
64 | 64 | ]; |
65 | 65 | |
66 | 66 | // phpcs:set Generic.Arrays.ArrayIndent indent 2 |
@@ -9,9 +9,3 @@ |
||
9 | 9 | $arr = array( |
10 | 10 | 'a' => 'a', |
11 | 11 | <<<<<<< HEAD |
12 | - 'b' => 'b' |
|
13 | -======= |
|
14 | - 'c' => 'c' |
|
15 | ->>>>>>> master |
|
16 | - ); |
|
17 | - } |
@@ -56,10 +56,10 @@ |
||
56 | 56 | $var = (binary) $string; |
57 | 57 | |
58 | 58 | $var = array( |
59 | - (bool) $a, |
|
60 | - array( |
|
59 | + (bool) $a, |
|
60 | + array( |
|
61 | 61 | (int) $b, |
62 | - ), |
|
62 | + ), |
|
63 | 63 | ); |
64 | 64 | |
65 | 65 | (bool) $a ? echo $b : echo $c; |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | // Valid |
136 | 136 | $variable = 12; |
137 | 137 | $var = a_very(long_line('that', 'contains'), |
138 | - a_bunch('of long', 'parameters'), |
|
139 | - 'that_need to be aligned with the equal sign'); |
|
138 | + a_bunch('of long', 'parameters'), |
|
139 | + 'that_need to be aligned with the equal sign'); |
|
140 | 140 | $var2 = 12; |
141 | 141 | |
142 | 142 | // Valid |
@@ -149,8 +149,8 @@ discard block |
||
149 | 149 | // Invalid |
150 | 150 | $variable = 12; |
151 | 151 | $var = a_very(long_line('that', 'contains'), |
152 | - a_bunch('of long', 'parameters'), |
|
153 | - 'that_need to be aligned with the equal sign'); |
|
152 | + a_bunch('of long', 'parameters'), |
|
153 | + 'that_need to be aligned with the equal sign'); |
|
154 | 154 | $var2 = 12; |
155 | 155 | |
156 | 156 | // Invalid |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $var = (boolean) /* comment */ $var2; |
54 | 54 | |
55 | 55 | $var = (int) |
56 | - $var2; |
|
56 | + $var2; |
|
57 | 57 | |
58 | 58 | if ( (string) // phpcs:ignore Standard.Cat.SniffName -- for reasons. |
59 | 59 | $x === 'test' |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | // phpcs:set Generic.Formatting.SpaceAfterCast ignoreNewlines true |
63 | 63 | $var = (int) |
64 | - $var1 + (bool) $var2; |
|
64 | + $var1 + (bool) $var2; |
|
65 | 65 | |
66 | 66 | if ( (string) // phpcs:ignore Standard.Cat.SniffName -- for reasons. |
67 | 67 | $x === 'test' |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $var = (boolean) /* comment */ $var2; |
77 | 77 | |
78 | 78 | $var = (integer) |
79 | - $var2; |
|
79 | + $var2; |
|
80 | 80 | |
81 | 81 | // phpcs:set Generic.Formatting.SpaceAfterCast spacing 0 |
82 | 82 | $var = (int) $var2; |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | $var = (boolean) /* comment */ $var2; |
87 | 87 | |
88 | 88 | $var = (integer) |
89 | - $var2; |
|
89 | + $var2; |
|
90 | 90 | |
91 | 91 | // phpcs:set Generic.Formatting.SpaceAfterCast ignoreNewlines true |
92 | 92 | $var = (int) |
93 | - $var1 + (bool) $var2; |
|
93 | + $var1 + (bool) $var2; |
|
94 | 94 | // phpcs:set Generic.Formatting.SpaceAfterCast ignoreNewlines false |
95 | 95 | // phpcs:set Generic.Formatting.SpaceAfterCast spacing 1 |
@@ -10,9 +10,9 @@ |
||
10 | 10 | <?php |
11 | 11 | function foo() |
12 | 12 | { |
13 | - $query->group('a.id, |
|
13 | + $query->group('a.id, |
|
14 | 14 | uc.name, |
15 | 15 | ag.title, |
16 | 16 | ua.name' |
17 | - ); |
|
17 | + ); |
|
18 | 18 | } |
@@ -1,2 +1,1 @@ |
||
1 | 1 | <?php |
2 | -/** Why me? |
|
3 | 2 | \ No newline at end of file |
@@ -1,2 +1,1 @@ |
||
1 | 1 | <?php |
2 | -/** Why me? |
@@ -1,2 +1,1 @@ |
||
1 | 1 | <?php |
2 | -/** Why me? |