@@ -77,141 +77,141 @@ |
||
77 | 77 | if ($phpcsFile->tokenizerType !== 'JS') { |
78 | 78 | switch ($tokens[$i]['code']) { |
79 | 79 | // Check for first non-comment, non-heredoc/nowdoc, non-inline HTML merge conflict opener. |
80 | - case T_SL: |
|
81 | - if (isset($tokens[($i + 1)], $tokens[($i + 2)]) !== false |
|
82 | - && $tokens[($i + 1)]['code'] === T_SL |
|
83 | - && $tokens[($i + 2)]['code'] === T_STRING |
|
84 | - && trim($tokens[($i + 2)]['content']) === '<<< HEAD' |
|
85 | - ) { |
|
86 | - $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']); |
|
87 | - $i += 2; |
|
88 | - } |
|
89 | - break; |
|
90 | - |
|
91 | - // Check for merge conflict closer which was opened in a heredoc/nowdoc. |
|
92 | - case T_SR: |
|
93 | - if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)]) !== false |
|
94 | - && $tokens[($i + 1)]['code'] === T_SR |
|
95 | - && $tokens[($i + 2)]['code'] === T_SR |
|
96 | - && $tokens[($i + 3)]['code'] === T_GREATER_THAN |
|
97 | - && $tokens[($i + 4)]['code'] === T_WHITESPACE |
|
98 | - && $tokens[($i + 4)]['content'] === ' ' |
|
99 | - ) { |
|
100 | - $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
101 | - $i += 4; |
|
102 | - } |
|
103 | - break; |
|
104 | - |
|
105 | - // Check for merge conflict delimiter which opened in a CSS comment and closed outside. |
|
106 | - case T_IS_IDENTICAL: |
|
107 | - if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false |
|
108 | - && $tokens[($i + 1)]['code'] === T_IS_IDENTICAL |
|
109 | - && $tokens[($i + 2)]['code'] === T_EQUAL |
|
110 | - && $tokens[($i + 3)]['code'] === T_WHITESPACE |
|
111 | - && $tokens[($i + 3)]['content'] === "\n" |
|
112 | - ) { |
|
113 | - $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
114 | - $i += 3; |
|
115 | - } |
|
116 | - break; |
|
117 | - |
|
118 | - // - Check for delimiters and closers. |
|
119 | - // - Inspect heredoc/nowdoc content, comments and inline HTML. |
|
120 | - // - Check for subsequent merge conflict openers after the first broke the tokenizer. |
|
121 | - case T_ENCAPSED_AND_WHITESPACE: |
|
122 | - case T_COMMENT: |
|
123 | - case T_DOC_COMMENT_STRING: |
|
124 | - case T_INLINE_HTML: |
|
125 | - case T_HEREDOC: |
|
126 | - case T_NOWDOC: |
|
127 | - if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') { |
|
128 | - $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']); |
|
129 | - break; |
|
130 | - } else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') { |
|
131 | - $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
132 | - break; |
|
133 | - } |
|
134 | - |
|
135 | - if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) { |
|
136 | - if ($tokens[$i]['content'] === '=======' |
|
137 | - && $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE |
|
138 | - ) { |
|
139 | - $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
140 | - break; |
|
141 | - } |
|
142 | - } else { |
|
143 | - if ($tokens[$i]['content'] === "=======\n") { |
|
144 | - $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
145 | - } |
|
146 | - } |
|
147 | - break; |
|
80 | + case T_SL: |
|
81 | + if (isset($tokens[($i + 1)], $tokens[($i + 2)]) !== false |
|
82 | + && $tokens[($i + 1)]['code'] === T_SL |
|
83 | + && $tokens[($i + 2)]['code'] === T_STRING |
|
84 | + && trim($tokens[($i + 2)]['content']) === '<<< HEAD' |
|
85 | + ) { |
|
86 | + $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']); |
|
87 | + $i += 2; |
|
88 | + } |
|
89 | + break; |
|
90 | + |
|
91 | + // Check for merge conflict closer which was opened in a heredoc/nowdoc. |
|
92 | + case T_SR: |
|
93 | + if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)]) !== false |
|
94 | + && $tokens[($i + 1)]['code'] === T_SR |
|
95 | + && $tokens[($i + 2)]['code'] === T_SR |
|
96 | + && $tokens[($i + 3)]['code'] === T_GREATER_THAN |
|
97 | + && $tokens[($i + 4)]['code'] === T_WHITESPACE |
|
98 | + && $tokens[($i + 4)]['content'] === ' ' |
|
99 | + ) { |
|
100 | + $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
101 | + $i += 4; |
|
102 | + } |
|
103 | + break; |
|
104 | + |
|
105 | + // Check for merge conflict delimiter which opened in a CSS comment and closed outside. |
|
106 | + case T_IS_IDENTICAL: |
|
107 | + if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false |
|
108 | + && $tokens[($i + 1)]['code'] === T_IS_IDENTICAL |
|
109 | + && $tokens[($i + 2)]['code'] === T_EQUAL |
|
110 | + && $tokens[($i + 3)]['code'] === T_WHITESPACE |
|
111 | + && $tokens[($i + 3)]['content'] === "\n" |
|
112 | + ) { |
|
113 | + $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
114 | + $i += 3; |
|
115 | + } |
|
116 | + break; |
|
117 | + |
|
118 | + // - Check for delimiters and closers. |
|
119 | + // - Inspect heredoc/nowdoc content, comments and inline HTML. |
|
120 | + // - Check for subsequent merge conflict openers after the first broke the tokenizer. |
|
121 | + case T_ENCAPSED_AND_WHITESPACE: |
|
122 | + case T_COMMENT: |
|
123 | + case T_DOC_COMMENT_STRING: |
|
124 | + case T_INLINE_HTML: |
|
125 | + case T_HEREDOC: |
|
126 | + case T_NOWDOC: |
|
127 | + if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') { |
|
128 | + $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']); |
|
129 | + break; |
|
130 | + } else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') { |
|
131 | + $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
132 | + break; |
|
133 | + } |
|
134 | + |
|
135 | + if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) { |
|
136 | + if ($tokens[$i]['content'] === '=======' |
|
137 | + && $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE |
|
138 | + ) { |
|
139 | + $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
140 | + break; |
|
141 | + } |
|
142 | + } else { |
|
143 | + if ($tokens[$i]['content'] === "=======\n") { |
|
144 | + $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
145 | + } |
|
146 | + } |
|
147 | + break; |
|
148 | 148 | }//end switch |
149 | 149 | } else { |
150 | 150 | // Javascript file. |
151 | 151 | switch ($tokens[$i]['code']) { |
152 | 152 | // Merge conflict opener. |
153 | - case T_SL: |
|
154 | - if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)], $tokens[($i + 5)]) !== false |
|
155 | - && $tokens[($i + 1)]['code'] === T_SL |
|
156 | - && $tokens[($i + 2)]['code'] === T_SL |
|
157 | - && $tokens[($i + 3)]['code'] === T_LESS_THAN |
|
158 | - && $tokens[($i + 4)]['code'] === T_WHITESPACE |
|
159 | - && trim($tokens[($i + 5)]['content']) === 'HEAD' |
|
160 | - ) { |
|
161 | - $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']); |
|
162 | - $i += 5; |
|
163 | - } |
|
164 | - break; |
|
165 | - |
|
166 | - // Check for merge conflict delimiter. |
|
167 | - case T_IS_IDENTICAL: |
|
168 | - if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false |
|
169 | - && $tokens[($i + 1)]['code'] === T_IS_IDENTICAL |
|
170 | - && $tokens[($i + 2)]['code'] === T_EQUAL |
|
171 | - && $tokens[($i + 3)]['code'] === T_WHITESPACE |
|
172 | - && $tokens[($i + 3)]['content'] === "\n" |
|
173 | - ) { |
|
174 | - $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
175 | - $i += 3; |
|
176 | - } |
|
177 | - break; |
|
178 | - |
|
179 | - // Merge conflict closer. |
|
180 | - case T_ZSR: |
|
181 | - if ($tokens[$i]['code'] === T_ZSR |
|
182 | - && isset($tokens[($i + 1)], $tokens[($i + 2)]) === true |
|
183 | - && $tokens[($i + 1)]['code'] === T_ZSR |
|
184 | - && $tokens[($i + 2)]['code'] === T_GREATER_THAN |
|
185 | - ) { |
|
186 | - $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
187 | - $i += 2; |
|
188 | - } |
|
189 | - break; |
|
190 | - |
|
191 | - // Check for merge conflicts in all comments. |
|
192 | - case T_COMMENT: |
|
193 | - case T_DOC_COMMENT_STRING: |
|
194 | - if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') { |
|
195 | - $phpcsFile->addError($error, $i, 'OpenerFound'); |
|
196 | - break; |
|
197 | - } else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') { |
|
198 | - $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
199 | - break; |
|
200 | - } |
|
201 | - |
|
202 | - if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) { |
|
203 | - if ($tokens[$i]['content'] === '=======' |
|
204 | - && $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE |
|
205 | - ) { |
|
206 | - $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
207 | - break; |
|
208 | - } |
|
209 | - } else { |
|
210 | - if ($tokens[$i]['content'] === "=======\n") { |
|
211 | - $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
212 | - } |
|
213 | - } |
|
214 | - break; |
|
153 | + case T_SL: |
|
154 | + if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)], $tokens[($i + 4)], $tokens[($i + 5)]) !== false |
|
155 | + && $tokens[($i + 1)]['code'] === T_SL |
|
156 | + && $tokens[($i + 2)]['code'] === T_SL |
|
157 | + && $tokens[($i + 3)]['code'] === T_LESS_THAN |
|
158 | + && $tokens[($i + 4)]['code'] === T_WHITESPACE |
|
159 | + && trim($tokens[($i + 5)]['content']) === 'HEAD' |
|
160 | + ) { |
|
161 | + $phpcsFile->addError($error, $i, 'OpenerFound', ['opener']); |
|
162 | + $i += 5; |
|
163 | + } |
|
164 | + break; |
|
165 | + |
|
166 | + // Check for merge conflict delimiter. |
|
167 | + case T_IS_IDENTICAL: |
|
168 | + if (isset($tokens[($i + 1)], $tokens[($i + 2)], $tokens[($i + 3)]) !== false |
|
169 | + && $tokens[($i + 1)]['code'] === T_IS_IDENTICAL |
|
170 | + && $tokens[($i + 2)]['code'] === T_EQUAL |
|
171 | + && $tokens[($i + 3)]['code'] === T_WHITESPACE |
|
172 | + && $tokens[($i + 3)]['content'] === "\n" |
|
173 | + ) { |
|
174 | + $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
175 | + $i += 3; |
|
176 | + } |
|
177 | + break; |
|
178 | + |
|
179 | + // Merge conflict closer. |
|
180 | + case T_ZSR: |
|
181 | + if ($tokens[$i]['code'] === T_ZSR |
|
182 | + && isset($tokens[($i + 1)], $tokens[($i + 2)]) === true |
|
183 | + && $tokens[($i + 1)]['code'] === T_ZSR |
|
184 | + && $tokens[($i + 2)]['code'] === T_GREATER_THAN |
|
185 | + ) { |
|
186 | + $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
187 | + $i += 2; |
|
188 | + } |
|
189 | + break; |
|
190 | + |
|
191 | + // Check for merge conflicts in all comments. |
|
192 | + case T_COMMENT: |
|
193 | + case T_DOC_COMMENT_STRING: |
|
194 | + if (substr($tokens[$i]['content'], 0, 12) === '<<<<<<< HEAD') { |
|
195 | + $phpcsFile->addError($error, $i, 'OpenerFound'); |
|
196 | + break; |
|
197 | + } else if (substr($tokens[$i]['content'], 0, 8) === '>>>>>>> ') { |
|
198 | + $phpcsFile->addError($error, $i, 'CloserFound', ['closer']); |
|
199 | + break; |
|
200 | + } |
|
201 | + |
|
202 | + if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) { |
|
203 | + if ($tokens[$i]['content'] === '=======' |
|
204 | + && $tokens[($i + 1)]['code'] === T_DOC_COMMENT_WHITESPACE |
|
205 | + ) { |
|
206 | + $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
207 | + break; |
|
208 | + } |
|
209 | + } else { |
|
210 | + if ($tokens[$i]['content'] === "=======\n") { |
|
211 | + $phpcsFile->addError($error, $i, 'DelimiterFound', ['delimiter']); |
|
212 | + } |
|
213 | + } |
|
214 | + break; |
|
215 | 215 | }//end switch |
216 | 216 | }//end if |
217 | 217 | }//end for |
@@ -50,92 +50,92 @@ |
||
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 | - || ($tokens[$prevNonEmpty]['code'] !== T_SEMICOLON |
|
58 | - && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
59 | - && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO) |
|
60 | - ) { |
|
61 | - return; |
|
62 | - } |
|
63 | - |
|
64 | - if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) { |
|
65 | - $nested = $tokens[$stackPtr]['nested_parenthesis']; |
|
66 | - $lastCloser = array_pop($nested); |
|
67 | - if (isset($tokens[$lastCloser]['parenthesis_owner']) === true |
|
68 | - && $tokens[$tokens[$lastCloser]['parenthesis_owner']]['code'] === T_FOR |
|
69 | - ) { |
|
70 | - // Empty for() condition. |
|
71 | - return; |
|
72 | - } |
|
73 | - } |
|
74 | - |
|
75 | - $fix = $phpcsFile->addFixableWarning( |
|
76 | - 'Empty PHP statement detected: superfluous semi-colon.', |
|
77 | - $stackPtr, |
|
78 | - 'SemicolonWithoutCodeDetected' |
|
79 | - ); |
|
80 | - if ($fix === true) { |
|
81 | - $phpcsFile->fixer->beginChangeset(); |
|
82 | - |
|
83 | - if ($tokens[$prevNonEmpty]['code'] === T_OPEN_TAG |
|
84 | - || $tokens[$prevNonEmpty]['code'] === T_OPEN_TAG_WITH_ECHO |
|
85 | - ) { |
|
86 | - // Check for superfluous whitespace after the semi-colon which will be |
|
87 | - // removed as the `<?php ` open tag token already contains whitespace, |
|
88 | - // either a space or a new line. |
|
89 | - if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) { |
|
90 | - $replacement = str_replace(' ', '', $tokens[($stackPtr + 1)]['content']); |
|
91 | - $phpcsFile->fixer->replaceToken(($stackPtr + 1), $replacement); |
|
92 | - } |
|
93 | - } |
|
94 | - |
|
95 | - for ($i = $stackPtr; $i > $prevNonEmpty; $i--) { |
|
96 | - if ($tokens[$i]['code'] !== T_SEMICOLON |
|
97 | - && $tokens[$i]['code'] !== T_WHITESPACE |
|
98 | - ) { |
|
99 | - break; |
|
100 | - } |
|
101 | - |
|
102 | - $phpcsFile->fixer->replaceToken($i, ''); |
|
103 | - } |
|
104 | - |
|
105 | - $phpcsFile->fixer->endChangeset(); |
|
106 | - }//end if |
|
107 | - break; |
|
108 | - |
|
109 | - // Detect `<?php ? >`. |
|
110 | - case 'T_CLOSE_TAG': |
|
111 | - $prevNonEmpty = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true); |
|
112 | - |
|
113 | - if ($prevNonEmpty === false |
|
114 | - || ($tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
115 | - && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO) |
|
116 | - ) { |
|
117 | - return; |
|
118 | - } |
|
119 | - |
|
120 | - $fix = $phpcsFile->addFixableWarning( |
|
121 | - 'Empty PHP open/close tag combination detected.', |
|
122 | - $prevNonEmpty, |
|
123 | - 'EmptyPHPOpenCloseTagsDetected' |
|
124 | - ); |
|
125 | - if ($fix === true) { |
|
126 | - $phpcsFile->fixer->beginChangeset(); |
|
127 | - |
|
128 | - for ($i = $prevNonEmpty; $i <= $stackPtr; $i++) { |
|
129 | - $phpcsFile->fixer->replaceToken($i, ''); |
|
130 | - } |
|
131 | - |
|
132 | - $phpcsFile->fixer->endChangeset(); |
|
133 | - } |
|
134 | - break; |
|
135 | - |
|
136 | - default: |
|
137 | - // Deliberately left empty. |
|
138 | - break; |
|
53 | + case 'T_SEMICOLON': |
|
54 | + $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true); |
|
55 | + |
|
56 | + if ($prevNonEmpty === false |
|
57 | + || ($tokens[$prevNonEmpty]['code'] !== T_SEMICOLON |
|
58 | + && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
59 | + && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO) |
|
60 | + ) { |
|
61 | + return; |
|
62 | + } |
|
63 | + |
|
64 | + if (isset($tokens[$stackPtr]['nested_parenthesis']) === true) { |
|
65 | + $nested = $tokens[$stackPtr]['nested_parenthesis']; |
|
66 | + $lastCloser = array_pop($nested); |
|
67 | + if (isset($tokens[$lastCloser]['parenthesis_owner']) === true |
|
68 | + && $tokens[$tokens[$lastCloser]['parenthesis_owner']]['code'] === T_FOR |
|
69 | + ) { |
|
70 | + // Empty for() condition. |
|
71 | + return; |
|
72 | + } |
|
73 | + } |
|
74 | + |
|
75 | + $fix = $phpcsFile->addFixableWarning( |
|
76 | + 'Empty PHP statement detected: superfluous semi-colon.', |
|
77 | + $stackPtr, |
|
78 | + 'SemicolonWithoutCodeDetected' |
|
79 | + ); |
|
80 | + if ($fix === true) { |
|
81 | + $phpcsFile->fixer->beginChangeset(); |
|
82 | + |
|
83 | + if ($tokens[$prevNonEmpty]['code'] === T_OPEN_TAG |
|
84 | + || $tokens[$prevNonEmpty]['code'] === T_OPEN_TAG_WITH_ECHO |
|
85 | + ) { |
|
86 | + // Check for superfluous whitespace after the semi-colon which will be |
|
87 | + // removed as the `<?php ` open tag token already contains whitespace, |
|
88 | + // either a space or a new line. |
|
89 | + if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) { |
|
90 | + $replacement = str_replace(' ', '', $tokens[($stackPtr + 1)]['content']); |
|
91 | + $phpcsFile->fixer->replaceToken(($stackPtr + 1), $replacement); |
|
92 | + } |
|
93 | + } |
|
94 | + |
|
95 | + for ($i = $stackPtr; $i > $prevNonEmpty; $i--) { |
|
96 | + if ($tokens[$i]['code'] !== T_SEMICOLON |
|
97 | + && $tokens[$i]['code'] !== T_WHITESPACE |
|
98 | + ) { |
|
99 | + break; |
|
100 | + } |
|
101 | + |
|
102 | + $phpcsFile->fixer->replaceToken($i, ''); |
|
103 | + } |
|
104 | + |
|
105 | + $phpcsFile->fixer->endChangeset(); |
|
106 | + }//end if |
|
107 | + break; |
|
108 | + |
|
109 | + // Detect `<?php ? >`. |
|
110 | + case 'T_CLOSE_TAG': |
|
111 | + $prevNonEmpty = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true); |
|
112 | + |
|
113 | + if ($prevNonEmpty === false |
|
114 | + || ($tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG |
|
115 | + && $tokens[$prevNonEmpty]['code'] !== T_OPEN_TAG_WITH_ECHO) |
|
116 | + ) { |
|
117 | + return; |
|
118 | + } |
|
119 | + |
|
120 | + $fix = $phpcsFile->addFixableWarning( |
|
121 | + 'Empty PHP open/close tag combination detected.', |
|
122 | + $prevNonEmpty, |
|
123 | + 'EmptyPHPOpenCloseTagsDetected' |
|
124 | + ); |
|
125 | + if ($fix === true) { |
|
126 | + $phpcsFile->fixer->beginChangeset(); |
|
127 | + |
|
128 | + for ($i = $prevNonEmpty; $i <= $stackPtr; $i++) { |
|
129 | + $phpcsFile->fixer->replaceToken($i, ''); |
|
130 | + } |
|
131 | + |
|
132 | + $phpcsFile->fixer->endChangeset(); |
|
133 | + } |
|
134 | + break; |
|
135 | + |
|
136 | + default: |
|
137 | + // Deliberately left empty. |
|
138 | + break; |
|
139 | 139 | }//end switch |
140 | 140 | |
141 | 141 | }//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++) { |
@@ -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() |
@@ -28,66 +28,66 @@ |
||
28 | 28 | public function getErrorList($testFile='OperatorBracketUnitTest.inc') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'OperatorBracketUnitTest.inc': |
|
32 | - return [ |
|
33 | - 3 => 1, |
|
34 | - 6 => 1, |
|
35 | - 9 => 1, |
|
36 | - 12 => 1, |
|
37 | - 15 => 1, |
|
38 | - 18 => 2, |
|
39 | - 20 => 1, |
|
40 | - 25 => 1, |
|
41 | - 28 => 1, |
|
42 | - 31 => 1, |
|
43 | - 34 => 1, |
|
44 | - 37 => 1, |
|
45 | - 40 => 1, |
|
46 | - 43 => 2, |
|
47 | - 45 => 1, |
|
48 | - 47 => 5, |
|
49 | - 48 => 1, |
|
50 | - 50 => 2, |
|
51 | - 55 => 2, |
|
52 | - 56 => 1, |
|
53 | - 63 => 2, |
|
54 | - 64 => 1, |
|
55 | - 67 => 1, |
|
56 | - 86 => 1, |
|
57 | - 90 => 1, |
|
58 | - 109 => 1, |
|
59 | - 130 => 1, |
|
60 | - 134 => 1, |
|
61 | - 135 => 2, |
|
62 | - 137 => 1, |
|
63 | - 139 => 1, |
|
64 | - 150 => 1, |
|
65 | - 161 => 1, |
|
66 | - 163 => 2, |
|
67 | - 165 => 2, |
|
68 | - 169 => 1, |
|
69 | - ]; |
|
70 | - break; |
|
71 | - case 'OperatorBracketUnitTest.js': |
|
72 | - return [ |
|
73 | - 5 => 1, |
|
74 | - 8 => 1, |
|
75 | - 11 => 1, |
|
76 | - 14 => 1, |
|
77 | - 24 => 1, |
|
78 | - 30 => 1, |
|
79 | - 33 => 1, |
|
80 | - 36 => 1, |
|
81 | - 39 => 1, |
|
82 | - 46 => 1, |
|
83 | - 47 => 1, |
|
84 | - 63 => 1, |
|
85 | - 108 => 1, |
|
86 | - ]; |
|
87 | - break; |
|
88 | - default: |
|
89 | - return []; |
|
90 | - break; |
|
31 | + case 'OperatorBracketUnitTest.inc': |
|
32 | + return [ |
|
33 | + 3 => 1, |
|
34 | + 6 => 1, |
|
35 | + 9 => 1, |
|
36 | + 12 => 1, |
|
37 | + 15 => 1, |
|
38 | + 18 => 2, |
|
39 | + 20 => 1, |
|
40 | + 25 => 1, |
|
41 | + 28 => 1, |
|
42 | + 31 => 1, |
|
43 | + 34 => 1, |
|
44 | + 37 => 1, |
|
45 | + 40 => 1, |
|
46 | + 43 => 2, |
|
47 | + 45 => 1, |
|
48 | + 47 => 5, |
|
49 | + 48 => 1, |
|
50 | + 50 => 2, |
|
51 | + 55 => 2, |
|
52 | + 56 => 1, |
|
53 | + 63 => 2, |
|
54 | + 64 => 1, |
|
55 | + 67 => 1, |
|
56 | + 86 => 1, |
|
57 | + 90 => 1, |
|
58 | + 109 => 1, |
|
59 | + 130 => 1, |
|
60 | + 134 => 1, |
|
61 | + 135 => 2, |
|
62 | + 137 => 1, |
|
63 | + 139 => 1, |
|
64 | + 150 => 1, |
|
65 | + 161 => 1, |
|
66 | + 163 => 2, |
|
67 | + 165 => 2, |
|
68 | + 169 => 1, |
|
69 | + ]; |
|
70 | + break; |
|
71 | + case 'OperatorBracketUnitTest.js': |
|
72 | + return [ |
|
73 | + 5 => 1, |
|
74 | + 8 => 1, |
|
75 | + 11 => 1, |
|
76 | + 14 => 1, |
|
77 | + 24 => 1, |
|
78 | + 30 => 1, |
|
79 | + 33 => 1, |
|
80 | + 36 => 1, |
|
81 | + 39 => 1, |
|
82 | + 46 => 1, |
|
83 | + 47 => 1, |
|
84 | + 63 => 1, |
|
85 | + 108 => 1, |
|
86 | + ]; |
|
87 | + break; |
|
88 | + default: |
|
89 | + return []; |
|
90 | + break; |
|
91 | 91 | }//end switch |
92 | 92 | |
93 | 93 | }//end getErrorList() |
@@ -28,28 +28,28 @@ |
||
28 | 28 | public function getErrorList($testFile='DisallowSizeFunctionsInLoopsUnitTest.inc') |
29 | 29 | { |
30 | 30 | switch ($testFile) { |
31 | - case 'DisallowSizeFunctionsInLoopsUnitTest.inc': |
|
32 | - return [ |
|
33 | - 2 => 1, |
|
34 | - 7 => 1, |
|
35 | - 11 => 1, |
|
36 | - 13 => 1, |
|
37 | - 18 => 1, |
|
38 | - 23 => 1, |
|
39 | - 27 => 1, |
|
40 | - 29 => 1, |
|
41 | - 35 => 1, |
|
42 | - 40 => 1, |
|
43 | - 44 => 1, |
|
44 | - 46 => 1, |
|
45 | - ]; |
|
46 | - break; |
|
47 | - case 'DisallowSizeFunctionsInLoopsUnitTest.js': |
|
48 | - return [1 => 1]; |
|
49 | - break; |
|
50 | - default: |
|
51 | - return []; |
|
52 | - break; |
|
31 | + case 'DisallowSizeFunctionsInLoopsUnitTest.inc': |
|
32 | + return [ |
|
33 | + 2 => 1, |
|
34 | + 7 => 1, |
|
35 | + 11 => 1, |
|
36 | + 13 => 1, |
|
37 | + 18 => 1, |
|
38 | + 23 => 1, |
|
39 | + 27 => 1, |
|
40 | + 29 => 1, |
|
41 | + 35 => 1, |
|
42 | + 40 => 1, |
|
43 | + 44 => 1, |
|
44 | + 46 => 1, |
|
45 | + ]; |
|
46 | + break; |
|
47 | + case 'DisallowSizeFunctionsInLoopsUnitTest.js': |
|
48 | + return [1 => 1]; |
|
49 | + break; |
|
50 | + default: |
|
51 | + return []; |
|
52 | + break; |
|
53 | 53 | }//end switch |
54 | 54 | |
55 | 55 | }//end getErrorList() |
@@ -43,52 +43,52 @@ |
||
43 | 43 | public function getWarningList($testFile='') |
44 | 44 | { |
45 | 45 | switch ($testFile) { |
46 | - case 'NonExecutableCodeUnitTest.1.inc': |
|
47 | - return [ |
|
48 | - 5 => 1, |
|
49 | - 11 => 1, |
|
50 | - 17 => 1, |
|
51 | - 18 => 1, |
|
52 | - 19 => 2, |
|
53 | - 28 => 1, |
|
54 | - 32 => 1, |
|
55 | - 33 => 2, |
|
56 | - 34 => 2, |
|
57 | - 42 => 1, |
|
58 | - 45 => 1, |
|
59 | - 54 => 1, |
|
60 | - 58 => 1, |
|
61 | - 73 => 1, |
|
62 | - 83 => 1, |
|
63 | - 95 => 1, |
|
64 | - 105 => 1, |
|
65 | - 123 => 1, |
|
66 | - 147 => 1, |
|
67 | - 150 => 1, |
|
68 | - 153 => 1, |
|
69 | - 166 => 1, |
|
70 | - 180 => 1, |
|
71 | - 232 => 1, |
|
72 | - 240 => 1, |
|
73 | - 246 => 1, |
|
74 | - 252 => 1, |
|
75 | - 253 => 1, |
|
76 | - 254 => 2, |
|
77 | - ]; |
|
78 | - break; |
|
79 | - case 'NonExecutableCodeUnitTest.2.inc': |
|
80 | - return [ |
|
81 | - 7 => 1, |
|
82 | - 8 => 1, |
|
83 | - 9 => 1, |
|
84 | - 10 => 2, |
|
85 | - 14 => 1, |
|
86 | - 48 => 2, |
|
87 | - ]; |
|
88 | - break; |
|
89 | - default: |
|
90 | - return []; |
|
91 | - break; |
|
46 | + case 'NonExecutableCodeUnitTest.1.inc': |
|
47 | + return [ |
|
48 | + 5 => 1, |
|
49 | + 11 => 1, |
|
50 | + 17 => 1, |
|
51 | + 18 => 1, |
|
52 | + 19 => 2, |
|
53 | + 28 => 1, |
|
54 | + 32 => 1, |
|
55 | + 33 => 2, |
|
56 | + 34 => 2, |
|
57 | + 42 => 1, |
|
58 | + 45 => 1, |
|
59 | + 54 => 1, |
|
60 | + 58 => 1, |
|
61 | + 73 => 1, |
|
62 | + 83 => 1, |
|
63 | + 95 => 1, |
|
64 | + 105 => 1, |
|
65 | + 123 => 1, |
|
66 | + 147 => 1, |
|
67 | + 150 => 1, |
|
68 | + 153 => 1, |
|
69 | + 166 => 1, |
|
70 | + 180 => 1, |
|
71 | + 232 => 1, |
|
72 | + 240 => 1, |
|
73 | + 246 => 1, |
|
74 | + 252 => 1, |
|
75 | + 253 => 1, |
|
76 | + 254 => 2, |
|
77 | + ]; |
|
78 | + break; |
|
79 | + case 'NonExecutableCodeUnitTest.2.inc': |
|
80 | + return [ |
|
81 | + 7 => 1, |
|
82 | + 8 => 1, |
|
83 | + 9 => 1, |
|
84 | + 10 => 2, |
|
85 | + 14 => 1, |
|
86 | + 48 => 2, |
|
87 | + ]; |
|
88 | + break; |
|
89 | + default: |
|
90 | + return []; |
|
91 | + break; |
|
92 | 92 | }//end switch |
93 | 93 | |
94 | 94 | }//end getWarningList() |
@@ -19,9 +19,3 @@ |
||
19 | 19 | $arr = array( |
20 | 20 | 'a' => 'a' |
21 | 21 | <<<<<<< HEAD |
22 | - 'b' => 'b' |
|
23 | -======= |
|
24 | - 'c' => 'c' |
|
25 | ->>>>>>> master |
|
26 | - ); |
|
27 | - } |
@@ -49,13 +49,13 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | switch ($lowerVarType) { |
52 | - case 'bool': |
|
53 | - return 'boolean'; |
|
54 | - echo 'hi'; |
|
55 | - case 'double': |
|
56 | - case 'real': |
|
57 | - return 'float'; |
|
58 | - echo 'hi'; |
|
52 | + case 'bool': |
|
53 | + return 'boolean'; |
|
54 | + echo 'hi'; |
|
55 | + case 'double': |
|
56 | + case 'real': |
|
57 | + return 'float'; |
|
58 | + echo 'hi'; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | while ($line=fgets($fp,2*1024*1024)) |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | switch ($var) { |
69 | - case 1: |
|
70 | - echo '1'; |
|
71 | - break; |
|
72 | - |
|
73 | - echo 'non-executable'; |
|
74 | - default: |
|
75 | - echo '2'; |
|
76 | - break; |
|
69 | + case 1: |
|
70 | + echo '1'; |
|
71 | + break; |
|
72 | + |
|
73 | + echo 'non-executable'; |
|
74 | + default: |
|
75 | + echo '2'; |
|
76 | + break; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | switch (0) { |
@@ -124,13 +124,13 @@ discard block |
||
124 | 124 | }//end myFunction() |
125 | 125 | |
126 | 126 | switch ($var) { |
127 | - case 1: { |
|
128 | - return '1'; |
|
129 | - } |
|
127 | + case 1: { |
|
128 | + return '1'; |
|
129 | + } |
|
130 | 130 | |
131 | - case 2: { |
|
132 | - return '2'; |
|
133 | - } |
|
131 | + case 2: { |
|
132 | + return '2'; |
|
133 | + } |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | defined('FOO') or die('error'); |
@@ -202,12 +202,12 @@ discard block |
||
202 | 202 | } |
203 | 203 | |
204 | 204 | switch ($foo) { |
205 | - case 'foo': |
|
206 | - if ($foo) |
|
207 | - return $foo; |
|
208 | - return $bar; |
|
209 | - default: |
|
210 | - return $bar; |
|
205 | + case 'foo': |
|
206 | + if ($foo) |
|
207 | + return $foo; |
|
208 | + return $bar; |
|
209 | + default: |
|
210 | + return $bar; |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | function foo() |
@@ -216,13 +216,13 @@ discard block |
||
216 | 216 | } |
217 | 217 | |
218 | 218 | switch (true) { |
219 | - case 1: |
|
220 | - return foo( |
|
221 | - function () { |
|
222 | - $foo = $bar; // when this is removed it works ok |
|
223 | - return false; // from here on it reports unreachable |
|
224 | - } |
|
225 | - ); |
|
219 | + case 1: |
|
220 | + return foo( |
|
221 | + function () { |
|
222 | + $foo = $bar; // when this is removed it works ok |
|
223 | + return false; // from here on it reports unreachable |
|
224 | + } |
|
225 | + ); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | for($i=0,$j=50; $i<100; $i++) { |