diff --git a/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php b/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php index 32380ab9436..0103956cb15 100644 --- a/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php +++ b/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php @@ -7,6 +7,7 @@ use PhpParser\Node\Param; use PhpParser\Node\Stmt\ClassMethod; use PHPStan\Reflection\MethodReflection; use PHPStan\Reflection\ParameterReflection; +use PHPStan\Reflection\ParametersAcceptor; use PHPStan\Reflection\ParametersAcceptorSelector; use Rector\NodeTypeResolver\Node\AttributeKey; final class SpreadVariablesCollector @@ -14,10 +15,9 @@ final class SpreadVariablesCollector /** * @return array */ - public function resolveFromMethodReflection(MethodReflection $methodReflection) : array + public function resolveFromParametersAcceptor(ParametersAcceptor $parametersAcceptor) : array { $spreadParameterReflections = []; - $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants()); foreach ($parametersAcceptor->getParameters() as $key => $parameterReflection) { if (!$parameterReflection->isVariadic()) { continue; diff --git a/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php b/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php index 4197b622704..dd50e46a77f 100644 --- a/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/UnSpreadOperatorRector.php @@ -9,11 +9,14 @@ use PhpParser\Node\Expr\Array_; use PhpParser\Node\Expr\MethodCall; use PhpParser\Node\Identifier; use PhpParser\Node\Stmt\ClassMethod; +use PHPStan\Analyser\Scope; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\MethodReflection; +use PHPStan\Reflection\ParametersAcceptorSelector; use Rector\CodingStyle\NodeAnalyzer\SpreadVariablesCollector; use Rector\CodingStyle\Reflection\VendorLocationDetector; use Rector\Core\Rector\AbstractRector; +use Rector\Core\Rector\AbstractScopeAwareRector; use Rector\Core\Reflection\ReflectionResolver; use Rector\FamilyTree\NodeAnalyzer\ClassChildAnalyzer; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; @@ -21,7 +24,7 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** * @see \Rector\Tests\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector\UnSpreadOperatorRectorTest */ -final class UnSpreadOperatorRector extends AbstractRector +final class UnSpreadOperatorRector extends AbstractScopeAwareRector { /** * @readonly @@ -90,12 +93,12 @@ CODE_SAMPLE /** * @param ClassMethod|MethodCall $node */ - public function refactor(Node $node) : ?Node + public function refactorWithScope(Node $node, Scope $scope) : ?Node { if ($node instanceof ClassMethod) { return $this->refactorClassMethod($node); } - return $this->refactorMethodCall($node); + return $this->refactorMethodCall($node, $scope); } private function refactorClassMethod(ClassMethod $classMethod) : ?ClassMethod { @@ -121,7 +124,7 @@ CODE_SAMPLE } return $classMethod; } - private function refactorMethodCall(MethodCall $methodCall) : ?MethodCall + private function refactorMethodCall(MethodCall $methodCall, Scope $scope) : ?MethodCall { $methodReflection = $this->reflectionResolver->resolveMethodReflectionFromMethodCall($methodCall); if (!$methodReflection instanceof MethodReflection) { @@ -131,7 +134,8 @@ CODE_SAMPLE if ($this->vendorLocationDetector->detectMethodReflection($methodReflection)) { return null; } - $spreadParameterReflections = $this->spreadVariablesCollector->resolveFromMethodReflection($methodReflection); + $parametersAcceptor = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants()); + $spreadParameterReflections = $this->spreadVariablesCollector->resolveFromParametersAcceptor($parametersAcceptor); if ($spreadParameterReflections === []) { return null; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 30f5aed0a0c..a4fdfa5324a 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '6c3f2cdf953587cdf0945c7fb6c05fd0083c25fc'; + public const PACKAGE_VERSION = 'c5196d467d772a84590cc08909d01ae68409dbd4'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-05-22 11:17:13'; + public const RELEASE_DATE = '2023-05-22 17:24:28'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index c20b3f6f858..6d0f4b521c8 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit0496443b94e3d99fc8b2d4c433dfc95e::getLoader(); +return ComposerAutoloaderInita71aabcdfba2761d25aa42fb70769a33::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 6dd536d0a3a..f86cb62b4b3 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit0496443b94e3d99fc8b2d4c433dfc95e +class ComposerAutoloaderInita71aabcdfba2761d25aa42fb70769a33 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit0496443b94e3d99fc8b2d4c433dfc95e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit0496443b94e3d99fc8b2d4c433dfc95e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInita71aabcdfba2761d25aa42fb70769a33', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit0496443b94e3d99fc8b2d4c433dfc95e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInita71aabcdfba2761d25aa42fb70769a33', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInita71aabcdfba2761d25aa42fb70769a33::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInita71aabcdfba2761d25aa42fb70769a33::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index f0c506aa238..6b3e50a6851 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e +class ComposerStaticInita71aabcdfba2761d25aa42fb70769a33 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3114,9 +3114,9 @@ class ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit0496443b94e3d99fc8b2d4c433dfc95e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInita71aabcdfba2761d25aa42fb70769a33::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInita71aabcdfba2761d25aa42fb70769a33::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInita71aabcdfba2761d25aa42fb70769a33::$classMap; }, null, ClassLoader::class); }