Updated Rector to commit 748a43661ee45dade029bc9d91fa6c8614dcf8c6

748a43661e [PHP 8.0] Add arguments names for attributes (#336)

packages/PhpAttribute/NodeAnalyzer/NamedArgumentsResolver.php

@@ -0,0 +1,42 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\PhpAttribute\NodeAnalyzer;
+
+use PHPStan\Reflection\ParameterReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Reflection\ReflectionProvider;
+final class NamedArgumentsResolver
+{
+    /**
+     * @var \PHPStan\Reflection\ReflectionProvider
+     */
+    private $reflectionProvider;
+    public function __construct(\PHPStan\Reflection\ReflectionProvider $reflectionProvider)
+    {
+        $this->reflectionProvider = $reflectionProvider;
+    }
+    /**
+     * @param class-string $class
+     * @return array<int, string>
+     */
+    public function resolveFromClass(string $class) : array
+    {
+        // decorate args with names if attribute class was found
+        if (!$this->reflectionProvider->hasClass($class)) {
+            return [];
+        }
+        $classReflection = $this->reflectionProvider->getClass($class);
+        if (!$classReflection->hasConstructor()) {
+            return [];
+        }
+        $argumentNames = [];
+        $constructorMethodReflection = $classReflection->getConstructor();
+        $parametersAcceptor = \PHPStan\Reflection\ParametersAcceptorSelector::selectSingle($constructorMethodReflection->getVariants());
+        foreach ($parametersAcceptor->getParameters() as $key => $parameterReflection) {
+            /** @var ParameterReflection $parameterReflection */
+            $argumentNames[$key] = $parameterReflection->getName();
+        }
+        return $argumentNames;
+    }
+}

packages/PhpAttribute/Printer/PhpAttributeGroupFactory.php

@@ -8,23 +8,30 @@ use PhpParser\Node\Arg;
 use PhpParser\Node\Attribute;
 use PhpParser\Node\AttributeGroup;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\String_;
-use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode;
-use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
-use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
-use PHPStan\PhpDocParser\Ast\Node;
-use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\Constant\ConstantFloatType;
 use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
-use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Php80\ValueObject\AnnotationToAttribute;
+use Rector\PhpAttribute\NodeAnalyzer\NamedArgumentsResolver;
+use Rector\PhpAttribute\Value\ValueNormalizer;
 final class PhpAttributeGroupFactory
 {
+    /**
+     * @var \Rector\PhpAttribute\NodeAnalyzer\NamedArgumentsResolver
+     */
+    private $namedArgumentsResolver;
+    /**
+     * @var \Rector\PhpAttribute\Value\ValueNormalizer
+     */
+    private $valueNormalizer;
+    public function __construct(\Rector\PhpAttribute\NodeAnalyzer\NamedArgumentsResolver $namedArgumentsResolver, \Rector\PhpAttribute\Value\ValueNormalizer $valueNormalizer)
+    {
+        $this->namedArgumentsResolver = $namedArgumentsResolver;
+        $this->valueNormalizer = $valueNormalizer;
+    }
     public function createFromSimpleTag(\Rector\Php80\ValueObject\AnnotationToAttribute $annotationToAttribute) : \PhpParser\Node\AttributeGroup
     {
         return $this->createFromClass($annotationToAttribute->getAttributeClass());
@@ -50,6 +57,8 @@ final class PhpAttributeGroupFactory
         $fullyQualified = new \PhpParser\Node\Name\FullyQualified($annotationToAttribute->getAttributeClass());
         $values = $doctrineAnnotationTagValueNode->getValuesWithExplicitSilentAndWithoutQuotes();
         $args = $this->createArgsFromItems($values);
+        $argumentNames = $this->namedArgumentsResolver->resolveFromClass($annotationToAttribute->getAttributeClass());
+        $this->completeNamedArguments($args, $argumentNames);
         $attribute = new \PhpParser\Node\Attribute($fullyQualified, $args);
         return new \PhpParser\Node\AttributeGroup([$attribute]);
     }
@@ -67,13 +76,14 @@ final class PhpAttributeGroupFactory
             unset($items[$silentKey]);
         }
         foreach ($items as $key => $value) {
-            $value = $this->normalizeNodeValue($value);
+            $value = $this->valueNormalizer->normalize($value);
             $value = \PhpParser\BuilderHelpers::normalizeValue($value);
             $this->normalizeStringDoubleQuote($value);
             $name = null;
             if (\is_string($key)) {
                 $name = new \PhpParser\Node\Identifier($key);
             }
+            // resolve argument name
             $args[] = $this->isArrayArguments($items) ? new \PhpParser\Node\Arg($value, \false, \false, [], $name) : new \PhpParser\Node\Arg($value);
         }
         return $args;
@@ -90,44 +100,6 @@ final class PhpAttributeGroupFactory
         }
         return \false;
     }
-    /**
-     * @param mixed $value
-     * @return bool|float|int|string|mixed[]|\PhpParser\Node\Expr
-     */
-    private function normalizeNodeValue($value)
-    {
-        if ($value instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode) {
-            return (int) $value->value;
-        }
-        if ($value instanceof \PHPStan\Type\Constant\ConstantFloatType || $value instanceof \PHPStan\Type\Constant\ConstantBooleanType) {
-            return $value->getValue();
-        }
-        if ($value instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode) {
-            return \true;
-        }
-        if ($value instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode) {
-            return \false;
-        }
-        if ($value instanceof \Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode) {
-            return \array_map(function ($node) {
-                return $this->normalizeNodeValue($node);
-            }, $value->getValuesWithExplicitSilentAndWithoutQuotes());
-        }
-        if (\is_string($value) && \strpos($value, '::') !== \false) {
-            // class const fetch
-            [$class, $constant] = \explode('::', $value);
-            return new \PhpParser\Node\Expr\ClassConstFetch(new \PhpParser\Node\Name($class), $constant);
-        }
-        if ($value instanceof \PHPStan\PhpDocParser\Ast\Node) {
-            return (string) $value;
-        }
-        if (\is_array($value)) {
-            return \array_map(function ($item) {
-                return $this->normalizeNodeValue($item);
-            }, $value);
-        }
-        return $value;
-    }
     private function normalizeStringDoubleQuote(\PhpParser\Node\Expr $expr) : void
     {
         if (!$expr instanceof \PhpParser\Node\Scalar\String_) {
@@ -139,4 +111,21 @@ final class PhpAttributeGroupFactory
         }
         $expr->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::KIND, \PhpParser\Node\Scalar\String_::KIND_DOUBLE_QUOTED);
     }
+    /**
+     * @param Arg[] $args
+     * @param string[] $argumentNames
+     */
+    private function completeNamedArguments(array $args, array $argumentNames) : void
+    {
+        foreach ($args as $key => $arg) {
+            $argumentName = $argumentNames[$key] ?? null;
+            if ($argumentName === null) {
+                continue;
+            }
+            if ($arg->name !== null) {
+                continue;
+            }
+            $arg->name = new \PhpParser\Node\Identifier($argumentName);
+        }
+    }
 }

packages/PhpAttribute/Value/ValueNormalizer.php

@@ -0,0 +1,56 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\PhpAttribute\Value;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Name;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode;
+use PHPStan\PhpDocParser\Ast\Node;
+use PHPStan\Type\Constant\ConstantBooleanType;
+use PHPStan\Type\Constant\ConstantFloatType;
+use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
+final class ValueNormalizer
+{
+    /**
+     * @param mixed $value
+     * @return bool|float|int|string|mixed[]|\PhpParser\Node\Expr
+     */
+    public function normalize($value)
+    {
+        if ($value instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode) {
+            return (int) $value->value;
+        }
+        if ($value instanceof \PHPStan\Type\Constant\ConstantFloatType || $value instanceof \PHPStan\Type\Constant\ConstantBooleanType) {
+            return $value->getValue();
+        }
+        if ($value instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode) {
+            return \true;
+        }
+        if ($value instanceof \PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprFalseNode) {
+            return \false;
+        }
+        if ($value instanceof \Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode) {
+            return \array_map(function ($node) {
+                return $this->normalize($node);
+            }, $value->getValuesWithExplicitSilentAndWithoutQuotes());
+        }
+        if (\is_string($value) && \strpos($value, '::') !== \false) {
+            // class const fetch
+            [$class, $constant] = \explode('::', $value);
+            return new \PhpParser\Node\Expr\ClassConstFetch(new \PhpParser\Node\Name($class), $constant);
+        }
+        if ($value instanceof \PHPStan\PhpDocParser\Ast\Node) {
+            return (string) $value;
+        }
+        if (\is_array($value)) {
+            return \array_map(function ($item) {
+                return $this->normalize($item);
+            }, $value);
+        }
+        return $value;
+    }
+}

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '8cdd122c87f4895216a7b7b365712470c9e00d54';
+    public const PACKAGE_VERSION = '748a43661ee45dade029bc9d91fa6c8614dcf8c6';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2021-06-29 22:29:49';
+    public const RELEASE_DATE = '2021-06-29 23:10:07';
     public static function resolvePackageVersion() : string
     {
         $process = new \RectorPrefix20210629\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a::getLoader();
+return ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62::getLoader();

vendor/composer/autoload_classmap.php

@@ -2756,8 +2756,10 @@ return array(
     'Rector\\Php81\\NodeFactory\\EnumFactory' => $baseDir . '/rules/Php81/NodeFactory/EnumFactory.php',
     'Rector\\Php81\\Rector\\Class_\\MyCLabsClassToEnumRector' => $baseDir . '/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php',
     'Rector\\Php81\\Rector\\MethodCall\\MyCLabsMethodCallToEnumConstRector' => $baseDir . '/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php',
+    'Rector\\PhpAttribute\\NodeAnalyzer\\NamedArgumentsResolver' => $baseDir . '/packages/PhpAttribute/NodeAnalyzer/NamedArgumentsResolver.php',
     'Rector\\PhpAttribute\\Printer\\DoctrineAnnotationFactory' => $baseDir . '/packages/PhpAttribute/Printer/DoctrineAnnotationFactory.php',
     'Rector\\PhpAttribute\\Printer\\PhpAttributeGroupFactory' => $baseDir . '/packages/PhpAttribute/Printer/PhpAttributeGroupFactory.php',
+    'Rector\\PhpAttribute\\Value\\ValueNormalizer' => $baseDir . '/packages/PhpAttribute/Value/ValueNormalizer.php',
     'Rector\\PhpSpecToPHPUnit\\LetManipulator' => $baseDir . '/rules/PhpSpecToPHPUnit/LetManipulator.php',
     'Rector\\PhpSpecToPHPUnit\\MatchersManipulator' => $baseDir . '/rules/PhpSpecToPHPUnit/MatchersManipulator.php',
     'Rector\\PhpSpecToPHPUnit\\Naming\\PhpSpecRenaming' => $baseDir . '/rules/PhpSpecToPHPUnit/Naming/PhpSpecRenaming.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a
+class ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit92ecb1834051815c400b6f828611c19a::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit4b04e010a3044b46b648326160ee2b62::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ class ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit92ecb1834051815c400b6f828611c19a::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit4b04e010a3044b46b648326160ee2b62::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire92ecb1834051815c400b6f828611c19a($fileIdentifier, $file);
+            composerRequire4b04e010a3044b46b648326160ee2b62($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire92ecb1834051815c400b6f828611c19a($fileIdentifier, $file)
+function composerRequire4b04e010a3044b46b648326160ee2b62($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit92ecb1834051815c400b6f828611c19a
+class ComposerStaticInit4b04e010a3044b46b648326160ee2b62
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -3111,8 +3111,10 @@ class ComposerStaticInit92ecb1834051815c400b6f828611c19a
         'Rector\\Php81\\NodeFactory\\EnumFactory' => __DIR__ . '/../..' . '/rules/Php81/NodeFactory/EnumFactory.php',
         'Rector\\Php81\\Rector\\Class_\\MyCLabsClassToEnumRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/Class_/MyCLabsClassToEnumRector.php',
         'Rector\\Php81\\Rector\\MethodCall\\MyCLabsMethodCallToEnumConstRector' => __DIR__ . '/../..' . '/rules/Php81/Rector/MethodCall/MyCLabsMethodCallToEnumConstRector.php',
+        'Rector\\PhpAttribute\\NodeAnalyzer\\NamedArgumentsResolver' => __DIR__ . '/../..' . '/packages/PhpAttribute/NodeAnalyzer/NamedArgumentsResolver.php',
         'Rector\\PhpAttribute\\Printer\\DoctrineAnnotationFactory' => __DIR__ . '/../..' . '/packages/PhpAttribute/Printer/DoctrineAnnotationFactory.php',
         'Rector\\PhpAttribute\\Printer\\PhpAttributeGroupFactory' => __DIR__ . '/../..' . '/packages/PhpAttribute/Printer/PhpAttributeGroupFactory.php',
+        'Rector\\PhpAttribute\\Value\\ValueNormalizer' => __DIR__ . '/../..' . '/packages/PhpAttribute/Value/ValueNormalizer.php',
         'Rector\\PhpSpecToPHPUnit\\LetManipulator' => __DIR__ . '/../..' . '/rules/PhpSpecToPHPUnit/LetManipulator.php',
         'Rector\\PhpSpecToPHPUnit\\MatchersManipulator' => __DIR__ . '/../..' . '/rules/PhpSpecToPHPUnit/MatchersManipulator.php',
         'Rector\\PhpSpecToPHPUnit\\Naming\\PhpSpecRenaming' => __DIR__ . '/../..' . '/rules/PhpSpecToPHPUnit/Naming/PhpSpecRenaming.php',
@@ -3838,9 +3840,9 @@ class ComposerStaticInit92ecb1834051815c400b6f828611c19a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit92ecb1834051815c400b6f828611c19a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit92ecb1834051815c400b6f828611c19a::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit92ecb1834051815c400b6f828611c19a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4b04e010a3044b46b648326160ee2b62::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4b04e010a3044b46b648326160ee2b62::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit4b04e010a3044b46b648326160ee2b62::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/scoper-autoload.php

@@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
 if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
     spl_autoload_call('RectorPrefix20210629\CheckoutEntityFactory');
 }
-if (!class_exists('ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a', false) && !interface_exists('ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a', false) && !trait_exists('ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a', false)) {
-    spl_autoload_call('RectorPrefix20210629\ComposerAutoloaderInit92ecb1834051815c400b6f828611c19a');
+if (!class_exists('ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62', false) && !interface_exists('ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62', false) && !trait_exists('ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62', false)) {
+    spl_autoload_call('RectorPrefix20210629\ComposerAutoloaderInit4b04e010a3044b46b648326160ee2b62');
 }
 if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
     spl_autoload_call('RectorPrefix20210629\Doctrine\Inflector\Inflector');
@@ -3320,9 +3320,9 @@ if (!function_exists('print_node')) {
         return \RectorPrefix20210629\print_node(...func_get_args());
     }
 }
-if (!function_exists('composerRequire92ecb1834051815c400b6f828611c19a')) {
-    function composerRequire92ecb1834051815c400b6f828611c19a() {
-        return \RectorPrefix20210629\composerRequire92ecb1834051815c400b6f828611c19a(...func_get_args());
+if (!function_exists('composerRequire4b04e010a3044b46b648326160ee2b62')) {
+    function composerRequire4b04e010a3044b46b648326160ee2b62() {
+        return \RectorPrefix20210629\composerRequire4b04e010a3044b46b648326160ee2b62(...func_get_args());
     }
 }
 if (!function_exists('parseArgs')) {