Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed bug #20136 : Squiz_Sniffs_WhiteSpace_ScopeKeywordSpacingSniff a…

…nd Traits
  • Loading branch information...
commit 0622b323c598b44f498df843acd9d16f63494ac4 1 parent 0191c4f
@gsherwood gsherwood authored
View
5 CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
@@ -69,6 +69,11 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
return;
}
+ if ($tokens[$prevToken]['code'] === T_AS) {
+ // Trait visibilty change, e.g., use HelloWorld { sayHello as private; }
+ return;
+ }
+
$nextToken = $tokens[($stackPtr + 1)];
if ($nextToken['code'] !== T_WHITESPACE
|| strlen($nextToken['content']) !== 1
View
5 CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc
@@ -35,4 +35,7 @@ abstract class Foo
if ($geometry instanceof static) {
echo 'foo';
}
-?>
+
+class MyClass1 {
+ use HelloWorld { sayHello as private; }
+}
View
27 package.xml
@@ -26,32 +26,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
</stability>
<license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
<notes>
- - Doc generation is now working again for installed standards
- -- Includes a fix for limiting the docs to specific sniffs
- - Generic ScopeIndentSniff now allows for ignored tokens to be set via ruleset.xml files
- -- E.g., to ignore comments, override a property using:
- -- name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"
- - PSR2 standard now ignores comments when checking indentation rules
- - Generic UpperCaseConstantNameSniff no longer reports errors where constants are used (request #20090)
- -- It still reports errors where constants are defined
- - Individual messages can now be excluded in ruleset.xml files using the exclude tag (request #20091)
- -- Setting message severity to 0 continues to be supported
- - Squiz OperatorSpacingSniff no longer throws errors for the ?: short ternary operator
- -- Thanks to Antoine Musso for the patch
- - Comment parser now supports non-English characters when splitting comment lines into words
- -- Thanks to Nik Sun for the patch
- - Exit statements are now recognised as valid closers for CASE and DEFAULT blocks
- -- Thanks to Maksim Kochkin for the patch
- - PHP_CodeSniffer_CLI::process() can now be passed an incomplete array of CLI values
- -- Missing values will be set to the CLI defaults
- -- Thanks to Maksim Kochkin for the patch
- - Fixed bug #20093 : Bug with ternary operator token
- - Fixed bug #20097 : CLI.php throws error in php 5.2
- - Fixed bug #20100 : incorrect Function mysql() has been deprecated report
- - Fixed bug #20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
- - Fixed bug #20123 : PSR2 complains about an empty second statement in for-loop
- - Fixed bug #20131 : PHP errors in svnblame report, if there are files not under version control
- - Fixed bug #20133 : Allow "HG: hg_id" as value for @version tag
+ - Fixed bug #20136 : Squiz_Sniffs_WhiteSpace_ScopeKeywordSpacingSniff and Traits
</notes>
<contents>
<dir name="/">
Please sign in to comment.
Something went wrong with that request. Please try again.