From ce2aa584826358f3d3078daf0c5b262c813f71e7 Mon Sep 17 00:00:00 2001 From: Greg Sherwood Date: Wed, 3 Apr 2019 14:47:15 +1100 Subject: [PATCH] Fixed bug #2423 : Squiz.Formatting.OperatorBracket.MissingBrackets error with static --- package.xml | 1 + src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php | 2 ++ .../Squiz/Tests/Formatting/OperatorBracketUnitTest.inc | 3 +++ .../Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed | 3 +++ 4 files changed, 9 insertions(+) diff --git a/package.xml b/package.xml index 47c857f901..bd11d294a4 100644 --- a/package.xml +++ b/package.xml @@ -28,6 +28,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> - Squiz.Arrays.ArrayDeclaration now has improved handling of syntax errors - Fixed bug #2414 : Indention false positive in switch/case/if combination + - Fixed bug #2423 : Squiz.Formatting.OperatorBracket.MissingBrackets error with static - Fixed bug #2450 : Indentation false positive when closure containing nested IF conditions used as function argument - Fixed bug #2452 : LowercasePHPFunctions sniff failing on "new \File()" - Fixed bug #2453 : Squiz.CSS.SemicolonSpacingSniff false positive when style name proceeded by an asterisk diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php index 9a5bbb833c..a97628047e 100644 --- a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php +++ b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php @@ -138,6 +138,7 @@ public function process(File $phpcsFile, $stackPtr) T_NS_SEPARATOR, T_THIS, T_SELF, + T_STATIC, T_OBJECT_OPERATOR, T_DOUBLE_COLON, T_OPEN_SQUARE_BRACKET, @@ -280,6 +281,7 @@ public function addMissingBracketsError($phpcsFile, $stackPtr) T_NS_SEPARATOR => true, T_THIS => true, T_SELF => true, + T_STATIC => true, T_OBJECT_OPERATOR => true, T_DOUBLE_COLON => true, T_MODULUS => true, diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc index 30a2b98fbe..e9c8061bfd 100644 --- a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc +++ b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc @@ -167,3 +167,6 @@ $foo = $bar ?? $baz ?? ''; $foo = $myString{-1}; $value = (binary) $blah + b"binary $foo"; + +$test = (1 * static::TEST); +$test = myfunc(1 * static::TEST); diff --git a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed index 409091db62..a0e0a895b3 100644 --- a/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed +++ b/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed @@ -167,3 +167,6 @@ $foo = ($bar ?? $baz ?? ''); $foo = $myString{-1}; $value = ((binary) $blah + b"binary $foo"); + +$test = (1 * static::TEST); +$test = myfunc(1 * static::TEST);