@@ -61,8 +61,12 @@ |
||
61 | 61 | public function open() |
62 | 62 | { |
63 | 63 | // Some inline stuff that shouldn't error |
64 | - if (TRUE) echo 'hello'; |
|
65 | - foreach ($tokens as $token) echo $token; |
|
64 | + if (TRUE) { |
|
65 | + echo 'hello'; |
|
66 | + } |
|
67 | + foreach ($tokens as $token) { |
|
68 | + echo $token; |
|
69 | + } |
|
66 | 70 | } |
67 | 71 | |
68 | 72 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | if ($i == 0) { |
83 | 83 | $i = 1; |
84 | -}else{ |
|
84 | +} else{ |
|
85 | 85 | $i = 0; |
86 | 86 | } |
87 | 87 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | if ($i == 0) { |
99 | 99 | $i = 1; |
100 | -}else{ |
|
100 | +} else{ |
|
101 | 101 | $i = 0; |
102 | 102 | } |
103 | 103 | |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | |
120 | 120 | if ($i == 0) { |
121 | 121 | $i = 1; |
122 | -}else if($i == 2){ |
|
122 | +} else if($i == 2){ |
|
123 | 123 | $i = 0; |
124 | 124 | } |
125 | 125 | |
126 | 126 | if ($i == 0) { |
127 | 127 | $i = 1; |
128 | -}elseif($i == 2){ |
|
128 | +} elseif($i == 2){ |
|
129 | 129 | $i = 0; |
130 | 130 | } |
131 | 131 | |
@@ -153,7 +153,6 @@ discard block |
||
153 | 153 | } |
154 | 154 | |
155 | 155 | if ($i == 0) { |
156 | -} |
|
157 | -else { |
|
156 | +} else { |
|
158 | 157 | } |
159 | 158 | ?> |
160 | 159 | \ No newline at end of file |
@@ -101,19 +101,22 @@ discard block |
||
101 | 101 | ){ |
102 | 102 | } |
103 | 103 | |
104 | -if ($condition1) |
|
104 | +if ($condition1) { |
|
105 | 105 | echo 'bar'; |
106 | +} |
|
106 | 107 | |
107 | 108 | if ($condition1 |
108 | 109 | || $condition2 |
109 | -|| $condition3) |
|
110 | +|| $condition3) { |
|
110 | 111 | echo 'bar'; |
112 | +} |
|
111 | 113 | |
112 | 114 | |
113 | 115 | if ($condition1 |
114 | 116 | || $condition2 || $condition3 |
115 | -) |
|
117 | +) { |
|
116 | 118 | echo 'bar'; |
119 | +} |
|
117 | 120 | |
118 | 121 | if (!empty($post) |
119 | 122 | && (!empty($context['header']) |
@@ -142,18 +145,22 @@ discard block |
||
142 | 145 | endif; |
143 | 146 | |
144 | 147 | if ($IPP->errorCode() == 401 || // comment |
145 | - $IPP->errorCode() == 3200) /* long comment |
|
148 | + $IPP->errorCode() == 3200) { |
|
149 | + /* long comment |
|
146 | 150 | here |
147 | 151 | */ |
148 | 152 | { |
149 | 153 | return false; |
150 | 154 | } |
155 | +} |
|
151 | 156 | |
152 | 157 | if ($IPP->errorCode() == 401 || // comment |
153 | - $IPP->errorCode() == 3200) // long comment here |
|
158 | + $IPP->errorCode() == 3200) { |
|
159 | + // long comment here |
|
154 | 160 | { |
155 | 161 | return false; |
156 | 162 | } |
163 | +} |
|
157 | 164 | |
158 | 165 | if ($IPP->errorCode() == 401 |
159 | 166 | // Comment explaining the next condition here. |
@@ -191,18 +198,22 @@ discard block |
||
191 | 198 | <?php |
192 | 199 | |
193 | 200 | if ($IPP->errorCode() == 401 || // phpcs:ignore Standard.Category.Sniff -- for reasons. |
194 | - $IPP->errorCode() == 3200) /* |
|
201 | + $IPP->errorCode() == 3200) { |
|
202 | + /* |
|
195 | 203 | phpcs:ignore Standard.Category.Sniff -- for reasons. |
196 | 204 | */ |
197 | 205 | { |
198 | 206 | return false; |
199 | 207 | } |
208 | +} |
|
200 | 209 | |
201 | 210 | if ($IPP->errorCode() == 401 || // phpcs:disable Standard.Category.Sniff -- for reasons. |
202 | - $IPP->errorCode() == 3200) // phpcs:enable |
|
211 | + $IPP->errorCode() == 3200) { |
|
212 | + // phpcs:enable |
|
203 | 213 | { |
204 | 214 | return false; |
205 | 215 | } |
216 | +} |
|
206 | 217 | |
207 | 218 | if ($IPP->errorCode() == 401 |
208 | 219 | // phpcs:ignore Standard.Category.Sniff -- for reasons. |
@@ -8,7 +8,9 @@ |
||
8 | 8 | |
9 | 9 | for($i=0,$j=50; $i<100; $i++) { |
10 | 10 | while($j--) { |
11 | - if($j==17) goto end; |
|
11 | + if($j==17) { |
|
12 | + goto end; |
|
13 | + } |
|
12 | 14 | } |
13 | 15 | } |
14 | 16 | echo "i = $i"; |
@@ -61,8 +61,12 @@ discard block |
||
61 | 61 | public function open() |
62 | 62 | { |
63 | 63 | // Some inline stuff that shouldn't error |
64 | - if (TRUE) echo 'hello'; |
|
65 | - foreach ($tokens as $token) echo $token; |
|
64 | + if (TRUE) { |
|
65 | + echo 'hello'; |
|
66 | + } |
|
67 | + foreach ($tokens as $token) { |
|
68 | + echo $token; |
|
69 | + } |
|
66 | 70 | } |
67 | 71 | |
68 | 72 | /** |
@@ -794,13 +798,18 @@ discard block |
||
794 | 798 | elseif ($a == 6) : |
795 | 799 | echo "a equals 6"; |
796 | 800 | echo "!!!"; |
797 | -else : |
|
801 | +else { |
|
802 | + : |
|
798 | 803 | echo "a is neither 5 nor 6"; |
804 | +} |
|
799 | 805 | endif; |
800 | 806 | |
801 | 807 | if ($foo): |
802 | -if ($bar) $foo = 1; |
|
803 | -elseif ($baz) $foo = 2; |
|
808 | +if ($bar) { |
|
809 | + $foo = 1; |
|
810 | +} elseif ($baz) { |
|
811 | + $foo = 2; |
|
812 | +} |
|
804 | 813 | endif; |
805 | 814 | |
806 | 815 | $this |
@@ -1453,8 +1462,7 @@ discard block |
||
1453 | 1462 | |
1454 | 1463 | <?php |
1455 | 1464 | if (true) { |
1456 | - } |
|
1457 | - else if (true) { |
|
1465 | + } else if (true) { |
|
1458 | 1466 | } |
1459 | 1467 | |
1460 | 1468 | $a = 1; |
@@ -61,8 +61,12 @@ discard block |
||
61 | 61 | public function open() |
62 | 62 | { |
63 | 63 | // Some inline stuff that shouldn't error |
64 | - if (TRUE) echo 'hello'; |
|
65 | - foreach ($tokens as $token) echo $token; |
|
64 | + if (TRUE) { |
|
65 | + echo 'hello'; |
|
66 | + } |
|
67 | + foreach ($tokens as $token) { |
|
68 | + echo $token; |
|
69 | + } |
|
66 | 70 | } |
67 | 71 | |
68 | 72 | /** |
@@ -794,13 +798,18 @@ discard block |
||
794 | 798 | elseif ($a == 6) : |
795 | 799 | echo "a equals 6"; |
796 | 800 | echo "!!!"; |
797 | -else : |
|
801 | +else { |
|
802 | + : |
|
798 | 803 | echo "a is neither 5 nor 6"; |
804 | +} |
|
799 | 805 | endif; |
800 | 806 | |
801 | 807 | if ($foo): |
802 | -if ($bar) $foo = 1; |
|
803 | -elseif ($baz) $foo = 2; |
|
808 | +if ($bar) { |
|
809 | + $foo = 1; |
|
810 | +} elseif ($baz) { |
|
811 | + $foo = 2; |
|
812 | +} |
|
804 | 813 | endif; |
805 | 814 | |
806 | 815 | $this |
@@ -1453,8 +1462,7 @@ discard block |
||
1453 | 1462 | |
1454 | 1463 | <?php |
1455 | 1464 | if (true) { |
1456 | - } |
|
1457 | - else if (true) { |
|
1465 | + } else if (true) { |
|
1458 | 1466 | } |
1459 | 1467 | |
1460 | 1468 | $a = 1; |
@@ -249,4 +249,3 @@ |
||
249 | 249 | * @link http://pear.php.net/package/PHP_CodeSniffer |
250 | 250 | */ |
251 | 251 | |
252 | -/** No docblock close tag. Must be last test without new line. |
|
253 | 252 | \ No newline at end of file |
@@ -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 | - } |
@@ -1,2 +1,1 @@ |
||
1 | 1 | <?php |
2 | -/** Why me? |
|
3 | 2 | \ No newline at end of file |