Symplify /
PHP7_CodeSniffer
@@ -110,7 +110,7 @@ |
||
| 110 | 110 | $data = array( |
| 111 | 111 | $code, |
| 112 | 112 | $error, |
| 113 | - ); |
|
| 113 | + ); |
|
| 114 | 114 | if (in_array($code, $this->errorCodes) === true) { |
| 115 | 115 | $phpcsFile->addErrorOnLine($message, $line, 'ExternalToolError', $data); |
| 116 | 116 | } else { |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $di = new \RecursiveDirectoryIterator($installDir); |
| 105 | 105 | $filter = new \RecursiveCallbackFilterIterator( |
| 106 | 106 | $di, |
| 107 | - function ($file, $key, $iterator) { |
|
| 107 | + function($file, $key, $iterator) { |
|
| 108 | 108 | // Skip hidden files. |
| 109 | 109 | $filename = $file->getFilename(); |
| 110 | 110 | if (substr($filename, 0, 1) === '.') { |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | * |
| 277 | 277 | * @return mixed |
| 278 | 278 | */ |
| 279 | - public static function get($key=null) |
|
| 279 | + public static function get($key = null) |
|
| 280 | 280 | { |
| 281 | 281 | if ($key === null) { |
| 282 | 282 | return self::$cache; |
@@ -157,78 +157,78 @@ discard block |
||
| 157 | 157 | * @var array<int, int> |
| 158 | 158 | */ |
| 159 | 159 | public static $weightings = array( |
| 160 | - T_CLASS => 1000, |
|
| 161 | - T_INTERFACE => 1000, |
|
| 162 | - T_TRAIT => 1000, |
|
| 163 | - T_NAMESPACE => 1000, |
|
| 164 | - T_FUNCTION => 100, |
|
| 165 | - T_CLOSURE => 100, |
|
| 166 | - |
|
| 167 | - /* |
|
| 160 | + T_CLASS => 1000, |
|
| 161 | + T_INTERFACE => 1000, |
|
| 162 | + T_TRAIT => 1000, |
|
| 163 | + T_NAMESPACE => 1000, |
|
| 164 | + T_FUNCTION => 100, |
|
| 165 | + T_CLOSURE => 100, |
|
| 166 | + |
|
| 167 | + /* |
|
| 168 | 168 | Conditions. |
| 169 | 169 | */ |
| 170 | 170 | |
| 171 | - T_WHILE => 50, |
|
| 172 | - T_FOR => 50, |
|
| 173 | - T_FOREACH => 50, |
|
| 174 | - T_IF => 50, |
|
| 175 | - T_ELSE => 50, |
|
| 176 | - T_ELSEIF => 50, |
|
| 177 | - T_DO => 50, |
|
| 178 | - T_TRY => 50, |
|
| 179 | - T_CATCH => 50, |
|
| 180 | - T_FINALLY => 50, |
|
| 181 | - T_SWITCH => 50, |
|
| 182 | - |
|
| 183 | - T_SELF => 25, |
|
| 184 | - T_PARENT => 25, |
|
| 185 | - |
|
| 186 | - /* |
|
| 171 | + T_WHILE => 50, |
|
| 172 | + T_FOR => 50, |
|
| 173 | + T_FOREACH => 50, |
|
| 174 | + T_IF => 50, |
|
| 175 | + T_ELSE => 50, |
|
| 176 | + T_ELSEIF => 50, |
|
| 177 | + T_DO => 50, |
|
| 178 | + T_TRY => 50, |
|
| 179 | + T_CATCH => 50, |
|
| 180 | + T_FINALLY => 50, |
|
| 181 | + T_SWITCH => 50, |
|
| 182 | + |
|
| 183 | + T_SELF => 25, |
|
| 184 | + T_PARENT => 25, |
|
| 185 | + |
|
| 186 | + /* |
|
| 187 | 187 | Operators and arithmetic. |
| 188 | 188 | */ |
| 189 | 189 | |
| 190 | - T_BITWISE_AND => 8, |
|
| 191 | - T_BITWISE_OR => 8, |
|
| 192 | - T_BITWISE_XOR => 8, |
|
| 193 | - |
|
| 194 | - T_MULTIPLY => 5, |
|
| 195 | - T_DIVIDE => 5, |
|
| 196 | - T_PLUS => 5, |
|
| 197 | - T_MINUS => 5, |
|
| 198 | - T_MODULUS => 5, |
|
| 199 | - T_POW => 5, |
|
| 200 | - T_SPACESHIP => 5, |
|
| 201 | - T_COALESCE => 5, |
|
| 202 | - |
|
| 203 | - T_SL => 5, |
|
| 204 | - T_SR => 5, |
|
| 205 | - T_SL_EQUAL => 5, |
|
| 206 | - T_SR_EQUAL => 5, |
|
| 207 | - |
|
| 208 | - T_EQUAL => 5, |
|
| 209 | - T_AND_EQUAL => 5, |
|
| 210 | - T_CONCAT_EQUAL => 5, |
|
| 211 | - T_DIV_EQUAL => 5, |
|
| 212 | - T_MINUS_EQUAL => 5, |
|
| 213 | - T_MOD_EQUAL => 5, |
|
| 214 | - T_MUL_EQUAL => 5, |
|
| 215 | - T_OR_EQUAL => 5, |
|
| 216 | - T_PLUS_EQUAL => 5, |
|
| 217 | - T_XOR_EQUAL => 5, |
|
| 218 | - |
|
| 219 | - T_BOOLEAN_AND => 5, |
|
| 220 | - T_BOOLEAN_OR => 5, |
|
| 221 | - |
|
| 222 | - /* |
|
| 190 | + T_BITWISE_AND => 8, |
|
| 191 | + T_BITWISE_OR => 8, |
|
| 192 | + T_BITWISE_XOR => 8, |
|
| 193 | + |
|
| 194 | + T_MULTIPLY => 5, |
|
| 195 | + T_DIVIDE => 5, |
|
| 196 | + T_PLUS => 5, |
|
| 197 | + T_MINUS => 5, |
|
| 198 | + T_MODULUS => 5, |
|
| 199 | + T_POW => 5, |
|
| 200 | + T_SPACESHIP => 5, |
|
| 201 | + T_COALESCE => 5, |
|
| 202 | + |
|
| 203 | + T_SL => 5, |
|
| 204 | + T_SR => 5, |
|
| 205 | + T_SL_EQUAL => 5, |
|
| 206 | + T_SR_EQUAL => 5, |
|
| 207 | + |
|
| 208 | + T_EQUAL => 5, |
|
| 209 | + T_AND_EQUAL => 5, |
|
| 210 | + T_CONCAT_EQUAL => 5, |
|
| 211 | + T_DIV_EQUAL => 5, |
|
| 212 | + T_MINUS_EQUAL => 5, |
|
| 213 | + T_MOD_EQUAL => 5, |
|
| 214 | + T_MUL_EQUAL => 5, |
|
| 215 | + T_OR_EQUAL => 5, |
|
| 216 | + T_PLUS_EQUAL => 5, |
|
| 217 | + T_XOR_EQUAL => 5, |
|
| 218 | + |
|
| 219 | + T_BOOLEAN_AND => 5, |
|
| 220 | + T_BOOLEAN_OR => 5, |
|
| 221 | + |
|
| 222 | + /* |
|
| 223 | 223 | Equality. |
| 224 | 224 | */ |
| 225 | 225 | |
| 226 | - T_IS_EQUAL => 5, |
|
| 227 | - T_IS_NOT_EQUAL => 5, |
|
| 228 | - T_IS_IDENTICAL => 5, |
|
| 229 | - T_IS_NOT_IDENTICAL => 5, |
|
| 230 | - T_IS_SMALLER_OR_EQUAL => 5, |
|
| 231 | - T_IS_GREATER_OR_EQUAL => 5, |
|
| 226 | + T_IS_EQUAL => 5, |
|
| 227 | + T_IS_NOT_EQUAL => 5, |
|
| 228 | + T_IS_IDENTICAL => 5, |
|
| 229 | + T_IS_NOT_IDENTICAL => 5, |
|
| 230 | + T_IS_SMALLER_OR_EQUAL => 5, |
|
| 231 | + T_IS_GREATER_OR_EQUAL => 5, |
|
| 232 | 232 | ); |
| 233 | 233 | |
| 234 | 234 | /** |
@@ -237,21 +237,21 @@ discard block |
||
| 237 | 237 | * @var array<int, int> |
| 238 | 238 | */ |
| 239 | 239 | public static $assignmentTokens = array( |
| 240 | - T_EQUAL => T_EQUAL, |
|
| 241 | - T_AND_EQUAL => T_AND_EQUAL, |
|
| 242 | - T_OR_EQUAL => T_OR_EQUAL, |
|
| 243 | - T_CONCAT_EQUAL => T_CONCAT_EQUAL, |
|
| 244 | - T_DIV_EQUAL => T_DIV_EQUAL, |
|
| 245 | - T_MINUS_EQUAL => T_MINUS_EQUAL, |
|
| 246 | - T_POW_EQUAL => T_POW_EQUAL, |
|
| 247 | - T_MOD_EQUAL => T_MOD_EQUAL, |
|
| 248 | - T_MUL_EQUAL => T_MUL_EQUAL, |
|
| 249 | - T_PLUS_EQUAL => T_PLUS_EQUAL, |
|
| 250 | - T_XOR_EQUAL => T_XOR_EQUAL, |
|
| 251 | - T_DOUBLE_ARROW => T_DOUBLE_ARROW, |
|
| 252 | - T_SL_EQUAL => T_SL_EQUAL, |
|
| 253 | - T_SR_EQUAL => T_SR_EQUAL, |
|
| 254 | - ); |
|
| 240 | + T_EQUAL => T_EQUAL, |
|
| 241 | + T_AND_EQUAL => T_AND_EQUAL, |
|
| 242 | + T_OR_EQUAL => T_OR_EQUAL, |
|
| 243 | + T_CONCAT_EQUAL => T_CONCAT_EQUAL, |
|
| 244 | + T_DIV_EQUAL => T_DIV_EQUAL, |
|
| 245 | + T_MINUS_EQUAL => T_MINUS_EQUAL, |
|
| 246 | + T_POW_EQUAL => T_POW_EQUAL, |
|
| 247 | + T_MOD_EQUAL => T_MOD_EQUAL, |
|
| 248 | + T_MUL_EQUAL => T_MUL_EQUAL, |
|
| 249 | + T_PLUS_EQUAL => T_PLUS_EQUAL, |
|
| 250 | + T_XOR_EQUAL => T_XOR_EQUAL, |
|
| 251 | + T_DOUBLE_ARROW => T_DOUBLE_ARROW, |
|
| 252 | + T_SL_EQUAL => T_SL_EQUAL, |
|
| 253 | + T_SR_EQUAL => T_SR_EQUAL, |
|
| 254 | + ); |
|
| 255 | 255 | |
| 256 | 256 | /** |
| 257 | 257 | * Tokens that represent equality comparisons. |
@@ -259,12 +259,12 @@ discard block |
||
| 259 | 259 | * @var array<int, int> |
| 260 | 260 | */ |
| 261 | 261 | public static $equalityTokens = array( |
| 262 | - T_IS_EQUAL => T_IS_EQUAL, |
|
| 263 | - T_IS_NOT_EQUAL => T_IS_NOT_EQUAL, |
|
| 264 | - T_IS_IDENTICAL => T_IS_IDENTICAL, |
|
| 265 | - T_IS_NOT_IDENTICAL => T_IS_NOT_IDENTICAL, |
|
| 266 | - T_IS_SMALLER_OR_EQUAL => T_IS_SMALLER_OR_EQUAL, |
|
| 267 | - T_IS_GREATER_OR_EQUAL => T_IS_GREATER_OR_EQUAL, |
|
| 262 | + T_IS_EQUAL => T_IS_EQUAL, |
|
| 263 | + T_IS_NOT_EQUAL => T_IS_NOT_EQUAL, |
|
| 264 | + T_IS_IDENTICAL => T_IS_IDENTICAL, |
|
| 265 | + T_IS_NOT_IDENTICAL => T_IS_NOT_IDENTICAL, |
|
| 266 | + T_IS_SMALLER_OR_EQUAL => T_IS_SMALLER_OR_EQUAL, |
|
| 267 | + T_IS_GREATER_OR_EQUAL => T_IS_GREATER_OR_EQUAL, |
|
| 268 | 268 | ); |
| 269 | 269 | |
| 270 | 270 | /** |
@@ -273,15 +273,15 @@ discard block |
||
| 273 | 273 | * @var array<int, int> |
| 274 | 274 | */ |
| 275 | 275 | public static $comparisonTokens = array( |
| 276 | - T_IS_EQUAL => T_IS_EQUAL, |
|
| 277 | - T_IS_IDENTICAL => T_IS_IDENTICAL, |
|
| 278 | - T_IS_NOT_EQUAL => T_IS_NOT_EQUAL, |
|
| 279 | - T_IS_NOT_IDENTICAL => T_IS_NOT_IDENTICAL, |
|
| 280 | - T_LESS_THAN => T_LESS_THAN, |
|
| 281 | - T_GREATER_THAN => T_GREATER_THAN, |
|
| 282 | - T_IS_SMALLER_OR_EQUAL => T_IS_SMALLER_OR_EQUAL, |
|
| 283 | - T_IS_GREATER_OR_EQUAL => T_IS_GREATER_OR_EQUAL, |
|
| 284 | - ); |
|
| 276 | + T_IS_EQUAL => T_IS_EQUAL, |
|
| 277 | + T_IS_IDENTICAL => T_IS_IDENTICAL, |
|
| 278 | + T_IS_NOT_EQUAL => T_IS_NOT_EQUAL, |
|
| 279 | + T_IS_NOT_IDENTICAL => T_IS_NOT_IDENTICAL, |
|
| 280 | + T_LESS_THAN => T_LESS_THAN, |
|
| 281 | + T_GREATER_THAN => T_GREATER_THAN, |
|
| 282 | + T_IS_SMALLER_OR_EQUAL => T_IS_SMALLER_OR_EQUAL, |
|
| 283 | + T_IS_GREATER_OR_EQUAL => T_IS_GREATER_OR_EQUAL, |
|
| 284 | + ); |
|
| 285 | 285 | |
| 286 | 286 | /** |
| 287 | 287 | * Tokens that represent arithmetic operators. |
@@ -289,12 +289,12 @@ discard block |
||
| 289 | 289 | * @var array<int, int> |
| 290 | 290 | */ |
| 291 | 291 | public static $arithmeticTokens = array( |
| 292 | - T_PLUS => T_PLUS, |
|
| 293 | - T_MINUS => T_MINUS, |
|
| 294 | - T_MULTIPLY => T_MULTIPLY, |
|
| 295 | - T_DIVIDE => T_DIVIDE, |
|
| 296 | - T_MODULUS => T_MODULUS, |
|
| 297 | - ); |
|
| 292 | + T_PLUS => T_PLUS, |
|
| 293 | + T_MINUS => T_MINUS, |
|
| 294 | + T_MULTIPLY => T_MULTIPLY, |
|
| 295 | + T_DIVIDE => T_DIVIDE, |
|
| 296 | + T_MODULUS => T_MODULUS, |
|
| 297 | + ); |
|
| 298 | 298 | |
| 299 | 299 | /** |
| 300 | 300 | * Tokens that represent casting. |
@@ -302,14 +302,14 @@ discard block |
||
| 302 | 302 | * @var array<int, int> |
| 303 | 303 | */ |
| 304 | 304 | public static $castTokens = array( |
| 305 | - T_INT_CAST => T_INT_CAST, |
|
| 306 | - T_STRING_CAST => T_STRING_CAST, |
|
| 307 | - T_DOUBLE_CAST => T_DOUBLE_CAST, |
|
| 308 | - T_ARRAY_CAST => T_ARRAY_CAST, |
|
| 309 | - T_BOOL_CAST => T_BOOL_CAST, |
|
| 310 | - T_OBJECT_CAST => T_OBJECT_CAST, |
|
| 311 | - T_UNSET_CAST => T_UNSET_CAST, |
|
| 312 | - T_BINARY_CAST => T_BINARY_CAST, |
|
| 305 | + T_INT_CAST => T_INT_CAST, |
|
| 306 | + T_STRING_CAST => T_STRING_CAST, |
|
| 307 | + T_DOUBLE_CAST => T_DOUBLE_CAST, |
|
| 308 | + T_ARRAY_CAST => T_ARRAY_CAST, |
|
| 309 | + T_BOOL_CAST => T_BOOL_CAST, |
|
| 310 | + T_OBJECT_CAST => T_OBJECT_CAST, |
|
| 311 | + T_UNSET_CAST => T_UNSET_CAST, |
|
| 312 | + T_BINARY_CAST => T_BINARY_CAST, |
|
| 313 | 313 | ); |
| 314 | 314 | |
| 315 | 315 | /** |
@@ -318,17 +318,17 @@ discard block |
||
| 318 | 318 | * @var array<int, int> |
| 319 | 319 | */ |
| 320 | 320 | public static $parenthesisOpeners = array( |
| 321 | - T_ARRAY => T_ARRAY, |
|
| 322 | - T_FUNCTION => T_FUNCTION, |
|
| 323 | - T_CLOSURE => T_CLOSURE, |
|
| 324 | - T_WHILE => T_WHILE, |
|
| 325 | - T_FOR => T_FOR, |
|
| 326 | - T_FOREACH => T_FOREACH, |
|
| 327 | - T_SWITCH => T_SWITCH, |
|
| 328 | - T_IF => T_IF, |
|
| 329 | - T_ELSEIF => T_ELSEIF, |
|
| 330 | - T_CATCH => T_CATCH, |
|
| 331 | - T_DECLARE => T_DECLARE, |
|
| 321 | + T_ARRAY => T_ARRAY, |
|
| 322 | + T_FUNCTION => T_FUNCTION, |
|
| 323 | + T_CLOSURE => T_CLOSURE, |
|
| 324 | + T_WHILE => T_WHILE, |
|
| 325 | + T_FOR => T_FOR, |
|
| 326 | + T_FOREACH => T_FOREACH, |
|
| 327 | + T_SWITCH => T_SWITCH, |
|
| 328 | + T_IF => T_IF, |
|
| 329 | + T_ELSEIF => T_ELSEIF, |
|
| 330 | + T_CATCH => T_CATCH, |
|
| 331 | + T_DECLARE => T_DECLARE, |
|
| 332 | 332 | ); |
| 333 | 333 | |
| 334 | 334 | /** |
@@ -337,31 +337,31 @@ discard block |
||
| 337 | 337 | * @var array<int, int> |
| 338 | 338 | */ |
| 339 | 339 | public static $scopeOpeners = array( |
| 340 | - T_CLASS => T_CLASS, |
|
| 341 | - T_ANON_CLASS => T_ANON_CLASS, |
|
| 342 | - T_INTERFACE => T_INTERFACE, |
|
| 343 | - T_TRAIT => T_TRAIT, |
|
| 344 | - T_NAMESPACE => T_NAMESPACE, |
|
| 345 | - T_FUNCTION => T_FUNCTION, |
|
| 346 | - T_CLOSURE => T_CLOSURE, |
|
| 347 | - T_IF => T_IF, |
|
| 348 | - T_SWITCH => T_SWITCH, |
|
| 349 | - T_CASE => T_CASE, |
|
| 350 | - T_DECLARE => T_DECLARE, |
|
| 351 | - T_DEFAULT => T_DEFAULT, |
|
| 352 | - T_WHILE => T_WHILE, |
|
| 353 | - T_ELSE => T_ELSE, |
|
| 354 | - T_ELSEIF => T_ELSEIF, |
|
| 355 | - T_FOR => T_FOR, |
|
| 356 | - T_FOREACH => T_FOREACH, |
|
| 357 | - T_DO => T_DO, |
|
| 358 | - T_TRY => T_TRY, |
|
| 359 | - T_CATCH => T_CATCH, |
|
| 360 | - T_FINALLY => T_FINALLY, |
|
| 361 | - T_PROPERTY => T_PROPERTY, |
|
| 362 | - T_OBJECT => T_OBJECT, |
|
| 363 | - T_USE => T_USE, |
|
| 364 | - ); |
|
| 340 | + T_CLASS => T_CLASS, |
|
| 341 | + T_ANON_CLASS => T_ANON_CLASS, |
|
| 342 | + T_INTERFACE => T_INTERFACE, |
|
| 343 | + T_TRAIT => T_TRAIT, |
|
| 344 | + T_NAMESPACE => T_NAMESPACE, |
|
| 345 | + T_FUNCTION => T_FUNCTION, |
|
| 346 | + T_CLOSURE => T_CLOSURE, |
|
| 347 | + T_IF => T_IF, |
|
| 348 | + T_SWITCH => T_SWITCH, |
|
| 349 | + T_CASE => T_CASE, |
|
| 350 | + T_DECLARE => T_DECLARE, |
|
| 351 | + T_DEFAULT => T_DEFAULT, |
|
| 352 | + T_WHILE => T_WHILE, |
|
| 353 | + T_ELSE => T_ELSE, |
|
| 354 | + T_ELSEIF => T_ELSEIF, |
|
| 355 | + T_FOR => T_FOR, |
|
| 356 | + T_FOREACH => T_FOREACH, |
|
| 357 | + T_DO => T_DO, |
|
| 358 | + T_TRY => T_TRY, |
|
| 359 | + T_CATCH => T_CATCH, |
|
| 360 | + T_FINALLY => T_FINALLY, |
|
| 361 | + T_PROPERTY => T_PROPERTY, |
|
| 362 | + T_OBJECT => T_OBJECT, |
|
| 363 | + T_USE => T_USE, |
|
| 364 | + ); |
|
| 365 | 365 | |
| 366 | 366 | /** |
| 367 | 367 | * Tokens that represent scope modifiers. |
@@ -369,9 +369,9 @@ discard block |
||
| 369 | 369 | * @var array<int, int> |
| 370 | 370 | */ |
| 371 | 371 | public static $scopeModifiers = array( |
| 372 | - T_PRIVATE => T_PRIVATE, |
|
| 373 | - T_PUBLIC => T_PUBLIC, |
|
| 374 | - T_PROTECTED => T_PROTECTED, |
|
| 372 | + T_PRIVATE => T_PRIVATE, |
|
| 373 | + T_PUBLIC => T_PUBLIC, |
|
| 374 | + T_PROTECTED => T_PROTECTED, |
|
| 375 | 375 | ); |
| 376 | 376 | |
| 377 | 377 | /** |
@@ -380,12 +380,12 @@ discard block |
||
| 380 | 380 | * @var array<int, int> |
| 381 | 381 | */ |
| 382 | 382 | public static $methodPrefixes = array( |
| 383 | - T_PRIVATE => T_PRIVATE, |
|
| 384 | - T_PUBLIC => T_PUBLIC, |
|
| 385 | - T_PROTECTED => T_PROTECTED, |
|
| 386 | - T_ABSTRACT => T_ABSTRACT, |
|
| 387 | - T_STATIC => T_STATIC, |
|
| 388 | - T_FINAL => T_FINAL, |
|
| 383 | + T_PRIVATE => T_PRIVATE, |
|
| 384 | + T_PUBLIC => T_PUBLIC, |
|
| 385 | + T_PROTECTED => T_PROTECTED, |
|
| 386 | + T_ABSTRACT => T_ABSTRACT, |
|
| 387 | + T_STATIC => T_STATIC, |
|
| 388 | + T_FINAL => T_FINAL, |
|
| 389 | 389 | ); |
| 390 | 390 | |
| 391 | 391 | /** |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | T_BITWISE_XOR => T_BITWISE_XOR, |
| 408 | 408 | T_SL => T_SL, |
| 409 | 409 | T_SR => T_SR, |
| 410 | - ); |
|
| 410 | + ); |
|
| 411 | 411 | |
| 412 | 412 | /** |
| 413 | 413 | * Tokens that perform boolean operations. |
@@ -415,12 +415,12 @@ discard block |
||
| 415 | 415 | * @var array<int, int> |
| 416 | 416 | */ |
| 417 | 417 | public static $booleanOperators = array( |
| 418 | - T_BOOLEAN_AND => T_BOOLEAN_AND, |
|
| 419 | - T_BOOLEAN_OR => T_BOOLEAN_OR, |
|
| 420 | - T_LOGICAL_AND => T_LOGICAL_AND, |
|
| 421 | - T_LOGICAL_OR => T_LOGICAL_OR, |
|
| 422 | - T_LOGICAL_XOR => T_LOGICAL_XOR, |
|
| 423 | - ); |
|
| 418 | + T_BOOLEAN_AND => T_BOOLEAN_AND, |
|
| 419 | + T_BOOLEAN_OR => T_BOOLEAN_OR, |
|
| 420 | + T_LOGICAL_AND => T_LOGICAL_AND, |
|
| 421 | + T_LOGICAL_OR => T_LOGICAL_OR, |
|
| 422 | + T_LOGICAL_XOR => T_LOGICAL_XOR, |
|
| 423 | + ); |
|
| 424 | 424 | |
| 425 | 425 | /** |
| 426 | 426 | * Tokens that open code blocks. |
@@ -428,11 +428,11 @@ discard block |
||
| 428 | 428 | * @var array<int, int> |
| 429 | 429 | */ |
| 430 | 430 | public static $blockOpeners = array( |
| 431 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 432 | - T_OPEN_SQUARE_BRACKET => T_OPEN_SQUARE_BRACKET, |
|
| 433 | - T_OPEN_PARENTHESIS => T_OPEN_PARENTHESIS, |
|
| 434 | - T_OBJECT => T_OBJECT, |
|
| 435 | - ); |
|
| 431 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 432 | + T_OPEN_SQUARE_BRACKET => T_OPEN_SQUARE_BRACKET, |
|
| 433 | + T_OPEN_PARENTHESIS => T_OPEN_PARENTHESIS, |
|
| 434 | + T_OBJECT => T_OBJECT, |
|
| 435 | + ); |
|
| 436 | 436 | |
| 437 | 437 | /** |
| 438 | 438 | * Tokens that don't represent code. |
@@ -440,16 +440,16 @@ discard block |
||
| 440 | 440 | * @var array<int, int> |
| 441 | 441 | */ |
| 442 | 442 | public static $emptyTokens = array( |
| 443 | - T_WHITESPACE => T_WHITESPACE, |
|
| 444 | - T_COMMENT => T_COMMENT, |
|
| 445 | - T_DOC_COMMENT => T_DOC_COMMENT, |
|
| 446 | - T_DOC_COMMENT_STAR => T_DOC_COMMENT_STAR, |
|
| 447 | - T_DOC_COMMENT_WHITESPACE => T_DOC_COMMENT_WHITESPACE, |
|
| 448 | - T_DOC_COMMENT_TAG => T_DOC_COMMENT_TAG, |
|
| 449 | - T_DOC_COMMENT_OPEN_TAG => T_DOC_COMMENT_OPEN_TAG, |
|
| 450 | - T_DOC_COMMENT_CLOSE_TAG => T_DOC_COMMENT_CLOSE_TAG, |
|
| 451 | - T_DOC_COMMENT_STRING => T_DOC_COMMENT_STRING, |
|
| 452 | - ); |
|
| 443 | + T_WHITESPACE => T_WHITESPACE, |
|
| 444 | + T_COMMENT => T_COMMENT, |
|
| 445 | + T_DOC_COMMENT => T_DOC_COMMENT, |
|
| 446 | + T_DOC_COMMENT_STAR => T_DOC_COMMENT_STAR, |
|
| 447 | + T_DOC_COMMENT_WHITESPACE => T_DOC_COMMENT_WHITESPACE, |
|
| 448 | + T_DOC_COMMENT_TAG => T_DOC_COMMENT_TAG, |
|
| 449 | + T_DOC_COMMENT_OPEN_TAG => T_DOC_COMMENT_OPEN_TAG, |
|
| 450 | + T_DOC_COMMENT_CLOSE_TAG => T_DOC_COMMENT_CLOSE_TAG, |
|
| 451 | + T_DOC_COMMENT_STRING => T_DOC_COMMENT_STRING, |
|
| 452 | + ); |
|
| 453 | 453 | |
| 454 | 454 | /** |
| 455 | 455 | * Tokens that are comments. |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | T_DOC_COMMENT_OPEN_TAG => T_DOC_COMMENT_OPEN_TAG, |
| 466 | 466 | T_DOC_COMMENT_CLOSE_TAG => T_DOC_COMMENT_CLOSE_TAG, |
| 467 | 467 | T_DOC_COMMENT_STRING => T_DOC_COMMENT_STRING, |
| 468 | - ); |
|
| 468 | + ); |
|
| 469 | 469 | |
| 470 | 470 | /** |
| 471 | 471 | * Tokens that represent strings. |
@@ -475,9 +475,9 @@ discard block |
||
| 475 | 475 | * @var array<int, int> |
| 476 | 476 | */ |
| 477 | 477 | public static $stringTokens = array( |
| 478 | - T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING, |
|
| 479 | - T_DOUBLE_QUOTED_STRING => T_DOUBLE_QUOTED_STRING, |
|
| 480 | - ); |
|
| 478 | + T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING, |
|
| 479 | + T_DOUBLE_QUOTED_STRING => T_DOUBLE_QUOTED_STRING, |
|
| 480 | + ); |
|
| 481 | 481 | |
| 482 | 482 | /** |
| 483 | 483 | * Tokens that represent brackets and parenthesis. |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | T_CLOSE_SQUARE_BRACKET => T_CLOSE_SQUARE_BRACKET, |
| 492 | 492 | T_OPEN_PARENTHESIS => T_OPEN_PARENTHESIS, |
| 493 | 493 | T_CLOSE_PARENTHESIS => T_CLOSE_PARENTHESIS, |
| 494 | - ); |
|
| 494 | + ); |
|
| 495 | 495 | |
| 496 | 496 | /** |
| 497 | 497 | * Tokens that include files. |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | T_REQUIRE => T_REQUIRE, |
| 504 | 504 | T_INCLUDE_ONCE => T_INCLUDE_ONCE, |
| 505 | 505 | T_INCLUDE => T_INCLUDE, |
| 506 | - ); |
|
| 506 | + ); |
|
| 507 | 507 | |
| 508 | 508 | /** |
| 509 | 509 | * Tokens that make up a heredoc string. |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | T_START_NOWDOC => T_START_NOWDOC, |
| 518 | 518 | T_END_NOWDOC => T_END_NOWDOC, |
| 519 | 519 | T_NOWDOC => T_NOWDOC, |
| 520 | - ); |
|
| 520 | + ); |
|
| 521 | 521 | |
| 522 | 522 | /** |
| 523 | 523 | * Tokens that represent the names of called functions. |
@@ -528,16 +528,16 @@ discard block |
||
| 528 | 528 | * @var array<int, int> |
| 529 | 529 | */ |
| 530 | 530 | public static $functionNameTokens = array( |
| 531 | - T_STRING => T_STRING, |
|
| 532 | - T_EVAL => T_EVAL, |
|
| 533 | - T_EXIT => T_EXIT, |
|
| 534 | - T_INCLUDE => T_INCLUDE, |
|
| 535 | - T_INCLUDE_ONCE => T_INCLUDE_ONCE, |
|
| 536 | - T_REQUIRE => T_REQUIRE, |
|
| 537 | - T_REQUIRE_ONCE => T_REQUIRE_ONCE, |
|
| 538 | - T_ISSET => T_ISSET, |
|
| 539 | - T_UNSET => T_UNSET, |
|
| 540 | - T_EMPTY => T_EMPTY, |
|
| 531 | + T_STRING => T_STRING, |
|
| 532 | + T_EVAL => T_EVAL, |
|
| 533 | + T_EXIT => T_EXIT, |
|
| 534 | + T_INCLUDE => T_INCLUDE, |
|
| 535 | + T_INCLUDE_ONCE => T_INCLUDE_ONCE, |
|
| 536 | + T_REQUIRE => T_REQUIRE, |
|
| 537 | + T_REQUIRE_ONCE => T_REQUIRE_ONCE, |
|
| 538 | + T_ISSET => T_ISSET, |
|
| 539 | + T_UNSET => T_UNSET, |
|
| 540 | + T_EMPTY => T_EMPTY, |
|
| 541 | 541 | ); |
| 542 | 542 | |
| 543 | 543 | |
@@ -60,8 +60,8 @@ |
||
| 60 | 60 | * @see isInstalledStandard() |
| 61 | 61 | */ |
| 62 | 62 | public static function getInstalledStandards( |
| 63 | - $includeGeneric=false, |
|
| 64 | - $standardsDir='' |
|
| 63 | + $includeGeneric = false, |
|
| 64 | + $standardsDir = '' |
|
| 65 | 65 | ) { |
| 66 | 66 | $installedStandards = array(); |
| 67 | 67 | |
@@ -21,16 +21,16 @@ |
||
| 21 | 21 | * @var string[] |
| 22 | 22 | */ |
| 23 | 23 | public static $allowedTypes = array( |
| 24 | - 'array', |
|
| 25 | - 'boolean', |
|
| 26 | - 'float', |
|
| 27 | - 'integer', |
|
| 28 | - 'mixed', |
|
| 29 | - 'object', |
|
| 30 | - 'string', |
|
| 31 | - 'resource', |
|
| 32 | - 'callable', |
|
| 33 | - ); |
|
| 24 | + 'array', |
|
| 25 | + 'boolean', |
|
| 26 | + 'float', |
|
| 27 | + 'integer', |
|
| 28 | + 'mixed', |
|
| 29 | + 'object', |
|
| 30 | + 'string', |
|
| 31 | + 'resource', |
|
| 32 | + 'callable', |
|
| 33 | + ); |
|
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -343,15 +343,15 @@ |
||
| 343 | 343 | } else { |
| 344 | 344 | $lowerVarType = strtolower($varType); |
| 345 | 345 | switch ($lowerVarType) { |
| 346 | - case 'bool': |
|
| 347 | - return 'boolean'; |
|
| 348 | - case 'double': |
|
| 349 | - case 'real': |
|
| 350 | - return 'float'; |
|
| 351 | - case 'int': |
|
| 352 | - return 'integer'; |
|
| 353 | - case 'array()': |
|
| 354 | - return 'array'; |
|
| 346 | + case 'bool': |
|
| 347 | + return 'boolean'; |
|
| 348 | + case 'double': |
|
| 349 | + case 'real': |
|
| 350 | + return 'float'; |
|
| 351 | + case 'int': |
|
| 352 | + return 'integer'; |
|
| 353 | + case 'array()': |
|
| 354 | + return 'array'; |
|
| 355 | 355 | }//end switch |
| 356 | 356 | |
| 357 | 357 | if (strpos($lowerVarType, 'array(') !== false) { |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | * |
| 163 | 163 | * @return string |
| 164 | 164 | */ |
| 165 | - public static function prepareForOutput($content, $exclude=array()) |
|
| 165 | + public static function prepareForOutput($content, $exclude = array()) |
|
| 166 | 166 | { |
| 167 | 167 | if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { |
| 168 | 168 | if (in_array("\r", $exclude) === false) { |
@@ -221,9 +221,9 @@ discard block |
||
| 221 | 221 | */ |
| 222 | 222 | public static function isCamelCaps( |
| 223 | 223 | $string, |
| 224 | - $classFormat=false, |
|
| 225 | - $public=true, |
|
| 226 | - $strict=true |
|
| 224 | + $classFormat = false, |
|
| 225 | + $public = true, |
|
| 226 | + $strict = true |
|
| 227 | 227 | ) { |
| 228 | 228 | // Check the first character first. |
| 229 | 229 | if ($classFormat === false) { |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | * |
| 41 | 41 | * @param string $path The path to use. |
| 42 | 42 | * |
| 43 | - * @return mixed |
|
| 43 | + * @return string |
|
| 44 | 44 | */ |
| 45 | 45 | public static function realpath($path) |
| 46 | 46 | { |
@@ -9,9 +9,6 @@ |
||
| 9 | 9 | |
| 10 | 10 | namespace Symplify\PHP7_CodeSniffer\Util; |
| 11 | 11 | |
| 12 | -use Symplify\PHP7_CodeSniffer\Config; |
|
| 13 | -use Symplify\PHP7_CodeSniffer\Exceptions\RuntimeException; |
|
| 14 | - |
|
| 15 | 12 | class Common |
| 16 | 13 | { |
| 17 | 14 | |
@@ -212,8 +212,8 @@ |
||
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | $replacements = array( |
| 215 | - '\\,' => ',', |
|
| 216 | - '*' => '.*', |
|
| 215 | + '\\,' => ',', |
|
| 216 | + '*' => '.*', |
|
| 217 | 217 | ); |
| 218 | 218 | |
| 219 | 219 | // We assume a / directory separator, as do the exclude rules |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | $this->reports[$type] = array( |
| 119 | - 'output' => $output, |
|
| 120 | - 'class' => $reportClass, |
|
| 119 | + 'output' => $output, |
|
| 120 | + 'class' => $reportClass, |
|
| 121 | 121 | ); |
| 122 | 122 | |
| 123 | 123 | if ($output === null) { |
@@ -285,12 +285,12 @@ discard block |
||
| 285 | 285 | public function prepareFileReport(File $phpcsFile) |
| 286 | 286 | { |
| 287 | 287 | $report = array( |
| 288 | - 'filename' => Common::stripBasepath($phpcsFile->getFilename(), $this->config->basepath), |
|
| 289 | - 'errors' => $phpcsFile->getErrorCount(), |
|
| 290 | - 'warnings' => $phpcsFile->getWarningCount(), |
|
| 291 | - 'fixable' => $phpcsFile->getFixableCount(), |
|
| 292 | - 'messages' => array(), |
|
| 293 | - ); |
|
| 288 | + 'filename' => Common::stripBasepath($phpcsFile->getFilename(), $this->config->basepath), |
|
| 289 | + 'errors' => $phpcsFile->getErrorCount(), |
|
| 290 | + 'warnings' => $phpcsFile->getWarningCount(), |
|
| 291 | + 'fixable' => $phpcsFile->getFixableCount(), |
|
| 292 | + 'messages' => array(), |
|
| 293 | + ); |
|
| 294 | 294 | |
| 295 | 295 | if ($report['errors'] === 0 && $report['warnings'] === 0) { |
| 296 | 296 | // Prefect score! |
@@ -301,13 +301,13 @@ discard block |
||
| 301 | 301 | $message = 'Errors are not being recorded but this report requires error messages. '; |
| 302 | 302 | $message .= 'This report will not show the correct information.'; |
| 303 | 303 | $report['messages'][1][1] = array( |
| 304 | - array( |
|
| 305 | - 'message' => $message, |
|
| 306 | - 'source' => 'Internal.RecordErrors', |
|
| 307 | - 'severity' => 5, |
|
| 308 | - 'fixable' => false, |
|
| 309 | - 'type' => 'ERROR', |
|
| 310 | - ), |
|
| 304 | + array( |
|
| 305 | + 'message' => $message, |
|
| 306 | + 'source' => 'Internal.RecordErrors', |
|
| 307 | + 'severity' => 5, |
|
| 308 | + 'fixable' => false, |
|
| 309 | + 'type' => 'ERROR', |
|
| 310 | + ), |
|
| 311 | 311 | ); |
| 312 | 312 | return $report; |
| 313 | 313 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | 'severity' => $data['severity'], |
| 326 | 326 | 'fixable' => $data['fixable'], |
| 327 | 327 | 'type' => 'ERROR', |
| 328 | - ); |
|
| 328 | + ); |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | $errors[$line][$column] = $newErrors; |
@@ -339,12 +339,12 @@ discard block |
||
| 339 | 339 | $newWarnings = array(); |
| 340 | 340 | foreach ($colWarnings as $data) { |
| 341 | 341 | $newWarnings[] = array( |
| 342 | - 'message' => $data['message'], |
|
| 343 | - 'source' => $data['source'], |
|
| 344 | - 'severity' => $data['severity'], |
|
| 345 | - 'fixable' => $data['fixable'], |
|
| 346 | - 'type' => 'WARNING', |
|
| 347 | - ); |
|
| 342 | + 'message' => $data['message'], |
|
| 343 | + 'source' => $data['source'], |
|
| 344 | + 'severity' => $data['severity'], |
|
| 345 | + 'fixable' => $data['fixable'], |
|
| 346 | + 'type' => 'WARNING', |
|
| 347 | + ); |
|
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | if (isset($errors[$line]) === false) { |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | * |
| 278 | 278 | * @return void |
| 279 | 279 | */ |
| 280 | - public function __construct(array $cliArgs=array(), $dieOnUnknownArg=true) |
|
| 280 | + public function __construct(array $cliArgs = array(), $dieOnUnknownArg = true) |
|
| 281 | 281 | { |
| 282 | 282 | if (defined('PHP_CODESNIFFER_IN_TESTS') === true) { |
| 283 | 283 | // Let everything through during testing so that we can |
@@ -1224,7 +1224,7 @@ discard block |
||
| 1224 | 1224 | * @see getConfigData() |
| 1225 | 1225 | * @throws RuntimeException If the config file can not be written. |
| 1226 | 1226 | */ |
| 1227 | - public static function setConfigData($key, $value, $temp=false) |
|
| 1227 | + public static function setConfigData($key, $value, $temp = false) |
|
| 1228 | 1228 | { |
| 1229 | 1229 | if ($temp === false) { |
| 1230 | 1230 | $configFile = dirname(__FILE__).'/../CodeSniffer.conf'; |
@@ -76,31 +76,31 @@ discard block |
||
| 76 | 76 | * @var array<string, mixed> |
| 77 | 77 | */ |
| 78 | 78 | private $settings = array( |
| 79 | - 'files' => null, |
|
| 80 | - 'standards' => null, |
|
| 81 | - 'verbosity' => null, |
|
| 82 | - 'interactive' => null, |
|
| 83 | - 'explain' => null, |
|
| 84 | - 'local' => null, |
|
| 85 | - 'showSources' => null, |
|
| 86 | - 'showProgress' => null, |
|
| 87 | - 'tabWidth' => null, |
|
| 88 | - 'extensions' => null, |
|
| 89 | - 'sniffs' => null, |
|
| 90 | - 'ignored' => null, |
|
| 91 | - 'reportFile' => null, |
|
| 92 | - 'filter' => null, |
|
| 93 | - 'bootstrap' => null, |
|
| 94 | - 'reports' => null, |
|
| 95 | - 'basepath' => null, |
|
| 96 | - 'reportWidth' => null, |
|
| 97 | - 'errorSeverity' => null, |
|
| 98 | - 'warningSeverity' => null, |
|
| 99 | - 'recordErrors' => null, |
|
| 100 | - 'suffix' => null, |
|
| 101 | - 'stdin' => null, |
|
| 102 | - 'stdinContent' => null, |
|
| 103 | - 'stdinPath' => null, |
|
| 79 | + 'files' => null, |
|
| 80 | + 'standards' => null, |
|
| 81 | + 'verbosity' => null, |
|
| 82 | + 'interactive' => null, |
|
| 83 | + 'explain' => null, |
|
| 84 | + 'local' => null, |
|
| 85 | + 'showSources' => null, |
|
| 86 | + 'showProgress' => null, |
|
| 87 | + 'tabWidth' => null, |
|
| 88 | + 'extensions' => null, |
|
| 89 | + 'sniffs' => null, |
|
| 90 | + 'ignored' => null, |
|
| 91 | + 'reportFile' => null, |
|
| 92 | + 'filter' => null, |
|
| 93 | + 'bootstrap' => null, |
|
| 94 | + 'reports' => null, |
|
| 95 | + 'basepath' => null, |
|
| 96 | + 'reportWidth' => null, |
|
| 97 | + 'errorSeverity' => null, |
|
| 98 | + 'warningSeverity' => null, |
|
| 99 | + 'recordErrors' => null, |
|
| 100 | + 'suffix' => null, |
|
| 101 | + 'stdin' => null, |
|
| 102 | + 'stdinContent' => null, |
|
| 103 | + 'stdinPath' => null, |
|
| 104 | 104 | ); |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -393,11 +393,11 @@ discard block |
||
| 393 | 393 | $this->showProgress = false; |
| 394 | 394 | $this->tabWidth = 0; |
| 395 | 395 | $this->extensions = array( |
| 396 | - 'php' => 'PHP', |
|
| 397 | - 'inc' => 'PHP', |
|
| 398 | - 'js' => 'JS', |
|
| 399 | - 'css' => 'CSS', |
|
| 400 | - ); |
|
| 396 | + 'php' => 'PHP', |
|
| 397 | + 'inc' => 'PHP', |
|
| 398 | + 'js' => 'JS', |
|
| 399 | + 'css' => 'CSS', |
|
| 400 | + ); |
|
| 401 | 401 | $this->sniffs = array(); |
| 402 | 402 | $this->ignored = array(); |
| 403 | 403 | $this->filter = null; |
@@ -184,35 +184,35 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | switch ($name) { |
| 187 | - case 'reportWidth' : |
|
| 188 | - // Support auto terminal width. |
|
| 189 | - if ($value === 'auto' && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1) { |
|
| 190 | - $value = (int) $matches[1]; |
|
| 191 | - } else { |
|
| 192 | - $value = (int) $value; |
|
| 193 | - } |
|
| 194 | - break; |
|
| 195 | - case 'standards' : |
|
| 196 | - $cleaned = array(); |
|
| 197 | - |
|
| 198 | - // Check if the standard name is valid, or if the case is invalid. |
|
| 199 | - $installedStandards = Util\Standards::getInstalledStandards(); |
|
| 200 | - foreach ($value as $standard) { |
|
| 201 | - foreach ($installedStandards as $validStandard) { |
|
| 202 | - if (strtolower($standard) === strtolower($validStandard)) { |
|
| 203 | - $standard = $validStandard; |
|
| 204 | - break; |
|
| 205 | - } |
|
| 187 | + case 'reportWidth' : |
|
| 188 | + // Support auto terminal width. |
|
| 189 | + if ($value === 'auto' && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1) { |
|
| 190 | + $value = (int) $matches[1]; |
|
| 191 | + } else { |
|
| 192 | + $value = (int) $value; |
|
| 206 | 193 | } |
| 194 | + break; |
|
| 195 | + case 'standards' : |
|
| 196 | + $cleaned = array(); |
|
| 197 | + |
|
| 198 | + // Check if the standard name is valid, or if the case is invalid. |
|
| 199 | + $installedStandards = Util\Standards::getInstalledStandards(); |
|
| 200 | + foreach ($value as $standard) { |
|
| 201 | + foreach ($installedStandards as $validStandard) { |
|
| 202 | + if (strtolower($standard) === strtolower($validStandard)) { |
|
| 203 | + $standard = $validStandard; |
|
| 204 | + break; |
|
| 205 | + } |
|
| 206 | + } |
|
| 207 | 207 | |
| 208 | - $cleaned[] = $standard; |
|
| 209 | - } |
|
| 208 | + $cleaned[] = $standard; |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - $value = $cleaned; |
|
| 212 | - break; |
|
| 213 | - default : |
|
| 214 | - // No validation required. |
|
| 215 | - break; |
|
| 211 | + $value = $cleaned; |
|
| 212 | + break; |
|
| 213 | + default : |
|
| 214 | + // No validation required. |
|
| 215 | + break; |
|
| 216 | 216 | }//end switch |
| 217 | 217 | |
| 218 | 218 | $this->settings[$name] = $value; |
@@ -469,64 +469,64 @@ discard block |
||
| 469 | 469 | public function processShortArgument($arg, $pos) |
| 470 | 470 | { |
| 471 | 471 | switch ($arg) { |
| 472 | - case 'h': |
|
| 473 | - case '?': |
|
| 474 | - $this->printUsage(); |
|
| 475 | - exit(0); |
|
| 476 | - case 'i' : |
|
| 477 | - Util\Standards::printInstalledStandards(); |
|
| 478 | - exit(0); |
|
| 479 | - case 'v' : |
|
| 480 | - $this->verbosity++; |
|
| 481 | - $this->overriddenDefaults['verbosity'] = true; |
|
| 482 | - break; |
|
| 483 | - case 'l' : |
|
| 484 | - $this->local = true; |
|
| 485 | - $this->overriddenDefaults['local'] = true; |
|
| 486 | - break; |
|
| 487 | - case 's' : |
|
| 488 | - $this->showSources = true; |
|
| 489 | - $this->overriddenDefaults['showSources'] = true; |
|
| 490 | - break; |
|
| 491 | - case 'e': |
|
| 492 | - $this->explain = true; |
|
| 493 | - $this->overriddenDefaults['explain'] = true; |
|
| 494 | - break; |
|
| 495 | - case 'p' : |
|
| 496 | - $this->showProgress = true; |
|
| 497 | - $this->overriddenDefaults['showProgress'] = true; |
|
| 498 | - break; |
|
| 499 | - case 'm' : |
|
| 500 | - $this->recordErrors = false; |
|
| 501 | - $this->overriddenDefaults['recordErrors'] = true; |
|
| 502 | - break; |
|
| 503 | - case 'd' : |
|
| 504 | - $ini = explode('=', $this->cliArgs[($pos + 1)]); |
|
| 505 | - $this->cliArgs[($pos + 1)] = ''; |
|
| 506 | - if (isset($ini[1]) === true) { |
|
| 507 | - ini_set($ini[0], $ini[1]); |
|
| 508 | - } else { |
|
| 509 | - ini_set($ini[0], true); |
|
| 510 | - } |
|
| 511 | - break; |
|
| 512 | - case 'n' : |
|
| 513 | - if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 514 | - $this->warningSeverity = 0; |
|
| 515 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 516 | - } |
|
| 517 | - break; |
|
| 518 | - case 'w' : |
|
| 519 | - if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 520 | - $this->warningSeverity = $this->errorSeverity; |
|
| 521 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 522 | - } |
|
| 523 | - break; |
|
| 524 | - default: |
|
| 525 | - if ($this->dieOnUnknownArg === false) { |
|
| 526 | - $this->values[$arg] = $arg; |
|
| 527 | - } else { |
|
| 528 | - $this->processUnknownArgument('-'.$arg, $pos); |
|
| 529 | - } |
|
| 472 | + case 'h': |
|
| 473 | + case '?': |
|
| 474 | + $this->printUsage(); |
|
| 475 | + exit(0); |
|
| 476 | + case 'i' : |
|
| 477 | + Util\Standards::printInstalledStandards(); |
|
| 478 | + exit(0); |
|
| 479 | + case 'v' : |
|
| 480 | + $this->verbosity++; |
|
| 481 | + $this->overriddenDefaults['verbosity'] = true; |
|
| 482 | + break; |
|
| 483 | + case 'l' : |
|
| 484 | + $this->local = true; |
|
| 485 | + $this->overriddenDefaults['local'] = true; |
|
| 486 | + break; |
|
| 487 | + case 's' : |
|
| 488 | + $this->showSources = true; |
|
| 489 | + $this->overriddenDefaults['showSources'] = true; |
|
| 490 | + break; |
|
| 491 | + case 'e': |
|
| 492 | + $this->explain = true; |
|
| 493 | + $this->overriddenDefaults['explain'] = true; |
|
| 494 | + break; |
|
| 495 | + case 'p' : |
|
| 496 | + $this->showProgress = true; |
|
| 497 | + $this->overriddenDefaults['showProgress'] = true; |
|
| 498 | + break; |
|
| 499 | + case 'm' : |
|
| 500 | + $this->recordErrors = false; |
|
| 501 | + $this->overriddenDefaults['recordErrors'] = true; |
|
| 502 | + break; |
|
| 503 | + case 'd' : |
|
| 504 | + $ini = explode('=', $this->cliArgs[($pos + 1)]); |
|
| 505 | + $this->cliArgs[($pos + 1)] = ''; |
|
| 506 | + if (isset($ini[1]) === true) { |
|
| 507 | + ini_set($ini[0], $ini[1]); |
|
| 508 | + } else { |
|
| 509 | + ini_set($ini[0], true); |
|
| 510 | + } |
|
| 511 | + break; |
|
| 512 | + case 'n' : |
|
| 513 | + if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 514 | + $this->warningSeverity = 0; |
|
| 515 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 516 | + } |
|
| 517 | + break; |
|
| 518 | + case 'w' : |
|
| 519 | + if (isset($this->overriddenDefaults['warningSeverity']) === false) { |
|
| 520 | + $this->warningSeverity = $this->errorSeverity; |
|
| 521 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 522 | + } |
|
| 523 | + break; |
|
| 524 | + default: |
|
| 525 | + if ($this->dieOnUnknownArg === false) { |
|
| 526 | + $this->values[$arg] = $arg; |
|
| 527 | + } else { |
|
| 528 | + $this->processUnknownArgument('-'.$arg, $pos); |
|
| 529 | + } |
|
| 530 | 530 | }//end switch |
| 531 | 531 | |
| 532 | 532 | }//end processShortArgument() |
@@ -543,151 +543,151 @@ discard block |
||
| 543 | 543 | public function processLongArgument($arg, $pos) |
| 544 | 544 | { |
| 545 | 545 | switch ($arg) { |
| 546 | - case 'help': |
|
| 547 | - $this->printUsage(); |
|
| 548 | - exit(0); |
|
| 549 | - case 'version': |
|
| 550 | - echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION; |
|
| 551 | - exit(0); |
|
| 552 | - case 'cache': |
|
| 553 | - if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) { |
|
| 554 | - $this->cache = true; |
|
| 546 | + case 'help': |
|
| 547 | + $this->printUsage(); |
|
| 548 | + exit(0); |
|
| 549 | + case 'version': |
|
| 550 | + echo 'Symplify\PHP7_CodeSniffer version '.self::VERSION; |
|
| 551 | + exit(0); |
|
| 552 | + case 'cache': |
|
| 553 | + if (defined('Symplify\PHP7_CodeSniffer_IN_TESTS') === false) { |
|
| 554 | + $this->cache = true; |
|
| 555 | + $this->overriddenDefaults['cache'] = true; |
|
| 556 | + } |
|
| 557 | + break; |
|
| 558 | + case 'no-cache': |
|
| 559 | + $this->cache = false; |
|
| 555 | 560 | $this->overriddenDefaults['cache'] = true; |
| 556 | - } |
|
| 557 | - break; |
|
| 558 | - case 'no-cache': |
|
| 559 | - $this->cache = false; |
|
| 560 | - $this->overriddenDefaults['cache'] = true; |
|
| 561 | - break; |
|
| 562 | - default: |
|
| 563 | - if (substr($arg, 0, 7) === 'sniffs=') { |
|
| 564 | - $sniffs = explode(',', substr($arg, 7)); |
|
| 565 | - foreach ($sniffs as $sniff) { |
|
| 566 | - if (substr_count($sniff, '.') !== 2) { |
|
| 567 | - echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL; |
|
| 568 | - $this->printUsage(); |
|
| 569 | - exit(2); |
|
| 561 | + break; |
|
| 562 | + default: |
|
| 563 | + if (substr($arg, 0, 7) === 'sniffs=') { |
|
| 564 | + $sniffs = explode(',', substr($arg, 7)); |
|
| 565 | + foreach ($sniffs as $sniff) { |
|
| 566 | + if (substr_count($sniff, '.') !== 2) { |
|
| 567 | + echo 'ERROR: The specified sniff code "'.$sniff.'" is invalid'.PHP_EOL.PHP_EOL; |
|
| 568 | + $this->printUsage(); |
|
| 569 | + exit(2); |
|
| 570 | + } |
|
| 570 | 571 | } |
| 571 | - } |
|
| 572 | - |
|
| 573 | - $this->sniffs = $sniffs; |
|
| 574 | - $this->overriddenDefaults['sniffs'] = true; |
|
| 575 | - } else if (substr($arg, 0, 11) === 'stdin-path=') { |
|
| 576 | - $this->stdinPath = Util\Common::realpath(substr($arg, 11)); |
|
| 577 | 572 | |
| 578 | - // It may not exist and return false instead, so use whatever they gave us. |
|
| 579 | - if ($this->stdinPath === false) { |
|
| 580 | - $this->stdinPath = trim(substr($arg, 11)); |
|
| 581 | - } |
|
| 582 | - |
|
| 583 | - $this->overriddenDefaults['stdinPath'] = true; |
|
| 584 | - } else if (substr($arg, 0, 9) === 'basepath=') { |
|
| 585 | - if (isset($this->overriddenDefaults['basepath']) === true) { |
|
| 586 | - break; |
|
| 587 | - } |
|
| 573 | + $this->sniffs = $sniffs; |
|
| 574 | + $this->overriddenDefaults['sniffs'] = true; |
|
| 575 | + } else if (substr($arg, 0, 11) === 'stdin-path=') { |
|
| 576 | + $this->stdinPath = Util\Common::realpath(substr($arg, 11)); |
|
| 588 | 577 | |
| 589 | - $this->basepath = Util\Common::realpath(substr($arg, 9)); |
|
| 578 | + // It may not exist and return false instead, so use whatever they gave us. |
|
| 579 | + if ($this->stdinPath === false) { |
|
| 580 | + $this->stdinPath = trim(substr($arg, 11)); |
|
| 581 | + } |
|
| 590 | 582 | |
| 591 | - // It may not exist and return false instead. |
|
| 592 | - if ($this->basepath === false) { |
|
| 593 | - $this->basepath = substr($arg, 9); |
|
| 594 | - } |
|
| 583 | + $this->overriddenDefaults['stdinPath'] = true; |
|
| 584 | + } else if (substr($arg, 0, 9) === 'basepath=') { |
|
| 585 | + if (isset($this->overriddenDefaults['basepath']) === true) { |
|
| 586 | + break; |
|
| 587 | + } |
|
| 595 | 588 | |
| 596 | - $this->overriddenDefaults['basepath'] = true; |
|
| 589 | + $this->basepath = Util\Common::realpath(substr($arg, 9)); |
|
| 597 | 590 | |
| 598 | - if (is_dir($this->basepath) === false) { |
|
| 599 | - echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL; |
|
| 600 | - $this->printUsage(); |
|
| 601 | - exit(2); |
|
| 602 | - } |
|
| 603 | - } else if (substr($arg, 0, 7) === 'filter=') { |
|
| 604 | - if (isset($this->overriddenDefaults['filter']) === true) { |
|
| 605 | - break; |
|
| 606 | - } |
|
| 591 | + // It may not exist and return false instead. |
|
| 592 | + if ($this->basepath === false) { |
|
| 593 | + $this->basepath = substr($arg, 9); |
|
| 594 | + } |
|
| 607 | 595 | |
| 608 | - $this->filter = substr($arg, 7); |
|
| 609 | - $this->overriddenDefaults['filter'] = true; |
|
| 610 | - } else if (substr($arg, 0, 9) === 'standard=') { |
|
| 611 | - $standards = trim(substr($arg, 9)); |
|
| 612 | - if ($standards !== '') { |
|
| 613 | - $this->standards = explode(',', $standards); |
|
| 614 | - } |
|
| 596 | + $this->overriddenDefaults['basepath'] = true; |
|
| 615 | 597 | |
| 616 | - $this->overriddenDefaults['standards'] = true; |
|
| 617 | - } else if (substr($arg, 0, 11) === 'extensions=') { |
|
| 618 | - $extensions = explode(',', substr($arg, 11)); |
|
| 619 | - $newExtensions = array(); |
|
| 620 | - foreach ($extensions as $ext) { |
|
| 621 | - $slash = strpos($ext, '/'); |
|
| 622 | - if ($slash !== false) { |
|
| 623 | - // They specified the tokenizer too. |
|
| 624 | - list($ext, $tokenizer) = explode('/', $ext); |
|
| 625 | - $newExtensions[$ext] = strtoupper($tokenizer); |
|
| 626 | - continue; |
|
| 598 | + if (is_dir($this->basepath) === false) { |
|
| 599 | + echo 'ERROR: The specified basepath "'.$this->basepath.'" points to a non-existent directory'.PHP_EOL.PHP_EOL; |
|
| 600 | + $this->printUsage(); |
|
| 601 | + exit(2); |
|
| 602 | + } |
|
| 603 | + } else if (substr($arg, 0, 7) === 'filter=') { |
|
| 604 | + if (isset($this->overriddenDefaults['filter']) === true) { |
|
| 605 | + break; |
|
| 627 | 606 | } |
| 628 | 607 | |
| 629 | - if (isset($this->extensions[$ext]) === true) { |
|
| 630 | - $newExtensions[$ext] = $this->extensions[$ext]; |
|
| 631 | - } else { |
|
| 632 | - $newExtensions[$ext] = 'PHP'; |
|
| 608 | + $this->filter = substr($arg, 7); |
|
| 609 | + $this->overriddenDefaults['filter'] = true; |
|
| 610 | + } else if (substr($arg, 0, 9) === 'standard=') { |
|
| 611 | + $standards = trim(substr($arg, 9)); |
|
| 612 | + if ($standards !== '') { |
|
| 613 | + $this->standards = explode(',', $standards); |
|
| 633 | 614 | } |
| 634 | - } |
|
| 635 | 615 | |
| 636 | - $this->extensions = $newExtensions; |
|
| 637 | - $this->overriddenDefaults['extensions'] = true; |
|
| 638 | - } else if (substr($arg, 0, 7) === 'suffix=') { |
|
| 639 | - $this->suffix = explode(',', substr($arg, 7)); |
|
| 640 | - $this->overriddenDefaults['suffix'] = true; |
|
| 641 | - } else if (substr($arg, 0, 9) === 'severity=') { |
|
| 642 | - $this->errorSeverity = (int) substr($arg, 9); |
|
| 643 | - $this->warningSeverity = $this->errorSeverity; |
|
| 644 | - $this->overriddenDefaults['errorSeverity'] = true; |
|
| 645 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 646 | - } else if (substr($arg, 0, 15) === 'error-severity=') { |
|
| 647 | - $this->errorSeverity = (int) substr($arg, 15); |
|
| 648 | - $this->overriddenDefaults['errorSeverity'] = true; |
|
| 649 | - } else if (substr($arg, 0, 17) === 'warning-severity=') { |
|
| 650 | - $this->warningSeverity = (int) substr($arg, 17); |
|
| 651 | - $this->overriddenDefaults['warningSeverity'] = true; |
|
| 652 | - } else if (substr($arg, 0, 7) === 'ignore=') { |
|
| 653 | - // Split the ignore string on commas, unless the comma is escaped |
|
| 654 | - // using 1 or 3 slashes (\, or \\\,). |
|
| 655 | - $patterns = preg_split( |
|
| 656 | - '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/', |
|
| 657 | - substr($arg, 7) |
|
| 658 | - ); |
|
| 659 | - |
|
| 660 | - $ignored = array(); |
|
| 661 | - foreach ($patterns as $pattern) { |
|
| 662 | - $pattern = trim($pattern); |
|
| 663 | - if ($pattern === '') { |
|
| 664 | - continue; |
|
| 616 | + $this->overriddenDefaults['standards'] = true; |
|
| 617 | + } else if (substr($arg, 0, 11) === 'extensions=') { |
|
| 618 | + $extensions = explode(',', substr($arg, 11)); |
|
| 619 | + $newExtensions = array(); |
|
| 620 | + foreach ($extensions as $ext) { |
|
| 621 | + $slash = strpos($ext, '/'); |
|
| 622 | + if ($slash !== false) { |
|
| 623 | + // They specified the tokenizer too. |
|
| 624 | + list($ext, $tokenizer) = explode('/', $ext); |
|
| 625 | + $newExtensions[$ext] = strtoupper($tokenizer); |
|
| 626 | + continue; |
|
| 627 | + } |
|
| 628 | + |
|
| 629 | + if (isset($this->extensions[$ext]) === true) { |
|
| 630 | + $newExtensions[$ext] = $this->extensions[$ext]; |
|
| 631 | + } else { |
|
| 632 | + $newExtensions[$ext] = 'PHP'; |
|
| 633 | + } |
|
| 665 | 634 | } |
| 666 | 635 | |
| 667 | - $ignored[$pattern] = 'absolute'; |
|
| 668 | - } |
|
| 636 | + $this->extensions = $newExtensions; |
|
| 637 | + $this->overriddenDefaults['extensions'] = true; |
|
| 638 | + } else if (substr($arg, 0, 7) === 'suffix=') { |
|
| 639 | + $this->suffix = explode(',', substr($arg, 7)); |
|
| 640 | + $this->overriddenDefaults['suffix'] = true; |
|
| 641 | + } else if (substr($arg, 0, 9) === 'severity=') { |
|
| 642 | + $this->errorSeverity = (int) substr($arg, 9); |
|
| 643 | + $this->warningSeverity = $this->errorSeverity; |
|
| 644 | + $this->overriddenDefaults['errorSeverity'] = true; |
|
| 645 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 646 | + } else if (substr($arg, 0, 15) === 'error-severity=') { |
|
| 647 | + $this->errorSeverity = (int) substr($arg, 15); |
|
| 648 | + $this->overriddenDefaults['errorSeverity'] = true; |
|
| 649 | + } else if (substr($arg, 0, 17) === 'warning-severity=') { |
|
| 650 | + $this->warningSeverity = (int) substr($arg, 17); |
|
| 651 | + $this->overriddenDefaults['warningSeverity'] = true; |
|
| 652 | + } else if (substr($arg, 0, 7) === 'ignore=') { |
|
| 653 | + // Split the ignore string on commas, unless the comma is escaped |
|
| 654 | + // using 1 or 3 slashes (\, or \\\,). |
|
| 655 | + $patterns = preg_split( |
|
| 656 | + '/(?<=(?<!\\\\)\\\\\\\\),|(?<!\\\\),/', |
|
| 657 | + substr($arg, 7) |
|
| 658 | + ); |
|
| 659 | + |
|
| 660 | + $ignored = array(); |
|
| 661 | + foreach ($patterns as $pattern) { |
|
| 662 | + $pattern = trim($pattern); |
|
| 663 | + if ($pattern === '') { |
|
| 664 | + continue; |
|
| 665 | + } |
|
| 669 | 666 | |
| 670 | - $this->ignored = $ignored; |
|
| 671 | - $this->overriddenDefaults['ignored'] = true; |
|
| 672 | - } else if (substr($arg, 0, 10) === 'tab-width=') { |
|
| 673 | - $this->tabWidth = (int) substr($arg, 10); |
|
| 674 | - $this->overriddenDefaults['tabWidth'] = true; |
|
| 675 | - } else { |
|
| 676 | - if ($this->dieOnUnknownArg === false) { |
|
| 677 | - $eqPos = strpos($arg, '='); |
|
| 678 | - if ($eqPos === false) { |
|
| 679 | - $this->values[$arg] = $arg; |
|
| 680 | - } else { |
|
| 681 | - $value = substr($arg, ($eqPos + 1)); |
|
| 682 | - $arg = substr($arg, 0, $eqPos); |
|
| 683 | - $this->values[$arg] = $value; |
|
| 667 | + $ignored[$pattern] = 'absolute'; |
|
| 684 | 668 | } |
| 669 | + |
|
| 670 | + $this->ignored = $ignored; |
|
| 671 | + $this->overriddenDefaults['ignored'] = true; |
|
| 672 | + } else if (substr($arg, 0, 10) === 'tab-width=') { |
|
| 673 | + $this->tabWidth = (int) substr($arg, 10); |
|
| 674 | + $this->overriddenDefaults['tabWidth'] = true; |
|
| 685 | 675 | } else { |
| 686 | - $this->processUnknownArgument('--'.$arg, $pos); |
|
| 687 | - } |
|
| 688 | - }//end if |
|
| 676 | + if ($this->dieOnUnknownArg === false) { |
|
| 677 | + $eqPos = strpos($arg, '='); |
|
| 678 | + if ($eqPos === false) { |
|
| 679 | + $this->values[$arg] = $arg; |
|
| 680 | + } else { |
|
| 681 | + $value = substr($arg, ($eqPos + 1)); |
|
| 682 | + $arg = substr($arg, 0, $eqPos); |
|
| 683 | + $this->values[$arg] = $value; |
|
| 684 | + } |
|
| 685 | + } else { |
|
| 686 | + $this->processUnknownArgument('--'.$arg, $pos); |
|
| 687 | + } |
|
| 688 | + }//end if |
|
| 689 | 689 | |
| 690 | - break; |
|
| 690 | + break; |
|
| 691 | 691 | }//end switch |
| 692 | 692 | |
| 693 | 693 | }//end processLongArgument() |
@@ -160,16 +160,16 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | $this->tokensWithTabs = array( |
| 163 | - T_WHITESPACE => true, |
|
| 164 | - T_COMMENT => true, |
|
| 165 | - T_DOC_COMMENT => true, |
|
| 166 | - T_DOC_COMMENT_WHITESPACE => true, |
|
| 167 | - T_DOC_COMMENT_STRING => true, |
|
| 168 | - T_CONSTANT_ENCAPSED_STRING => true, |
|
| 169 | - T_DOUBLE_QUOTED_STRING => true, |
|
| 170 | - T_HEREDOC => true, |
|
| 171 | - T_NOWDOC => true, |
|
| 172 | - T_INLINE_HTML => true, |
|
| 163 | + T_WHITESPACE => true, |
|
| 164 | + T_COMMENT => true, |
|
| 165 | + T_DOC_COMMENT => true, |
|
| 166 | + T_DOC_COMMENT_WHITESPACE => true, |
|
| 167 | + T_DOC_COMMENT_STRING => true, |
|
| 168 | + T_CONSTANT_ENCAPSED_STRING => true, |
|
| 169 | + T_DOUBLE_QUOTED_STRING => true, |
|
| 170 | + T_HEREDOC => true, |
|
| 171 | + T_NOWDOC => true, |
|
| 172 | + T_INLINE_HTML => true, |
|
| 173 | 173 | ); |
| 174 | 174 | |
| 175 | 175 | $this->numTokens = count($this->tokens); |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | $todo = array( |
| 674 | 674 | $stackPtr, |
| 675 | 675 | $opener, |
| 676 | - ); |
|
| 676 | + ); |
|
| 677 | 677 | |
| 678 | 678 | if (PHP_CODESNIFFER_VERBOSITY > 1) { |
| 679 | 679 | $type = $this->tokens[$stackPtr]['type']; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @return void |
| 62 | 62 | * @throws TokenizerException If the file appears to be minified. |
| 63 | 63 | */ |
| 64 | - public function __construct($content, $config, $eolChar='\n') |
|
| 64 | + public function __construct($content, $config, $eolChar = '\n') |
|
| 65 | 65 | { |
| 66 | 66 | $this->eolChar = $eolChar; |
| 67 | 67 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * |
| 93 | 93 | * @return boolean |
| 94 | 94 | */ |
| 95 | - protected function isMinifiedContent($content, $eolChar='\n') |
|
| 95 | + protected function isMinifiedContent($content, $eolChar = '\n') |
|
| 96 | 96 | { |
| 97 | 97 | // Minified files often have a very large number of characters per line |
| 98 | 98 | // and cause issues when tokenizing. |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | * |
| 264 | 264 | * @return void |
| 265 | 265 | */ |
| 266 | - public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ') |
|
| 266 | + public function replaceTabsInToken(&$token, $prefix = ' ', $padding = ' ') |
|
| 267 | 267 | { |
| 268 | 268 | $checkEncoding = false; |
| 269 | 269 | if ($this->config->encoding !== 'iso-8859-1' && function_exists('iconv_strlen') === true) { |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | * |
| 565 | 565 | * @return int The position in the stack that closed the scope. |
| 566 | 566 | */ |
| 567 | - private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0) |
|
| 567 | + private function recurseScopeMap($stackPtr, $depth = 1, &$ignore = 0) |
|
| 568 | 568 | { |
| 569 | 569 | if (PHP_CODESNIFFER_VERBOSITY > 1) { |
| 570 | 570 | echo str_repeat("\t", $depth); |
@@ -406,60 +406,60 @@ |
||
| 406 | 406 | */ |
| 407 | 407 | |
| 408 | 408 | switch ($this->tokens[$i]['code']) { |
| 409 | - case T_OPEN_SQUARE_BRACKET: |
|
| 410 | - $squareOpeners[] = $i; |
|
| 411 | - |
|
| 412 | - if (PHP_CodeSniffer_VERBOSITY > 1) { |
|
| 413 | - echo str_repeat("\t", count($squareOpeners)); |
|
| 414 | - echo str_repeat("\t", count($curlyOpeners)); |
|
| 415 | - echo "=> Found square bracket opener at $i".PHP_EOL; |
|
| 416 | - } |
|
| 417 | - break; |
|
| 418 | - case T_OPEN_CURLY_BRACKET: |
|
| 419 | - if (isset($this->tokens[$i]['scope_closer']) === false) { |
|
| 420 | - $curlyOpeners[] = $i; |
|
| 409 | + case T_OPEN_SQUARE_BRACKET: |
|
| 410 | + $squareOpeners[] = $i; |
|
| 421 | 411 | |
| 422 | 412 | if (PHP_CodeSniffer_VERBOSITY > 1) { |
| 423 | 413 | echo str_repeat("\t", count($squareOpeners)); |
| 424 | 414 | echo str_repeat("\t", count($curlyOpeners)); |
| 425 | - echo "=> Found curly bracket opener at $i".PHP_EOL; |
|
| 415 | + echo "=> Found square bracket opener at $i".PHP_EOL; |
|
| 426 | 416 | } |
| 427 | - } |
|
| 428 | - break; |
|
| 429 | - case T_CLOSE_SQUARE_BRACKET: |
|
| 430 | - if (empty($squareOpeners) === false) { |
|
| 431 | - $opener = array_pop($squareOpeners); |
|
| 432 | - $this->tokens[$i]['bracket_opener'] = $opener; |
|
| 433 | - $this->tokens[$i]['bracket_closer'] = $i; |
|
| 434 | - $this->tokens[$opener]['bracket_opener'] = $opener; |
|
| 435 | - $this->tokens[$opener]['bracket_closer'] = $i; |
|
| 417 | + break; |
|
| 418 | + case T_OPEN_CURLY_BRACKET: |
|
| 419 | + if (isset($this->tokens[$i]['scope_closer']) === false) { |
|
| 420 | + $curlyOpeners[] = $i; |
|
| 436 | 421 | |
| 437 | - if (PHP_CodeSniffer_VERBOSITY > 1) { |
|
| 438 | - echo str_repeat("\t", count($squareOpeners)); |
|
| 439 | - echo str_repeat("\t", count($curlyOpeners)); |
|
| 440 | - echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL; |
|
| 422 | + if (PHP_CodeSniffer_VERBOSITY > 1) { |
|
| 423 | + echo str_repeat("\t", count($squareOpeners)); |
|
| 424 | + echo str_repeat("\t", count($curlyOpeners)); |
|
| 425 | + echo "=> Found curly bracket opener at $i".PHP_EOL; |
|
| 426 | + } |
|
| 441 | 427 | } |
| 442 | - } |
|
| 443 | - break; |
|
| 444 | - case T_CLOSE_CURLY_BRACKET: |
|
| 445 | - if (empty($curlyOpeners) === false |
|
| 446 | - && isset($this->tokens[$i]['scope_opener']) === false |
|
| 447 | - ) { |
|
| 448 | - $opener = array_pop($curlyOpeners); |
|
| 449 | - $this->tokens[$i]['bracket_opener'] = $opener; |
|
| 450 | - $this->tokens[$i]['bracket_closer'] = $i; |
|
| 451 | - $this->tokens[$opener]['bracket_opener'] = $opener; |
|
| 452 | - $this->tokens[$opener]['bracket_closer'] = $i; |
|
| 428 | + break; |
|
| 429 | + case T_CLOSE_SQUARE_BRACKET: |
|
| 430 | + if (empty($squareOpeners) === false) { |
|
| 431 | + $opener = array_pop($squareOpeners); |
|
| 432 | + $this->tokens[$i]['bracket_opener'] = $opener; |
|
| 433 | + $this->tokens[$i]['bracket_closer'] = $i; |
|
| 434 | + $this->tokens[$opener]['bracket_opener'] = $opener; |
|
| 435 | + $this->tokens[$opener]['bracket_closer'] = $i; |
|
| 453 | 436 | |
| 454 | - if (PHP_CodeSniffer_VERBOSITY > 1) { |
|
| 455 | - echo str_repeat("\t", count($squareOpeners)); |
|
| 456 | - echo str_repeat("\t", count($curlyOpeners)); |
|
| 457 | - echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL; |
|
| 437 | + if (PHP_CodeSniffer_VERBOSITY > 1) { |
|
| 438 | + echo str_repeat("\t", count($squareOpeners)); |
|
| 439 | + echo str_repeat("\t", count($curlyOpeners)); |
|
| 440 | + echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL; |
|
| 441 | + } |
|
| 458 | 442 | } |
| 459 | - } |
|
| 460 | - break; |
|
| 461 | - default: |
|
| 462 | - continue; |
|
| 443 | + break; |
|
| 444 | + case T_CLOSE_CURLY_BRACKET: |
|
| 445 | + if (empty($curlyOpeners) === false |
|
| 446 | + && isset($this->tokens[$i]['scope_opener']) === false |
|
| 447 | + ) { |
|
| 448 | + $opener = array_pop($curlyOpeners); |
|
| 449 | + $this->tokens[$i]['bracket_opener'] = $opener; |
|
| 450 | + $this->tokens[$i]['bracket_closer'] = $i; |
|
| 451 | + $this->tokens[$opener]['bracket_opener'] = $opener; |
|
| 452 | + $this->tokens[$opener]['bracket_closer'] = $i; |
|
| 453 | + |
|
| 454 | + if (PHP_CodeSniffer_VERBOSITY > 1) { |
|
| 455 | + echo str_repeat("\t", count($squareOpeners)); |
|
| 456 | + echo str_repeat("\t", count($curlyOpeners)); |
|
| 457 | + echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL; |
|
| 458 | + } |
|
| 459 | + } |
|
| 460 | + break; |
|
| 461 | + default: |
|
| 462 | + continue; |
|
| 463 | 463 | }//end switch |
| 464 | 464 | }//end for |
| 465 | 465 | |
@@ -1450,24 +1450,24 @@ discard block |
||
| 1450 | 1450 | |
| 1451 | 1451 | if ($token[0] === T_STRING) { |
| 1452 | 1452 | switch ($cacheKey) { |
| 1453 | - case 'false': |
|
| 1454 | - $newToken['type'] = 'T_FALSE'; |
|
| 1455 | - break; |
|
| 1456 | - case 'true': |
|
| 1457 | - $newToken['type'] = 'T_TRUE'; |
|
| 1458 | - break; |
|
| 1459 | - case 'null': |
|
| 1460 | - $newToken['type'] = 'T_NULL'; |
|
| 1461 | - break; |
|
| 1462 | - case 'self': |
|
| 1463 | - $newToken['type'] = 'T_SELF'; |
|
| 1464 | - break; |
|
| 1465 | - case 'parent': |
|
| 1466 | - $newToken['type'] = 'T_PARENT'; |
|
| 1467 | - break; |
|
| 1468 | - default: |
|
| 1469 | - $newToken['type'] = 'T_STRING'; |
|
| 1470 | - break; |
|
| 1453 | + case 'false': |
|
| 1454 | + $newToken['type'] = 'T_FALSE'; |
|
| 1455 | + break; |
|
| 1456 | + case 'true': |
|
| 1457 | + $newToken['type'] = 'T_TRUE'; |
|
| 1458 | + break; |
|
| 1459 | + case 'null': |
|
| 1460 | + $newToken['type'] = 'T_NULL'; |
|
| 1461 | + break; |
|
| 1462 | + case 'self': |
|
| 1463 | + $newToken['type'] = 'T_SELF'; |
|
| 1464 | + break; |
|
| 1465 | + case 'parent': |
|
| 1466 | + $newToken['type'] = 'T_PARENT'; |
|
| 1467 | + break; |
|
| 1468 | + default: |
|
| 1469 | + $newToken['type'] = 'T_STRING'; |
|
| 1470 | + break; |
|
| 1471 | 1471 | } |
| 1472 | 1472 | |
| 1473 | 1473 | $newToken['code'] = constant($newToken['type']); |
@@ -1509,87 +1509,87 @@ discard block |
||
| 1509 | 1509 | $newToken = array(); |
| 1510 | 1510 | |
| 1511 | 1511 | switch ($token) { |
| 1512 | - case '{': |
|
| 1513 | - $newToken['type'] = 'T_OPEN_CURLY_BRACKET'; |
|
| 1514 | - break; |
|
| 1515 | - case '}': |
|
| 1516 | - $newToken['type'] = 'T_CLOSE_CURLY_BRACKET'; |
|
| 1517 | - break; |
|
| 1518 | - case '[': |
|
| 1519 | - $newToken['type'] = 'T_OPEN_SQUARE_BRACKET'; |
|
| 1520 | - break; |
|
| 1521 | - case ']': |
|
| 1522 | - $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET'; |
|
| 1523 | - break; |
|
| 1524 | - case '(': |
|
| 1525 | - $newToken['type'] = 'T_OPEN_PARENTHESIS'; |
|
| 1526 | - break; |
|
| 1527 | - case ')': |
|
| 1528 | - $newToken['type'] = 'T_CLOSE_PARENTHESIS'; |
|
| 1529 | - break; |
|
| 1530 | - case ':': |
|
| 1531 | - $newToken['type'] = 'T_COLON'; |
|
| 1532 | - break; |
|
| 1533 | - case '.': |
|
| 1534 | - $newToken['type'] = 'T_STRING_CONCAT'; |
|
| 1535 | - break; |
|
| 1536 | - case '?': |
|
| 1537 | - $newToken['type'] = 'T_INLINE_THEN'; |
|
| 1538 | - break; |
|
| 1539 | - case ';': |
|
| 1540 | - $newToken['type'] = 'T_SEMICOLON'; |
|
| 1541 | - break; |
|
| 1542 | - case '=': |
|
| 1543 | - $newToken['type'] = 'T_EQUAL'; |
|
| 1544 | - break; |
|
| 1545 | - case '*': |
|
| 1546 | - $newToken['type'] = 'T_MULTIPLY'; |
|
| 1547 | - break; |
|
| 1548 | - case '/': |
|
| 1549 | - $newToken['type'] = 'T_DIVIDE'; |
|
| 1550 | - break; |
|
| 1551 | - case '+': |
|
| 1552 | - $newToken['type'] = 'T_PLUS'; |
|
| 1553 | - break; |
|
| 1554 | - case '-': |
|
| 1555 | - $newToken['type'] = 'T_MINUS'; |
|
| 1556 | - break; |
|
| 1557 | - case '%': |
|
| 1558 | - $newToken['type'] = 'T_MODULUS'; |
|
| 1559 | - break; |
|
| 1560 | - case '^': |
|
| 1561 | - $newToken['type'] = 'T_BITWISE_XOR'; |
|
| 1562 | - break; |
|
| 1563 | - case '&': |
|
| 1564 | - $newToken['type'] = 'T_BITWISE_AND'; |
|
| 1565 | - break; |
|
| 1566 | - case '|': |
|
| 1567 | - $newToken['type'] = 'T_BITWISE_OR'; |
|
| 1568 | - break; |
|
| 1569 | - case '<': |
|
| 1570 | - $newToken['type'] = 'T_LESS_THAN'; |
|
| 1571 | - break; |
|
| 1572 | - case '>': |
|
| 1573 | - $newToken['type'] = 'T_GREATER_THAN'; |
|
| 1574 | - break; |
|
| 1575 | - case '!': |
|
| 1576 | - $newToken['type'] = 'T_BOOLEAN_NOT'; |
|
| 1577 | - break; |
|
| 1578 | - case ',': |
|
| 1579 | - $newToken['type'] = 'T_COMMA'; |
|
| 1580 | - break; |
|
| 1581 | - case '@': |
|
| 1582 | - $newToken['type'] = 'T_ASPERAND'; |
|
| 1583 | - break; |
|
| 1584 | - case '$': |
|
| 1585 | - $newToken['type'] = 'T_DOLLAR'; |
|
| 1586 | - break; |
|
| 1587 | - case '`': |
|
| 1588 | - $newToken['type'] = 'T_BACKTICK'; |
|
| 1589 | - break; |
|
| 1590 | - default: |
|
| 1591 | - $newToken['type'] = 'T_NONE'; |
|
| 1592 | - break; |
|
| 1512 | + case '{': |
|
| 1513 | + $newToken['type'] = 'T_OPEN_CURLY_BRACKET'; |
|
| 1514 | + break; |
|
| 1515 | + case '}': |
|
| 1516 | + $newToken['type'] = 'T_CLOSE_CURLY_BRACKET'; |
|
| 1517 | + break; |
|
| 1518 | + case '[': |
|
| 1519 | + $newToken['type'] = 'T_OPEN_SQUARE_BRACKET'; |
|
| 1520 | + break; |
|
| 1521 | + case ']': |
|
| 1522 | + $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET'; |
|
| 1523 | + break; |
|
| 1524 | + case '(': |
|
| 1525 | + $newToken['type'] = 'T_OPEN_PARENTHESIS'; |
|
| 1526 | + break; |
|
| 1527 | + case ')': |
|
| 1528 | + $newToken['type'] = 'T_CLOSE_PARENTHESIS'; |
|
| 1529 | + break; |
|
| 1530 | + case ':': |
|
| 1531 | + $newToken['type'] = 'T_COLON'; |
|
| 1532 | + break; |
|
| 1533 | + case '.': |
|
| 1534 | + $newToken['type'] = 'T_STRING_CONCAT'; |
|
| 1535 | + break; |
|
| 1536 | + case '?': |
|
| 1537 | + $newToken['type'] = 'T_INLINE_THEN'; |
|
| 1538 | + break; |
|
| 1539 | + case ';': |
|
| 1540 | + $newToken['type'] = 'T_SEMICOLON'; |
|
| 1541 | + break; |
|
| 1542 | + case '=': |
|
| 1543 | + $newToken['type'] = 'T_EQUAL'; |
|
| 1544 | + break; |
|
| 1545 | + case '*': |
|
| 1546 | + $newToken['type'] = 'T_MULTIPLY'; |
|
| 1547 | + break; |
|
| 1548 | + case '/': |
|
| 1549 | + $newToken['type'] = 'T_DIVIDE'; |
|
| 1550 | + break; |
|
| 1551 | + case '+': |
|
| 1552 | + $newToken['type'] = 'T_PLUS'; |
|
| 1553 | + break; |
|
| 1554 | + case '-': |
|
| 1555 | + $newToken['type'] = 'T_MINUS'; |
|
| 1556 | + break; |
|
| 1557 | + case '%': |
|
| 1558 | + $newToken['type'] = 'T_MODULUS'; |
|
| 1559 | + break; |
|
| 1560 | + case '^': |
|
| 1561 | + $newToken['type'] = 'T_BITWISE_XOR'; |
|
| 1562 | + break; |
|
| 1563 | + case '&': |
|
| 1564 | + $newToken['type'] = 'T_BITWISE_AND'; |
|
| 1565 | + break; |
|
| 1566 | + case '|': |
|
| 1567 | + $newToken['type'] = 'T_BITWISE_OR'; |
|
| 1568 | + break; |
|
| 1569 | + case '<': |
|
| 1570 | + $newToken['type'] = 'T_LESS_THAN'; |
|
| 1571 | + break; |
|
| 1572 | + case '>': |
|
| 1573 | + $newToken['type'] = 'T_GREATER_THAN'; |
|
| 1574 | + break; |
|
| 1575 | + case '!': |
|
| 1576 | + $newToken['type'] = 'T_BOOLEAN_NOT'; |
|
| 1577 | + break; |
|
| 1578 | + case ',': |
|
| 1579 | + $newToken['type'] = 'T_COMMA'; |
|
| 1580 | + break; |
|
| 1581 | + case '@': |
|
| 1582 | + $newToken['type'] = 'T_ASPERAND'; |
|
| 1583 | + break; |
|
| 1584 | + case '$': |
|
| 1585 | + $newToken['type'] = 'T_DOLLAR'; |
|
| 1586 | + break; |
|
| 1587 | + case '`': |
|
| 1588 | + $newToken['type'] = 'T_BACKTICK'; |
|
| 1589 | + break; |
|
| 1590 | + default: |
|
| 1591 | + $newToken['type'] = 'T_NONE'; |
|
| 1592 | + break; |
|
| 1593 | 1593 | }//end switch |
| 1594 | 1594 | |
| 1595 | 1595 | $newToken['code'] = constant($newToken['type']); |
@@ -28,232 +28,232 @@ discard block |
||
| 28 | 28 | public $scopeOpeners = array( |
| 29 | 29 | T_IF => array( |
| 30 | 30 | 'start' => array( |
| 31 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 32 | - T_COLON => T_COLON, |
|
| 31 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 32 | + T_COLON => T_COLON, |
|
| 33 | 33 | ), |
| 34 | 34 | 'end' => array( |
| 35 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 36 | - T_ENDIF => T_ENDIF, |
|
| 37 | - T_ELSE => T_ELSE, |
|
| 38 | - T_ELSEIF => T_ELSEIF, |
|
| 35 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 36 | + T_ENDIF => T_ENDIF, |
|
| 37 | + T_ELSE => T_ELSE, |
|
| 38 | + T_ELSEIF => T_ELSEIF, |
|
| 39 | 39 | ), |
| 40 | 40 | 'strict' => false, |
| 41 | 41 | 'shared' => false, |
| 42 | 42 | 'with' => array( |
| 43 | - T_ELSE => T_ELSE, |
|
| 44 | - T_ELSEIF => T_ELSEIF, |
|
| 43 | + T_ELSE => T_ELSE, |
|
| 44 | + T_ELSEIF => T_ELSEIF, |
|
| 45 | 45 | ), |
| 46 | - ), |
|
| 46 | + ), |
|
| 47 | 47 | T_TRY => array( |
| 48 | 48 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 49 | 49 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 50 | 50 | 'strict' => true, |
| 51 | 51 | 'shared' => false, |
| 52 | 52 | 'with' => array(), |
| 53 | - ), |
|
| 53 | + ), |
|
| 54 | 54 | T_CATCH => array( |
| 55 | 55 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 56 | 56 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 57 | 57 | 'strict' => true, |
| 58 | 58 | 'shared' => false, |
| 59 | 59 | 'with' => array(), |
| 60 | - ), |
|
| 60 | + ), |
|
| 61 | 61 | T_FINALLY => array( |
| 62 | 62 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 63 | 63 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 64 | 64 | 'strict' => true, |
| 65 | 65 | 'shared' => false, |
| 66 | 66 | 'with' => array(), |
| 67 | - ), |
|
| 67 | + ), |
|
| 68 | 68 | T_ELSE => array( |
| 69 | 69 | 'start' => array( |
| 70 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 71 | - T_COLON => T_COLON, |
|
| 70 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 71 | + T_COLON => T_COLON, |
|
| 72 | 72 | ), |
| 73 | 73 | 'end' => array( |
| 74 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 75 | - T_ENDIF => T_ENDIF, |
|
| 74 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 75 | + T_ENDIF => T_ENDIF, |
|
| 76 | 76 | ), |
| 77 | 77 | 'strict' => false, |
| 78 | 78 | 'shared' => false, |
| 79 | 79 | 'with' => array( |
| 80 | - T_IF => T_IF, |
|
| 81 | - T_ELSEIF => T_ELSEIF, |
|
| 80 | + T_IF => T_IF, |
|
| 81 | + T_ELSEIF => T_ELSEIF, |
|
| 82 | 82 | ), |
| 83 | - ), |
|
| 83 | + ), |
|
| 84 | 84 | T_ELSEIF => array( |
| 85 | 85 | 'start' => array( |
| 86 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 87 | - T_COLON => T_COLON, |
|
| 86 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 87 | + T_COLON => T_COLON, |
|
| 88 | 88 | ), |
| 89 | 89 | 'end' => array( |
| 90 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 91 | - T_ENDIF => T_ENDIF, |
|
| 92 | - T_ELSE => T_ELSE, |
|
| 93 | - T_ELSEIF => T_ELSEIF, |
|
| 90 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 91 | + T_ENDIF => T_ENDIF, |
|
| 92 | + T_ELSE => T_ELSE, |
|
| 93 | + T_ELSEIF => T_ELSEIF, |
|
| 94 | 94 | ), |
| 95 | 95 | 'strict' => false, |
| 96 | 96 | 'shared' => false, |
| 97 | 97 | 'with' => array( |
| 98 | - T_IF => T_IF, |
|
| 99 | - T_ELSE => T_ELSE, |
|
| 98 | + T_IF => T_IF, |
|
| 99 | + T_ELSE => T_ELSE, |
|
| 100 | 100 | ), |
| 101 | - ), |
|
| 101 | + ), |
|
| 102 | 102 | T_FOR => array( |
| 103 | 103 | 'start' => array( |
| 104 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 105 | - T_COLON => T_COLON, |
|
| 104 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 105 | + T_COLON => T_COLON, |
|
| 106 | 106 | ), |
| 107 | 107 | 'end' => array( |
| 108 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 109 | - T_ENDFOR => T_ENDFOR, |
|
| 108 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 109 | + T_ENDFOR => T_ENDFOR, |
|
| 110 | 110 | ), |
| 111 | 111 | 'strict' => false, |
| 112 | 112 | 'shared' => false, |
| 113 | 113 | 'with' => array(), |
| 114 | - ), |
|
| 114 | + ), |
|
| 115 | 115 | T_FOREACH => array( |
| 116 | 116 | 'start' => array( |
| 117 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 118 | - T_COLON => T_COLON, |
|
| 117 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 118 | + T_COLON => T_COLON, |
|
| 119 | 119 | ), |
| 120 | 120 | 'end' => array( |
| 121 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 122 | - T_ENDFOREACH => T_ENDFOREACH, |
|
| 121 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 122 | + T_ENDFOREACH => T_ENDFOREACH, |
|
| 123 | 123 | ), |
| 124 | 124 | 'strict' => false, |
| 125 | 125 | 'shared' => false, |
| 126 | 126 | 'with' => array(), |
| 127 | - ), |
|
| 127 | + ), |
|
| 128 | 128 | T_INTERFACE => array( |
| 129 | 129 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 130 | 130 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 131 | 131 | 'strict' => true, |
| 132 | 132 | 'shared' => false, |
| 133 | 133 | 'with' => array(), |
| 134 | - ), |
|
| 134 | + ), |
|
| 135 | 135 | T_FUNCTION => array( |
| 136 | 136 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 137 | 137 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 138 | 138 | 'strict' => true, |
| 139 | 139 | 'shared' => false, |
| 140 | 140 | 'with' => array(), |
| 141 | - ), |
|
| 141 | + ), |
|
| 142 | 142 | T_CLASS => array( |
| 143 | 143 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 144 | 144 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 145 | 145 | 'strict' => true, |
| 146 | 146 | 'shared' => false, |
| 147 | 147 | 'with' => array(), |
| 148 | - ), |
|
| 148 | + ), |
|
| 149 | 149 | T_TRAIT => array( |
| 150 | 150 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 151 | 151 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 152 | 152 | 'strict' => true, |
| 153 | 153 | 'shared' => false, |
| 154 | 154 | 'with' => array(), |
| 155 | - ), |
|
| 155 | + ), |
|
| 156 | 156 | T_USE => array( |
| 157 | 157 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 158 | 158 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 159 | 159 | 'strict' => false, |
| 160 | 160 | 'shared' => false, |
| 161 | 161 | 'with' => array(), |
| 162 | - ), |
|
| 162 | + ), |
|
| 163 | 163 | T_DECLARE => array( |
| 164 | 164 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 165 | 165 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 166 | 166 | 'strict' => false, |
| 167 | 167 | 'shared' => false, |
| 168 | 168 | 'with' => array(), |
| 169 | - ), |
|
| 169 | + ), |
|
| 170 | 170 | T_NAMESPACE => array( |
| 171 | 171 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 172 | 172 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 173 | 173 | 'strict' => false, |
| 174 | 174 | 'shared' => false, |
| 175 | 175 | 'with' => array(), |
| 176 | - ), |
|
| 176 | + ), |
|
| 177 | 177 | T_WHILE => array( |
| 178 | 178 | 'start' => array( |
| 179 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 180 | - T_COLON => T_COLON, |
|
| 179 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 180 | + T_COLON => T_COLON, |
|
| 181 | 181 | ), |
| 182 | 182 | 'end' => array( |
| 183 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 184 | - T_ENDWHILE => T_ENDWHILE, |
|
| 183 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 184 | + T_ENDWHILE => T_ENDWHILE, |
|
| 185 | 185 | ), |
| 186 | 186 | 'strict' => false, |
| 187 | 187 | 'shared' => false, |
| 188 | 188 | 'with' => array(), |
| 189 | - ), |
|
| 189 | + ), |
|
| 190 | 190 | T_DO => array( |
| 191 | 191 | 'start' => array(T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET), |
| 192 | 192 | 'end' => array(T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET), |
| 193 | 193 | 'strict' => true, |
| 194 | 194 | 'shared' => false, |
| 195 | 195 | 'with' => array(), |
| 196 | - ), |
|
| 196 | + ), |
|
| 197 | 197 | T_SWITCH => array( |
| 198 | 198 | 'start' => array( |
| 199 | - T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 200 | - T_COLON => T_COLON, |
|
| 199 | + T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET, |
|
| 200 | + T_COLON => T_COLON, |
|
| 201 | 201 | ), |
| 202 | 202 | 'end' => array( |
| 203 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 204 | - T_ENDSWITCH => T_ENDSWITCH, |
|
| 203 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 204 | + T_ENDSWITCH => T_ENDSWITCH, |
|
| 205 | 205 | ), |
| 206 | 206 | 'strict' => true, |
| 207 | 207 | 'shared' => false, |
| 208 | 208 | 'with' => array(), |
| 209 | - ), |
|
| 209 | + ), |
|
| 210 | 210 | T_CASE => array( |
| 211 | 211 | 'start' => array( |
| 212 | - T_COLON => T_COLON, |
|
| 213 | - T_SEMICOLON => T_SEMICOLON, |
|
| 212 | + T_COLON => T_COLON, |
|
| 213 | + T_SEMICOLON => T_SEMICOLON, |
|
| 214 | 214 | ), |
| 215 | 215 | 'end' => array( |
| 216 | - T_BREAK => T_BREAK, |
|
| 217 | - T_RETURN => T_RETURN, |
|
| 218 | - T_CONTINUE => T_CONTINUE, |
|
| 219 | - T_THROW => T_THROW, |
|
| 220 | - T_EXIT => T_EXIT, |
|
| 216 | + T_BREAK => T_BREAK, |
|
| 217 | + T_RETURN => T_RETURN, |
|
| 218 | + T_CONTINUE => T_CONTINUE, |
|
| 219 | + T_THROW => T_THROW, |
|
| 220 | + T_EXIT => T_EXIT, |
|
| 221 | 221 | ), |
| 222 | 222 | 'strict' => true, |
| 223 | 223 | 'shared' => true, |
| 224 | 224 | 'with' => array( |
| 225 | - T_DEFAULT => T_DEFAULT, |
|
| 226 | - T_CASE => T_CASE, |
|
| 227 | - T_SWITCH => T_SWITCH, |
|
| 225 | + T_DEFAULT => T_DEFAULT, |
|
| 226 | + T_CASE => T_CASE, |
|
| 227 | + T_SWITCH => T_SWITCH, |
|
| 228 | 228 | ), |
| 229 | - ), |
|
| 229 | + ), |
|
| 230 | 230 | T_DEFAULT => array( |
| 231 | 231 | 'start' => array( |
| 232 | - T_COLON => T_COLON, |
|
| 233 | - T_SEMICOLON => T_SEMICOLON, |
|
| 232 | + T_COLON => T_COLON, |
|
| 233 | + T_SEMICOLON => T_SEMICOLON, |
|
| 234 | 234 | ), |
| 235 | 235 | 'end' => array( |
| 236 | - T_BREAK => T_BREAK, |
|
| 237 | - T_RETURN => T_RETURN, |
|
| 238 | - T_CONTINUE => T_CONTINUE, |
|
| 239 | - T_THROW => T_THROW, |
|
| 240 | - T_EXIT => T_EXIT, |
|
| 236 | + T_BREAK => T_BREAK, |
|
| 237 | + T_RETURN => T_RETURN, |
|
| 238 | + T_CONTINUE => T_CONTINUE, |
|
| 239 | + T_THROW => T_THROW, |
|
| 240 | + T_EXIT => T_EXIT, |
|
| 241 | 241 | ), |
| 242 | 242 | 'strict' => true, |
| 243 | 243 | 'shared' => true, |
| 244 | 244 | 'with' => array( |
| 245 | - T_CASE => T_CASE, |
|
| 246 | - T_SWITCH => T_SWITCH, |
|
| 245 | + T_CASE => T_CASE, |
|
| 246 | + T_SWITCH => T_SWITCH, |
|
| 247 | 247 | ), |
| 248 | - ), |
|
| 248 | + ), |
|
| 249 | 249 | T_START_HEREDOC => array( |
| 250 | 250 | 'start' => array(T_START_HEREDOC => T_START_HEREDOC), |
| 251 | 251 | 'end' => array(T_END_HEREDOC => T_END_HEREDOC), |
| 252 | 252 | 'strict' => true, |
| 253 | 253 | 'shared' => false, |
| 254 | 254 | 'with' => array(), |
| 255 | - ), |
|
| 256 | - ); |
|
| 255 | + ), |
|
| 256 | + ); |
|
| 257 | 257 | |
| 258 | 258 | /** |
| 259 | 259 | * A list of tokens that end the scope. |
@@ -265,15 +265,15 @@ discard block |
||
| 265 | 265 | * @var array |
| 266 | 266 | */ |
| 267 | 267 | public $endScopeTokens = array( |
| 268 | - T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 269 | - T_ENDIF => T_ENDIF, |
|
| 270 | - T_ENDFOR => T_ENDFOR, |
|
| 271 | - T_ENDFOREACH => T_ENDFOREACH, |
|
| 272 | - T_ENDWHILE => T_ENDWHILE, |
|
| 273 | - T_ENDSWITCH => T_ENDSWITCH, |
|
| 274 | - T_BREAK => T_BREAK, |
|
| 275 | - T_END_HEREDOC => T_END_HEREDOC, |
|
| 276 | - ); |
|
| 268 | + T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET, |
|
| 269 | + T_ENDIF => T_ENDIF, |
|
| 270 | + T_ENDFOR => T_ENDFOR, |
|
| 271 | + T_ENDFOREACH => T_ENDFOREACH, |
|
| 272 | + T_ENDWHILE => T_ENDWHILE, |
|
| 273 | + T_ENDSWITCH => T_ENDSWITCH, |
|
| 274 | + T_BREAK => T_BREAK, |
|
| 275 | + T_END_HEREDOC => T_END_HEREDOC, |
|
| 276 | + ); |
|
| 277 | 277 | |
| 278 | 278 | /** |
| 279 | 279 | * Known lengths of tokens. |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | T_BACKTICK => 1, |
| 424 | 424 | T_OPEN_SHORT_ARRAY => 1, |
| 425 | 425 | T_CLOSE_SHORT_ARRAY => 1, |
| 426 | - ); |
|
| 426 | + ); |
|
| 427 | 427 | |
| 428 | 428 | |
| 429 | 429 | /** |
@@ -555,10 +555,10 @@ discard block |
||
| 555 | 555 | // Binary casts need a special token. |
| 556 | 556 | if ($token[0] === 'b"') { |
| 557 | 557 | $finalTokens[$newStackPtr] = array( |
| 558 | - 'code' => T_BINARY_CAST, |
|
| 559 | - 'type' => 'T_BINARY_CAST', |
|
| 560 | - 'content' => 'b', |
|
| 561 | - ); |
|
| 558 | + 'code' => T_BINARY_CAST, |
|
| 559 | + 'type' => 'T_BINARY_CAST', |
|
| 560 | + 'content' => 'b', |
|
| 561 | + ); |
|
| 562 | 562 | $newStackPtr++; |
| 563 | 563 | } |
| 564 | 564 | |
@@ -735,11 +735,11 @@ discard block |
||
| 735 | 735 | && $tokens[($stackPtr - 1)][0] !== T_PAAMAYIM_NEKUDOTAYIM |
| 736 | 736 | ) { |
| 737 | 737 | $stopTokens = array( |
| 738 | - T_CASE => true, |
|
| 739 | - T_SEMICOLON => true, |
|
| 740 | - T_OPEN_CURLY_BRACKET => true, |
|
| 741 | - T_INLINE_THEN => true, |
|
| 742 | - ); |
|
| 738 | + T_CASE => true, |
|
| 739 | + T_SEMICOLON => true, |
|
| 740 | + T_OPEN_CURLY_BRACKET => true, |
|
| 741 | + T_INLINE_THEN => true, |
|
| 742 | + ); |
|
| 743 | 743 | |
| 744 | 744 | for ($x = ($newStackPtr - 1); $x > 0; $x--) { |
| 745 | 745 | if (isset($stopTokens[$finalTokens[$x]['code']]) === true) { |
@@ -751,10 +751,10 @@ discard block |
||
| 751 | 751 | && $finalTokens[$x]['code'] !== T_INLINE_THEN |
| 752 | 752 | ) { |
| 753 | 753 | $finalTokens[$newStackPtr] = array( |
| 754 | - 'content' => $token[1].':', |
|
| 755 | - 'code' => T_GOTO_LABEL, |
|
| 756 | - 'type' => 'T_GOTO_LABEL', |
|
| 757 | - ); |
|
| 754 | + 'content' => $token[1].':', |
|
| 755 | + 'code' => T_GOTO_LABEL, |
|
| 756 | + 'type' => 'T_GOTO_LABEL', |
|
| 757 | + ); |
|
| 758 | 758 | |
| 759 | 759 | if (PHP_CodeSniffer_VERBOSITY > 1) { |
| 760 | 760 | echo "\t\t* token $stackPtr changed from T_STRING to T_GOTO_LABEL".PHP_EOL; |
@@ -778,10 +778,10 @@ discard block |
||
| 778 | 778 | $tokenLines = explode($this->eolChar, $token[1]); |
| 779 | 779 | $numLines = count($tokenLines); |
| 780 | 780 | $newToken = array( |
| 781 | - 'type' => token_name($token[0]), |
|
| 782 | - 'code' => $token[0], |
|
| 783 | - 'content' => '', |
|
| 784 | - ); |
|
| 781 | + 'type' => token_name($token[0]), |
|
| 782 | + 'code' => $token[0], |
|
| 783 | + 'content' => '', |
|
| 784 | + ); |
|
| 785 | 785 | |
| 786 | 786 | for ($i = 0; $i < $numLines; $i++) { |
| 787 | 787 | $newToken['content'] = $tokenLines[$i]; |
@@ -812,13 +812,13 @@ discard block |
||
| 812 | 812 | T_USE => true, |
| 813 | 813 | T_NAMESPACE => true, |
| 814 | 814 | T_PAAMAYIM_NEKUDOTAYIM => true, |
| 815 | - ); |
|
| 815 | + ); |
|
| 816 | 816 | if (isset($context[$finalTokens[$lastNotEmptyToken]['code']]) === true) { |
| 817 | 817 | $finalTokens[$newStackPtr] = array( |
| 818 | - 'content' => $token[1], |
|
| 819 | - 'code' => T_STRING, |
|
| 820 | - 'type' => 'T_STRING', |
|
| 821 | - ); |
|
| 818 | + 'content' => $token[1], |
|
| 819 | + 'code' => T_STRING, |
|
| 820 | + 'type' => 'T_STRING', |
|
| 821 | + ); |
|
| 822 | 822 | $newStackPtr++; |
| 823 | 823 | continue; |
| 824 | 824 | } |
@@ -1107,7 +1107,7 @@ discard block |
||
| 1107 | 1107 | T_CLOSE_PARENTHESIS => T_CLOSE_PARENTHESIS, |
| 1108 | 1108 | T_VARIABLE => T_VARIABLE, |
| 1109 | 1109 | T_STRING => T_STRING, |
| 1110 | - ); |
|
| 1110 | + ); |
|
| 1111 | 1111 | |
| 1112 | 1112 | if (isset($allowed[$this->tokens[$x]['code']]) === false |
| 1113 | 1113 | && isset($this->tokens[$i]['bracket_closer']) === true |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | T_OBJECT_OPERATOR => true, |
| 1170 | 1170 | T_NS_SEPARATOR => true, |
| 1171 | 1171 | T_PAAMAYIM_NEKUDOTAYIM => true, |
| 1172 | - ); |
|
| 1172 | + ); |
|
| 1173 | 1173 | if (isset($context[$this->tokens[$x]['code']]) === true) { |
| 1174 | 1174 | if (PHP_CodeSniffer_VERBOSITY > 1) { |
| 1175 | 1175 | $line = $this->tokens[$i]['line']; |
@@ -1402,13 +1402,13 @@ discard block |
||
| 1402 | 1402 | self::$_resolveTokenCache[$cacheKey] = $newToken; |
| 1403 | 1403 | } else if ($token[0] === T_CURLY_OPEN) { |
| 1404 | 1404 | $newToken = array( |
| 1405 | - 'code' => T_OPEN_CURLY_BRACKET, |
|
| 1406 | - 'type' => 'T_OPEN_CURLY_BRACKET', |
|
| 1405 | + 'code' => T_OPEN_CURLY_BRACKET, |
|
| 1406 | + 'type' => 'T_OPEN_CURLY_BRACKET', |
|
| 1407 | 1407 | ); |
| 1408 | 1408 | } else { |
| 1409 | 1409 | $newToken = array( |
| 1410 | - 'code' => $token[0], |
|
| 1411 | - 'type' => token_name($token[0]), |
|
| 1410 | + 'code' => $token[0], |
|
| 1411 | + 'type' => token_name($token[0]), |
|
| 1412 | 1412 | ); |
| 1413 | 1413 | |
| 1414 | 1414 | self::$_resolveTokenCache[$token[0]] = $newToken; |
