Skip to content

PHPCS 4.x | Initial updates to handle T_USE becoming a parentheses owner #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2020
Merged

PHPCS 4.x | Initial updates to handle T_USE becoming a parentheses owner #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7b3c2
PHPCS 4.x | Operators::isReference(): handle closure use as parenthes…
jrfnl Sep 5, 2020
2148118
PHPCS 4.x | BCTokens::parenthesisOpeners(): T_USE is now a parenthesi…
jrfnl Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion PHPCSUtils/Utils/Operators.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ public static function isReference(File $phpcsFile, $stackPtr)
if ($lastOpener !== false) {
$lastOwner = Parentheses::getOwner($phpcsFile, $lastOpener);

if (isset(Collections::functionDeclarationTokensBC()[$tokens[$lastOwner]['code']]) === true) {
if (isset(Collections::functionDeclarationTokensBC()[$tokens[$lastOwner]['code']]) === true
// As of PHPCS 4.x, `T_USE` is a parenthesis owner.
|| $tokens[$lastOwner]['code'] === \T_USE
) {
$params = FunctionDeclarations::getParameters($phpcsFile, $lastOwner);
foreach ($params as $param) {
if ($param['reference_token'] === $stackPtr) {
Expand Down
6 changes: 6 additions & 0 deletions Tests/BackCompat/BCTokens/ParenthesisOpenersTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

use PHP_CodeSniffer\Util\Tokens;
use PHPCSUtils\BackCompat\BCTokens;
use PHPCSUtils\BackCompat\Helper;
use PHPUnit\Framework\TestCase;

/**
Expand All @@ -33,6 +34,7 @@ class ParenthesisOpenersTest extends TestCase
*/
public function testParenthesisOpeners()
{
$version = Helper::getVersion();
$expected = [
\T_ARRAY => \T_ARRAY,
\T_LIST => \T_LIST,
Expand All @@ -49,6 +51,10 @@ public function testParenthesisOpeners()
\T_DECLARE => \T_DECLARE,
];

if (\version_compare($version, '4.0.0', '>=') === true) {
$expected[\T_USE] = \T_USE;
}

\asort($expected);

$result = BCTokens::parenthesisOpeners();
Expand Down