From 64b609823901c5381af7bbf51d64fc2d8161ddde Mon Sep 17 00:00:00 2001 From: jrfnl Date: Thu, 10 Feb 2022 14:45:42 +0100 Subject: [PATCH] GetParametersNamedTest: temporarily skip one test case ... which is failing due to an upstream bug. Once the bug fix pulled upstream has been merged, this commit should be reverted. Ref: squizlabs/PHP_CodeSniffer 3546 --- .../GetParametersNamedTest.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Tests/Utils/PassedParameters/GetParametersNamedTest.php b/Tests/Utils/PassedParameters/GetParametersNamedTest.php index 028df4d3..cf5d1d56 100644 --- a/Tests/Utils/PassedParameters/GetParametersNamedTest.php +++ b/Tests/Utils/PassedParameters/GetParametersNamedTest.php @@ -89,11 +89,12 @@ public function dataGetParameters() * 3. The new `match` keyword being recognized on PHP 8, but not before, while * the `match` control structure is not supported in PHPCS yet. */ + $phpcsVersion = Helper::getVersion(); $php8Names = parent::usesPhp8NameTokens(); - $namedParamsInPhpcs = \version_compare(Helper::getVersion(), '3.6.0', '>='); + $namedParamsInPhpcs = \version_compare($phpcsVersion, '3.6.0', '>='); $matchIsKeyword = \version_compare(\PHP_VERSION_ID, '80000', '>='); - return [ + $data = [ 'only-positional-args' => [ '/* testPositionalArgs */', \T_STRING, @@ -639,5 +640,19 @@ public function dataGetParameters() ], ], ]; + + /* + * Temporarily ignore a test failure caused by an upstream bug. + * The bug is only in PHPCS `master` (and 4.x) and is expected to be fixed before 3.7.0 + * will be released. + * Once the fix is in, this commit can and should be removed. + * + * @link https://github.com/squizlabs/PHP_CodeSniffer/pull/3546 + */ + if (\version_compare($phpcsVersion, '3.7.0', '>=') === true) { + unset($data['named-args-in-class-instantiation-with-static']); + } + + return $data; } }