diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-12 17:30:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-12 17:30:25 +0200 |
| commit | 3e004d22cb29ba6b4489dca44e86b31090a59f01 (patch) | |
| tree | 05b8dd257b6a802b6cdea15fd88e66207eb81874 | |
| parent | 0d6fe203729cdade106e21383c3faa5f71b378ce (diff) | |
| parent | 57f7fdf989aea59d2f8cb853546574fc1885d049 (diff) | |
| download | forums-3e004d22cb29ba6b4489dca44e86b31090a59f01.tar forums-3e004d22cb29ba6b4489dca44e86b31090a59f01.tar.gz forums-3e004d22cb29ba6b4489dca44e86b31090a59f01.tar.bz2 forums-3e004d22cb29ba6b4489dca44e86b31090a59f01.tar.xz forums-3e004d22cb29ba6b4489dca44e86b31090a59f01.zip | |
Merge pull request #2725 from Nicofuma/ticket/12842
[ticket/12842] Out of memory issue in code sniffer call for extensions
* Nicofuma/ticket/12842:
[ticket/12842] Skip parameters without exlicit type
| -rw-r--r-- | build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 16e3427bd9..f81ec46579 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -153,19 +153,24 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff $start_argument = $phpcsFile->findPrevious(array(T_OPEN_PARENTHESIS, T_COMMA), $argument); $argument_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($start_argument + 1), $argument); - $argument_class_name_end = $phpcsFile->findNext($find, ($argument_class_name_start + 1), null, true); - $argument_class_name = $phpcsFile->getTokensAsString($argument_class_name_start, ($argument_class_name_end - $argument_class_name_start - 1)); - - if ($argument_class_name === $class_name_full) + // Skip the parameter if no type is defined. + if ($argument_class_name_start !== false) { - $error = 'Either use statement or full name must be used.'; - $phpcsFile->addError($error, $function_declaration, 'FullName'); - } + $argument_class_name_end = $phpcsFile->findNext($find, ($argument_class_name_start + 1), null, true); - if ($argument_class_name === $class_name_short) - { - $ok = true; + $argument_class_name = $phpcsFile->getTokensAsString($argument_class_name_start, ($argument_class_name_end - $argument_class_name_start - 1)); + + if ($argument_class_name === $class_name_full) + { + $error = 'Either use statement or full name must be used.'; + $phpcsFile->addError($error, $function_declaration, 'FullName'); + } + + if ($argument_class_name === $class_name_short) + { + $ok = true; + } } } } |