@@ -100,33 +100,33 @@ |
||
100 | 100 | } |
101 | 101 | |
102 | 102 | switch ($tokens[$i]['code']) { |
103 | - case T_DOUBLE_COLON: |
|
104 | - $usedName = strtolower($tokens[($i - 1)]['content']); |
|
105 | - if ($usedName === $systemName) { |
|
106 | - // The included system was used, so it is fine. |
|
107 | - return; |
|
108 | - } |
|
109 | - break; |
|
110 | - case T_EXTENDS: |
|
111 | - $classNameToken = $phpcsFile->findNext(T_STRING, ($i + 1)); |
|
112 | - $className = strtolower($tokens[$classNameToken]['content']); |
|
113 | - if ($className === $systemName) { |
|
114 | - // The included system was used, so it is fine. |
|
115 | - return; |
|
116 | - } |
|
117 | - break; |
|
118 | - case T_IMPLEMENTS: |
|
119 | - $endImplements = $phpcsFile->findNext([T_EXTENDS, T_OPEN_CURLY_BRACKET], ($i + 1)); |
|
120 | - for ($x = ($i + 1); $x < $endImplements; $x++) { |
|
121 | - if ($tokens[$x]['code'] === T_STRING) { |
|
122 | - $className = strtolower($tokens[$x]['content']); |
|
123 | - if ($className === $systemName) { |
|
124 | - // The included system was used, so it is fine. |
|
125 | - return; |
|
103 | + case T_DOUBLE_COLON: |
|
104 | + $usedName = strtolower($tokens[($i - 1)]['content']); |
|
105 | + if ($usedName === $systemName) { |
|
106 | + // The included system was used, so it is fine. |
|
107 | + return; |
|
108 | + } |
|
109 | + break; |
|
110 | + case T_EXTENDS: |
|
111 | + $classNameToken = $phpcsFile->findNext(T_STRING, ($i + 1)); |
|
112 | + $className = strtolower($tokens[$classNameToken]['content']); |
|
113 | + if ($className === $systemName) { |
|
114 | + // The included system was used, so it is fine. |
|
115 | + return; |
|
116 | + } |
|
117 | + break; |
|
118 | + case T_IMPLEMENTS: |
|
119 | + $endImplements = $phpcsFile->findNext([T_EXTENDS, T_OPEN_CURLY_BRACKET], ($i + 1)); |
|
120 | + for ($x = ($i + 1); $x < $endImplements; $x++) { |
|
121 | + if ($tokens[$x]['code'] === T_STRING) { |
|
122 | + $className = strtolower($tokens[$x]['content']); |
|
123 | + if ($className === $systemName) { |
|
124 | + // The included system was used, so it is fine. |
|
125 | + return; |
|
126 | + } |
|
126 | 127 | } |
127 | 128 | } |
128 | - } |
|
129 | - break; |
|
129 | + break; |
|
130 | 130 | }//end switch |
131 | 131 | }//end for |
132 | 132 |
@@ -52,17 +52,17 @@ |
||
52 | 52 | $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true); |
53 | 53 | $typeName = trim($tokens[$typeName]['content'], " '"); |
54 | 54 | switch (strtolower($tokens[($stackPtr + 1)]['content'])) { |
55 | - case 'includesystem' : |
|
56 | - $included = strtolower($typeName); |
|
57 | - break; |
|
58 | - case 'includeasset' : |
|
59 | - $included = strtolower($typeName).'assettype'; |
|
60 | - break; |
|
61 | - case 'includewidget' : |
|
62 | - $included = strtolower($typeName).'widgettype'; |
|
63 | - break; |
|
64 | - default: |
|
65 | - return; |
|
55 | + case 'includesystem' : |
|
56 | + $included = strtolower($typeName); |
|
57 | + break; |
|
58 | + case 'includeasset' : |
|
59 | + $included = strtolower($typeName).'assettype'; |
|
60 | + break; |
|
61 | + case 'includewidget' : |
|
62 | + $included = strtolower($typeName).'widgettype'; |
|
63 | + break; |
|
64 | + default: |
|
65 | + return; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | if ($included === strtolower($ownClass)) { |
@@ -28,20 +28,20 @@ |
||
28 | 28 | public function getErrorList($testFile='') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'ClosingTagUnitTest.1.inc': |
|
32 | - return [11 => 1]; |
|
31 | + case 'ClosingTagUnitTest.1.inc': |
|
32 | + return [11 => 1]; |
|
33 | 33 | |
34 | - case 'ClosingTagUnitTest.3.inc': |
|
35 | - case 'ClosingTagUnitTest.4.inc': |
|
36 | - case 'ClosingTagUnitTest.5.inc': |
|
37 | - case 'ClosingTagUnitTest.7.inc': |
|
38 | - return [1 => 1]; |
|
34 | + case 'ClosingTagUnitTest.3.inc': |
|
35 | + case 'ClosingTagUnitTest.4.inc': |
|
36 | + case 'ClosingTagUnitTest.5.inc': |
|
37 | + case 'ClosingTagUnitTest.7.inc': |
|
38 | + return [1 => 1]; |
|
39 | 39 | |
40 | - case 'ClosingTagUnitTest.6.inc': |
|
41 | - return [3 => 1]; |
|
40 | + case 'ClosingTagUnitTest.6.inc': |
|
41 | + return [3 => 1]; |
|
42 | 42 | |
43 | - default: |
|
44 | - return []; |
|
43 | + default: |
|
44 | + return []; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | }//end getErrorList() |
@@ -145,89 +145,89 @@ |
||
145 | 145 | |
146 | 146 | do { |
147 | 147 | switch ($tokens[$next]['code']) { |
148 | - case T_DOC_COMMENT_OPEN_TAG: |
|
149 | - if ($foundDocblock === true) { |
|
150 | - // Found a second docblock, so start of code. |
|
151 | - break(2); |
|
152 | - } |
|
148 | + case T_DOC_COMMENT_OPEN_TAG: |
|
149 | + if ($foundDocblock === true) { |
|
150 | + // Found a second docblock, so start of code. |
|
151 | + break(2); |
|
152 | + } |
|
153 | 153 | |
154 | - // Make sure this is not a code-level docblock. |
|
155 | - $end = $tokens[$next]['comment_closer']; |
|
156 | - $docToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), null, true); |
|
154 | + // Make sure this is not a code-level docblock. |
|
155 | + $end = $tokens[$next]['comment_closer']; |
|
156 | + $docToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), null, true); |
|
157 | 157 | |
158 | - if (isset($commentOpeners[$tokens[$docToken]['code']]) === false |
|
159 | - && isset(Tokens::$methodPrefixes[$tokens[$docToken]['code']]) === false |
|
160 | - ) { |
|
161 | - // Check for an @var annotation. |
|
162 | - $annotation = false; |
|
163 | - for ($i = $next; $i < $end; $i++) { |
|
164 | - if ($tokens[$i]['code'] === T_DOC_COMMENT_TAG |
|
165 | - && strtolower($tokens[$i]['content']) === '@var' |
|
166 | - ) { |
|
167 | - $annotation = true; |
|
168 | - break; |
|
158 | + if (isset($commentOpeners[$tokens[$docToken]['code']]) === false |
|
159 | + && isset(Tokens::$methodPrefixes[$tokens[$docToken]['code']]) === false |
|
160 | + ) { |
|
161 | + // Check for an @var annotation. |
|
162 | + $annotation = false; |
|
163 | + for ($i = $next; $i < $end; $i++) { |
|
164 | + if ($tokens[$i]['code'] === T_DOC_COMMENT_TAG |
|
165 | + && strtolower($tokens[$i]['content']) === '@var' |
|
166 | + ) { |
|
167 | + $annotation = true; |
|
168 | + break; |
|
169 | + } |
|
169 | 170 | } |
170 | - } |
|
171 | 171 | |
172 | - if ($annotation === false) { |
|
173 | - $foundDocblock = true; |
|
174 | - $headerLines[] = [ |
|
175 | - 'type' => 'docblock', |
|
176 | - 'start' => $next, |
|
177 | - 'end' => $end, |
|
178 | - ]; |
|
179 | - } |
|
180 | - }//end if |
|
172 | + if ($annotation === false) { |
|
173 | + $foundDocblock = true; |
|
174 | + $headerLines[] = [ |
|
175 | + 'type' => 'docblock', |
|
176 | + 'start' => $next, |
|
177 | + 'end' => $end, |
|
178 | + ]; |
|
179 | + } |
|
180 | + }//end if |
|
181 | 181 | |
182 | - $next = $end; |
|
183 | - break; |
|
184 | - case T_DECLARE: |
|
185 | - case T_NAMESPACE: |
|
186 | - $end = $phpcsFile->findEndOfStatement($next); |
|
187 | - |
|
188 | - $headerLines[] = [ |
|
189 | - 'type' => substr(strtolower($tokens[$next]['type']), 2), |
|
190 | - 'start' => $next, |
|
191 | - 'end' => $end, |
|
192 | - ]; |
|
182 | + $next = $end; |
|
183 | + break; |
|
184 | + case T_DECLARE: |
|
185 | + case T_NAMESPACE: |
|
186 | + $end = $phpcsFile->findEndOfStatement($next); |
|
187 | + |
|
188 | + $headerLines[] = [ |
|
189 | + 'type' => substr(strtolower($tokens[$next]['type']), 2), |
|
190 | + 'start' => $next, |
|
191 | + 'end' => $end, |
|
192 | + ]; |
|
193 | 193 | |
194 | - $next = $end; |
|
195 | - break; |
|
196 | - case T_USE: |
|
197 | - $type = 'use'; |
|
198 | - $useType = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true); |
|
199 | - if ($useType !== false && $tokens[$useType]['code'] === T_STRING) { |
|
200 | - $content = strtolower($tokens[$useType]['content']); |
|
201 | - if ($content === 'function' || $content === 'const') { |
|
202 | - $type .= ' '.$content; |
|
194 | + $next = $end; |
|
195 | + break; |
|
196 | + case T_USE: |
|
197 | + $type = 'use'; |
|
198 | + $useType = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true); |
|
199 | + if ($useType !== false && $tokens[$useType]['code'] === T_STRING) { |
|
200 | + $content = strtolower($tokens[$useType]['content']); |
|
201 | + if ($content === 'function' || $content === 'const') { |
|
202 | + $type .= ' '.$content; |
|
203 | + } |
|
203 | 204 | } |
204 | - } |
|
205 | - |
|
206 | - $end = $phpcsFile->findEndOfStatement($next); |
|
207 | 205 | |
208 | - $headerLines[] = [ |
|
209 | - 'type' => $type, |
|
210 | - 'start' => $next, |
|
211 | - 'end' => $end, |
|
212 | - ]; |
|
206 | + $end = $phpcsFile->findEndOfStatement($next); |
|
213 | 207 | |
214 | - $next = $end; |
|
215 | - break; |
|
216 | - default: |
|
217 | - // Skip comments as PSR-12 doesn't say if these are allowed or not. |
|
218 | - if (isset(Tokens::$commentTokens[$tokens[$next]['code']]) === true) { |
|
219 | - $next = $phpcsFile->findNext(Tokens::$commentTokens, ($next + 1), null, true); |
|
220 | - if ($next === false) { |
|
221 | - // We reached the end of the file. |
|
222 | - break(2); |
|
223 | - } |
|
208 | + $headerLines[] = [ |
|
209 | + 'type' => $type, |
|
210 | + 'start' => $next, |
|
211 | + 'end' => $end, |
|
212 | + ]; |
|
224 | 213 | |
225 | - $next--; |
|
214 | + $next = $end; |
|
226 | 215 | break; |
227 | - } |
|
216 | + default: |
|
217 | + // Skip comments as PSR-12 doesn't say if these are allowed or not. |
|
218 | + if (isset(Tokens::$commentTokens[$tokens[$next]['code']]) === true) { |
|
219 | + $next = $phpcsFile->findNext(Tokens::$commentTokens, ($next + 1), null, true); |
|
220 | + if ($next === false) { |
|
221 | + // We reached the end of the file. |
|
222 | + break(2); |
|
223 | + } |
|
224 | + |
|
225 | + $next--; |
|
226 | + break; |
|
227 | + } |
|
228 | 228 | |
229 | - // We found the start of the main code block. |
|
230 | - break(2); |
|
229 | + // We found the start of the main code block. |
|
230 | + break(2); |
|
231 | 231 | }//end switch |
232 | 232 | |
233 | 233 | $next = $phpcsFile->findNext(T_WHITESPACE, ($next + 1), null, true); |
@@ -28,37 +28,37 @@ |
||
28 | 28 | public function getErrorList($testFile='') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'FileHeaderUnitTest.2.inc': |
|
32 | - return [ |
|
33 | - 1 => 1, |
|
34 | - 6 => 1, |
|
35 | - 7 => 1, |
|
36 | - 18 => 1, |
|
37 | - 20 => 1, |
|
38 | - 24 => 1, |
|
39 | - ]; |
|
40 | - case 'FileHeaderUnitTest.3.inc': |
|
41 | - return [ |
|
42 | - 9 => 1, |
|
43 | - 18 => 1, |
|
44 | - ]; |
|
45 | - case 'FileHeaderUnitTest.4.inc': |
|
46 | - return [ |
|
47 | - 1 => 1, |
|
48 | - 2 => 1, |
|
49 | - 3 => 1, |
|
50 | - 7 => 1, |
|
51 | - ]; |
|
52 | - case 'FileHeaderUnitTest.5.inc': |
|
53 | - return [4 => 1]; |
|
54 | - case 'FileHeaderUnitTest.7.inc': |
|
55 | - case 'FileHeaderUnitTest.10.inc': |
|
56 | - case 'FileHeaderUnitTest.11.inc': |
|
57 | - return [1 => 1]; |
|
58 | - case 'FileHeaderUnitTest.12.inc': |
|
59 | - return [4 => 2]; |
|
60 | - default: |
|
61 | - return []; |
|
31 | + case 'FileHeaderUnitTest.2.inc': |
|
32 | + return [ |
|
33 | + 1 => 1, |
|
34 | + 6 => 1, |
|
35 | + 7 => 1, |
|
36 | + 18 => 1, |
|
37 | + 20 => 1, |
|
38 | + 24 => 1, |
|
39 | + ]; |
|
40 | + case 'FileHeaderUnitTest.3.inc': |
|
41 | + return [ |
|
42 | + 9 => 1, |
|
43 | + 18 => 1, |
|
44 | + ]; |
|
45 | + case 'FileHeaderUnitTest.4.inc': |
|
46 | + return [ |
|
47 | + 1 => 1, |
|
48 | + 2 => 1, |
|
49 | + 3 => 1, |
|
50 | + 7 => 1, |
|
51 | + ]; |
|
52 | + case 'FileHeaderUnitTest.5.inc': |
|
53 | + return [4 => 1]; |
|
54 | + case 'FileHeaderUnitTest.7.inc': |
|
55 | + case 'FileHeaderUnitTest.10.inc': |
|
56 | + case 'FileHeaderUnitTest.11.inc': |
|
57 | + return [1 => 1]; |
|
58 | + case 'FileHeaderUnitTest.12.inc': |
|
59 | + return [4 => 2]; |
|
60 | + default: |
|
61 | + return []; |
|
62 | 62 | }//end switch |
63 | 63 | |
64 | 64 | }//end getErrorList() |
@@ -28,10 +28,10 @@ |
||
28 | 28 | public function getErrorList($testFile='') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'OpenTagUnitTest.2.inc': |
|
32 | - return [1 => 1]; |
|
33 | - default: |
|
34 | - return []; |
|
31 | + case 'OpenTagUnitTest.2.inc': |
|
32 | + return [1 => 1]; |
|
33 | + default: |
|
34 | + return []; |
|
35 | 35 | }//end switch |
36 | 36 | |
37 | 37 | }//end getErrorList() |
@@ -62,14 +62,14 @@ |
||
62 | 62 | public function getWarningList($testFile='') |
63 | 63 | { |
64 | 64 | switch ($testFile) { |
65 | - case 'SideEffectsUnitTest.3.inc': |
|
66 | - case 'SideEffectsUnitTest.4.inc': |
|
67 | - case 'SideEffectsUnitTest.5.inc': |
|
68 | - case 'SideEffectsUnitTest.10.inc': |
|
69 | - case 'SideEffectsUnitTest.12.inc': |
|
70 | - return [1 => 1]; |
|
71 | - default: |
|
72 | - return []; |
|
65 | + case 'SideEffectsUnitTest.3.inc': |
|
66 | + case 'SideEffectsUnitTest.4.inc': |
|
67 | + case 'SideEffectsUnitTest.5.inc': |
|
68 | + case 'SideEffectsUnitTest.10.inc': |
|
69 | + case 'SideEffectsUnitTest.12.inc': |
|
70 | + return [1 => 1]; |
|
71 | + default: |
|
72 | + return []; |
|
73 | 73 | }//end switch |
74 | 74 | |
75 | 75 | }//end getWarningList() |
@@ -50,106 +50,106 @@ |
||
50 | 50 | |
51 | 51 | switch ($tokens[$stackPtr]['type']) { |
52 | 52 | // Detect `something();;`. |
53 | - case 'T_SEMICOLON': |
|
54 | - $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true); |
|
55 | - |
|
56 | - if ($prevNonEmpty === false) { |
|
57 | - return; |
|
58 | - } |
|
59 | - |
|
60 | - if ($tokens[$prevNonEmpty]['code'] !== T_SEMICOLON |
|
61 | - && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
62 | - && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO |
|
63 | - ) { |
|
64 | - if ($tokens[$prevNonEmpty]['code'] !== T_CLOSE_CURLY_BRACKET |
|
65 | - || isset($tokens[$prevNonEmpty]['scope_condition']) === false |
|
66 | - ) { |
|
67 | - return; |
|
68 | - } |
|
53 | + case 'T_SEMICOLON': |
|
54 | + $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true); |
|
69 | 55 | |
70 | - $scopeOwner = $tokens[$tokens[$prevNonEmpty]['scope_condition']]['code']; |
|
71 | - if ($scopeOwner === T_CLOSURE || $scopeOwner === T_ANON_CLASS) { |
|
56 | + if ($prevNonEmpty === false) { |
|
72 | 57 | return; |
73 | 58 | } |
74 | 59 | |
75 | - // Else, it's something like `if (foo) {};` and the semi-colon is not needed. |
|
76 | - } |
|
77 | - |
|
78 | - if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) { |
|
79 | - $nested = $tokens[$stackPtr]['nested_parenthesis']; |
|
80 | - $lastCloser = array_pop($nested); |
|
81 | - if (isset($tokens[$lastCloser]['parenthesis_owner']) === true |
|
82 | - && $tokens[$tokens[$lastCloser]['parenthesis_owner']]['code'] === T_FOR |
|
60 | + if ($tokens[$prevNonEmpty]['code'] !== T_SEMICOLON |
|
61 | + && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
62 | + && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO |
|
83 | 63 | ) { |
84 | - // Empty for() condition. |
|
85 | - return; |
|
64 | + if ($tokens[$prevNonEmpty]['code'] !== T_CLOSE_CURLY_BRACKET |
|
65 | + || isset($tokens[$prevNonEmpty]['scope_condition']) === false |
|
66 | + ) { |
|
67 | + return; |
|
68 | + } |
|
69 | + |
|
70 | + $scopeOwner = $tokens[$tokens[$prevNonEmpty]['scope_condition']]['code']; |
|
71 | + if ($scopeOwner === T_CLOSURE || $scopeOwner === T_ANON_CLASS) { |
|
72 | + return; |
|
73 | + } |
|
74 | + |
|
75 | + // Else, it's something like `if (foo) {};` and the semi-colon is not needed. |
|
86 | 76 | } |
87 | - } |
|
88 | - |
|
89 | - $fix = $phpcsFile->addFixableWarning( |
|
90 | - 'Empty PHP statement detected: superfluous semi-colon.', |
|
91 | - $stackPtr, |
|
92 | - 'SemicolonWithoutCodeDetected' |
|
93 | - ); |
|
94 | - if ($fix === true) { |
|
95 | - $phpcsFile->fixer->beginChangeset(); |
|
96 | - |
|
97 | - if ($tokens[$prevNonEmpty]['code'] === T_OPEN_TAG |
|
98 | - || $tokens[$prevNonEmpty]['code'] === T_OPEN_TAG_WITH_ECHO |
|
99 | - ) { |
|
100 | - // Check for superfluous whitespace after the semi-colon which will be |
|
101 | - // removed as the `<?php ` open tag token already contains whitespace, |
|
102 | - // either a space or a new line. |
|
103 | - if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) { |
|
104 | - $replacement = str_replace(' ', '', $tokens[($stackPtr + 1)]['content']); |
|
105 | - $phpcsFile->fixer->replaceToken(($stackPtr + 1), $replacement); |
|
77 | + |
|
78 | + if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) { |
|
79 | + $nested = $tokens[$stackPtr]['nested_parenthesis']; |
|
80 | + $lastCloser = array_pop($nested); |
|
81 | + if (isset($tokens[$lastCloser]['parenthesis_owner']) === true |
|
82 | + && $tokens[$tokens[$lastCloser]['parenthesis_owner']]['code'] === T_FOR |
|
83 | + ) { |
|
84 | + // Empty for() condition. |
|
85 | + return; |
|
106 | 86 | } |
107 | 87 | } |
108 | 88 | |
109 | - for ($i = $stackPtr; $i > $prevNonEmpty; $i--) { |
|
110 | - if ($tokens[$i]['code'] !== T_SEMICOLON |
|
111 | - && $tokens[$i]['code'] !== T_WHITESPACE |
|
89 | + $fix = $phpcsFile->addFixableWarning( |
|
90 | + 'Empty PHP statement detected: superfluous semi-colon.', |
|
91 | + $stackPtr, |
|
92 | + 'SemicolonWithoutCodeDetected' |
|
93 | + ); |
|
94 | + if ($fix === true) { |
|
95 | + $phpcsFile->fixer->beginChangeset(); |
|
96 | + |
|
97 | + if ($tokens[$prevNonEmpty]['code'] === T_OPEN_TAG |
|
98 | + || $tokens[$prevNonEmpty]['code'] === T_OPEN_TAG_WITH_ECHO |
|
112 | 99 | ) { |
113 | - break; |
|
100 | + // Check for superfluous whitespace after the semi-colon which will be |
|
101 | + // removed as the `<?php ` open tag token already contains whitespace, |
|
102 | + // either a space or a new line. |
|
103 | + if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) { |
|
104 | + $replacement = str_replace(' ', '', $tokens[($stackPtr + 1)]['content']); |
|
105 | + $phpcsFile->fixer->replaceToken(($stackPtr + 1), $replacement); |
|
106 | + } |
|
114 | 107 | } |
115 | 108 | |
116 | - $phpcsFile->fixer->replaceToken($i, ''); |
|
117 | - } |
|
109 | + for ($i = $stackPtr; $i > $prevNonEmpty; $i--) { |
|
110 | + if ($tokens[$i]['code'] !== T_SEMICOLON |
|
111 | + && $tokens[$i]['code'] !== T_WHITESPACE |
|
112 | + ) { |
|
113 | + break; |
|
114 | + } |
|
115 | + |
|
116 | + $phpcsFile->fixer->replaceToken($i, ''); |
|
117 | + } |
|
118 | + |
|
119 | + $phpcsFile->fixer->endChangeset(); |
|
120 | + }//end if |
|
121 | + break; |
|
122 | + |
|
123 | + // Detect `<?php ? >`. |
|
124 | + case 'T_CLOSE_TAG': |
|
125 | + $prevNonEmpty = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true); |
|
118 | 126 | |
119 | - $phpcsFile->fixer->endChangeset(); |
|
120 | - }//end if |
|
121 | - break; |
|
122 | - |
|
123 | - // Detect `<?php ? >`. |
|
124 | - case 'T_CLOSE_TAG': |
|
125 | - $prevNonEmpty = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true); |
|
126 | - |
|
127 | - if ($prevNonEmpty === false |
|
128 | - || ($tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
129 | - && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO) |
|
130 | - ) { |
|
131 | - return; |
|
132 | - } |
|
133 | - |
|
134 | - $fix = $phpcsFile->addFixableWarning( |
|
135 | - 'Empty PHP open/close tag combination detected.', |
|
136 | - $prevNonEmpty, |
|
137 | - 'EmptyPHPOpenCloseTagsDetected' |
|
138 | - ); |
|
139 | - if ($fix === true) { |
|
140 | - $phpcsFile->fixer->beginChangeset(); |
|
141 | - |
|
142 | - for ($i = $prevNonEmpty; $i <= $stackPtr; $i++) { |
|
143 | - $phpcsFile->fixer->replaceToken($i, ''); |
|
127 | + if ($prevNonEmpty === false |
|
128 | + || ($tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
129 | + && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO) |
|
130 | + ) { |
|
131 | + return; |
|
144 | 132 | } |
145 | 133 | |
146 | - $phpcsFile->fixer->endChangeset(); |
|
147 | - } |
|
148 | - break; |
|
134 | + $fix = $phpcsFile->addFixableWarning( |
|
135 | + 'Empty PHP open/close tag combination detected.', |
|
136 | + $prevNonEmpty, |
|
137 | + 'EmptyPHPOpenCloseTagsDetected' |
|
138 | + ); |
|
139 | + if ($fix === true) { |
|
140 | + $phpcsFile->fixer->beginChangeset(); |
|
141 | + |
|
142 | + for ($i = $prevNonEmpty; $i <= $stackPtr; $i++) { |
|
143 | + $phpcsFile->fixer->replaceToken($i, ''); |
|
144 | + } |
|
145 | + |
|
146 | + $phpcsFile->fixer->endChangeset(); |
|
147 | + } |
|
148 | + break; |
|
149 | 149 | |
150 | - default: |
|
151 | - // Deliberately left empty. |
|
152 | - break; |
|
150 | + default: |
|
151 | + // Deliberately left empty. |
|
152 | + break; |
|
153 | 153 | }//end switch |
154 | 154 | |
155 | 155 | }//end process() |
@@ -95,18 +95,18 @@ |
||
95 | 95 | if ($fix === true) { |
96 | 96 | $tokens = $phpcsFile->getTokens(); |
97 | 97 | switch ($this->eolChar) { |
98 | - case '\n': |
|
99 | - $eolChar = "\n"; |
|
100 | - break; |
|
101 | - case '\r': |
|
102 | - $eolChar = "\r"; |
|
103 | - break; |
|
104 | - case '\r\n': |
|
105 | - $eolChar = "\r\n"; |
|
106 | - break; |
|
107 | - default: |
|
108 | - $eolChar = $this->eolChar; |
|
109 | - break; |
|
98 | + case '\n': |
|
99 | + $eolChar = "\n"; |
|
100 | + break; |
|
101 | + case '\r': |
|
102 | + $eolChar = "\r"; |
|
103 | + break; |
|
104 | + case '\r\n': |
|
105 | + $eolChar = "\r\n"; |
|
106 | + break; |
|
107 | + default: |
|
108 | + $eolChar = $this->eolChar; |
|
109 | + break; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | for ($i = 0; $i < $phpcsFile->numTokens; $i++) { |