ElyBy-Mirror/php-code-style
1
0
Fork 0
mirror of https://github.com/elyby/php-code-style.git synced 2024-11-26 00:38:44 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fixes #10. Don't count string interpolation as a scope beginning

Browse Source
This commit is contained in:
ErickSkrauch 2023-03-22 18:42:23 +01:00
parent 6f14beec28
commit 2d215dc761
No known key found for this signature in database
GPG Key ID: 669339FCBB30EE0E
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fixer/Whitespace/BlankLineBeforeReturnFixer.php
View File

@ -67,8 +67,12 @@ final class BlankLineBeforeReturnFixer extends AbstractFixer implements Whitespa
break;
}
/** @var Token $backwardToken */
$backwardToken = $tokens[$backwardIndex];
if ($backwardToken->getContent() === '{') {
/** @var Token $nextToken */
$nextToken = $tokens[$backwardIndex + 1];
// Exclude string interpolation: "str {$var}"
if ($backwardToken->getContent() === '{' && !$nextToken->isGivenKind(T_VARIABLE)) {
break;
}

14
tests/Fixer/Whitespace/BlankLineBeforeReturnFixerTest.php
View File

@ -180,6 +180,20 @@ return $c;',
}
',
];
yield [
'<?php
if ($condition) {
$a = "Interpolation {$var}.";
return true;
}',
];
yield [
'<?php
if ($condition) {
$a = "Deprecated interpolation ${var}.";
return true;
}',
];
}
/**