Skip to content

Commit 5ffea57

Browse files
committed
Merge branch 'feature/squiz-operatorbracket-bugfix-and-named-param-tests' of https://github.com/jrfnl/PHP_CodeSniffer
2 parents f1390c5 + e519710 commit 5ffea57

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ public function process(File $phpcsFile, $stackPtr)
8080
$isAssignment = isset(Tokens::$assignmentTokens[$tokens[$previous]['code']]);
8181
$isEquality = isset(Tokens::$equalityTokens[$tokens[$previous]['code']]);
8282
$isComparison = isset(Tokens::$comparisonTokens[$tokens[$previous]['code']]);
83-
if ($isAssignment === true || $isEquality === true || $isComparison === true) {
83+
$isUnary = isset(Tokens::$operators[$tokens[$previous]['code']]);
84+
if ($isAssignment === true || $isEquality === true || $isComparison === true || $isUnary === true) {
8485
// This is a negative assignment or comparison.
8586
// We need to check that the minus and the number are
8687
// adjacent.

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,8 @@ $expr = match ($number % 10) {
188188
$expr = match (true) {
189189
$num * 100 > 500 => 'expression in key',
190190
};
191+
192+
// PHP 8.0 named parameters.
193+
if ($pos === count(value: $this->tokens) - 1) {
194+
$file = '...'.substr(string: $file, offset: $padding * -1 + 3);
195+
}

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,8 @@ $expr = match ($number % 10) {
188188
$expr = match (true) {
189189
($num * 100) > 500 => 'expression in key',
190190
};
191+
192+
// PHP 8.0 named parameters.
193+
if ($pos === (count(value: $this->tokens) - 1)) {
194+
$file = '...'.substr(string: $file, offset: ($padding * -1 + 3));
195+
}

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ public function getErrorList($testFile='OperatorBracketUnitTest.inc')
7070
176 => 1,
7171
185 => 1,
7272
189 => 1,
73+
193 => 1,
74+
194 => 2,
7375
];
7476
break;
7577
case 'OperatorBracketUnitTest.js':

0 commit comments

Comments
 (0)