Updated Rector to commit c4dd05e2e3ae6359ff4eb57ce7d7bd7619da139d

rectorphp/rector-src@c4dd05e [CodeQuality] Add StaticToSelfStaticMethodCallOnFinalClassRector (#5621)
rectorphp · Feb 15, 2024 · faf7fee · faf7fee
1 parent 6ef7f81
commit faf7fee
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 26 deletions.
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1679,12 +1679,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
-                "reference": "cc219a306d81cbfa263baa7e2a3e7a9daa663903"
+                "reference": "c44beb36a11bcc763ef4b65654c44d503bd158d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/cc219a306d81cbfa263baa7e2a3e7a9daa663903",
-                "reference": "cc219a306d81cbfa263baa7e2a3e7a9daa663903",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/c44beb36a11bcc763ef4b65654c44d503bd158d4",
+                "reference": "c44beb36a11bcc763ef4b65654c44d503bd158d4",
                 "shasum": ""
             },
             "require": {
@@ -1709,7 +1709,7 @@
                 "tomasvotruba\/unused-public": "^0.3",
                 "tracy\/tracy": "^2.10"
             },
-            "time": "2024-02-15T09:34:20+00:00",
+            "time": "2024-02-15T14:46:39+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
diff --git a/vendor/rector/extension-installer/src/GeneratedConfig.php b/vendor/rector/extension-installer/src/GeneratedConfig.php
@@ -9,7 +9,7 @@
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main cc219a3'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 8d1aab2'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main cdbe390'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 59edb62'));
+    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main c44beb3'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 8d1aab2'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main cdbe390'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 59edb62'));
     private function __construct()
     {
     }

diff --git a/...eQuality/AttributeTransformer/PropertyAttributeTransformer/ColumnAttributeTransformer.php b/...eQuality/AttributeTransformer/PropertyAttributeTransformer/ColumnAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Enum\EntityMappingKey;
@@ -21,7 +22,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $propertyMapping = $entityMapping->matchFieldPropertyMapping($property);
         if ($propertyMapping === null) {

diff --git a/...ttributeTransformer/PropertyAttributeTransformer/EmbeddedPropertyAttributeTransformer.php b/...ttributeTransformer/PropertyAttributeTransformer/EmbeddedPropertyAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Helper\NodeValueNormalizer;
@@ -21,7 +22,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $propertyMapping = $entityMapping->matchEmbeddedPropertyMapping($property);
         if ($propertyMapping === null) {

diff --git a/...ributeTransformer/PropertyAttributeTransformer/GedmoTimestampableAttributeTransformer.php b/...ributeTransformer/PropertyAttributeTransformer/GedmoTimestampableAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\NodeFactory\AttributeFactory;
@@ -20,7 +21,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $fieldPropertyMapping = $entityMapping->matchFieldPropertyMapping($property);
         $timestampableMapping = $fieldPropertyMapping['gedmo']['timestampable'] ?? null;

diff --git a/.../CodeQuality/AttributeTransformer/PropertyAttributeTransformer/IdAttributeTransformer.php b/.../CodeQuality/AttributeTransformer/PropertyAttributeTransformer/IdAttributeTransformer.php
@@ -3,14 +3,18 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\NodeFactory\AttributeFactory;
 use Rector\Doctrine\CodeQuality\ValueObject\EntityMapping;
 use Rector\Doctrine\Enum\MappingClass;
 final class IdAttributeTransformer implements PropertyAttributeTransformerInterface
 {
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $idMapping = $entityMapping->matchIdPropertyMapping($property);
         if (!\is_array($idMapping)) {

diff --git a/...uality/AttributeTransformer/PropertyAttributeTransformer/IdColumnAttributeTransformer.php b/...uality/AttributeTransformer/PropertyAttributeTransformer/IdColumnAttributeTransformer.php
@@ -3,14 +3,18 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\NodeFactory\AttributeFactory;
 use Rector\Doctrine\CodeQuality\ValueObject\EntityMapping;
 use Rector\Doctrine\Enum\MappingClass;
 final class IdColumnAttributeTransformer implements PropertyAttributeTransformerInterface
 {
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $idMapping = $entityMapping->matchIdPropertyMapping($property);
         if (!\is_array($idMapping)) {

diff --git a/...ity/AttributeTransformer/PropertyAttributeTransformer/IdGeneratorAttributeTransformer.php b/...ity/AttributeTransformer/PropertyAttributeTransformer/IdGeneratorAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Enum\EntityMappingKey;
@@ -27,7 +28,10 @@ public function __construct(NodeFactory $nodeFactory)
         //        private ArrayItemNodeFactory $arrayItemNodeFactory
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $idMapping = $entityMapping->matchIdPropertyMapping($property);
         if (!\is_array($idMapping)) {

diff --git a/...lity/AttributeTransformer/PropertyAttributeTransformer/JoinColumnAttributeTransformer.php b/...lity/AttributeTransformer/PropertyAttributeTransformer/JoinColumnAttributeTransformer.php
@@ -4,6 +4,7 @@
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
 use PhpParser\Node\AttributeGroup;
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\NodeFactory\AttributeFactory;
@@ -21,7 +22,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $manyToOnePropertyMapping = $entityMapping->matchManyToOnePropertyMapping($property);
         if (!\is_array($manyToOnePropertyMapping)) {

diff --git a/...ality/AttributeTransformer/PropertyAttributeTransformer/ManyToOneAttributeTransformer.php b/...ality/AttributeTransformer/PropertyAttributeTransformer/ManyToOneAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Enum\EntityMappingKey;
@@ -22,7 +23,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $manyToOneMapping = $entityMapping->matchManyToOnePropertyMapping($property);
         if (!\is_array($manyToOneMapping)) {

diff --git a/...ality/AttributeTransformer/PropertyAttributeTransformer/OneToManyAttributeTransformer.php b/...ality/AttributeTransformer/PropertyAttributeTransformer/OneToManyAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Enum\EntityMappingKey;
@@ -22,7 +23,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $oneToManyMapping = $entityMapping->matchOneToManyPropertyMapping($property);
         if (!\is_array($oneToManyMapping)) {

diff --git a/...Quality/AttributeTransformer/PropertyAttributeTransformer/OrderByAttributeTransformer.php b/...Quality/AttributeTransformer/PropertyAttributeTransformer/OrderByAttributeTransformer.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer\PropertyAttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Enum\EntityMappingKey;
@@ -21,7 +22,10 @@ public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
-    public function transform(EntityMapping $entityMapping, Property $property) : void
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void
     {
         $oneToManyMapping = $entityMapping->matchOneToManyPropertyMapping($property);
         if (!\is_array($oneToManyMapping)) {

diff --git a/...tor/rector-doctrine/rules/CodeQuality/AttributeTransformer/YamlToAttributeTransformer.php b/...tor/rector-doctrine/rules/CodeQuality/AttributeTransformer/YamlToAttributeTransformer.php
@@ -3,11 +3,14 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\AttributeTransformer;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\Contract\ClassAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\Contract\PropertyAttributeTransformerInterface;
 use Rector\Doctrine\CodeQuality\ValueObject\EntityMapping;
+use Rector\ValueObject\MethodName;
 final class YamlToAttributeTransformer
 {
     /**
@@ -53,9 +56,26 @@ private function transformProperties(Class_ $class, EntityMapping $entityMapping
                 $propertyAttributeTransformer->transform($entityMapping, $property);
             }
         }
+        // handle promoted properties
+        $constructorClassMethod = $class->getMethod(MethodName::CONSTRUCT);
+        if (!$constructorClassMethod instanceof ClassMethod) {
+            return;
+        }
+        foreach ($constructorClassMethod->getParams() as $param) {
+            // is promoted property?
+            if ($param->flags === 0) {
+                continue;
+            }
+            foreach ($this->propertyAttributeTransformers as $propertyAttributeTransformer) {
+                if ($this->hasAttribute($param, $propertyAttributeTransformer->getClassName())) {
+                    continue;
+                }
+                $propertyAttributeTransformer->transform($entityMapping, $param);
+            }
+        }
     }
     /**
-     * @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Property $stmt
+     * @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $stmt
      */
     private function hasAttribute($stmt, string $attributeClassName) : bool
     {

diff --git a/...ctor/rector-doctrine/rules/CodeQuality/Contract/PropertyAttributeTransformerInterface.php b/...ctor/rector-doctrine/rules/CodeQuality/Contract/PropertyAttributeTransformerInterface.php
@@ -3,10 +3,17 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\Contract;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
 use Rector\Doctrine\CodeQuality\ValueObject\EntityMapping;
 interface PropertyAttributeTransformerInterface
 {
+    /**
+     * @return MappingClass::*
+     */
     public function getClassName() : string;
-    public function transform(EntityMapping $entityMapping, Property $property) : void;
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    public function transform(EntityMapping $entityMapping, $property) : void;
 }
diff --git a/vendor/rector/rector-doctrine/rules/CodeQuality/ValueObject/EntityMapping.php b/vendor/rector/rector-doctrine/rules/CodeQuality/ValueObject/EntityMapping.php
@@ -3,7 +3,10 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\CodeQuality\ValueObject;
 
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Property;
+use Rector\Exception\ShouldNotHappenException;
 use RectorPrefix202402\Webmozart\Assert\Assert;
 final class EntityMapping
 {
@@ -31,32 +34,36 @@ public function getClassName() : string
     }
     /**
      * @return mixed[]|null
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
      */
-    public function matchFieldPropertyMapping(Property $property) : ?array
+    public function matchFieldPropertyMapping($property) : ?array
     {
         $propertyName = $this->getPropertyName($property);
         return $this->entityMapping['fields'][$propertyName] ?? null;
     }
     /**
      * @return mixed[]|null
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
      */
-    public function matchEmbeddedPropertyMapping(Property $property) : ?array
+    public function matchEmbeddedPropertyMapping($property) : ?array
     {
         $propertyName = $this->getPropertyName($property);
         return $this->entityMapping['embedded'][$propertyName] ?? null;
     }
     /**
      * @return array<string, mixed>|null
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
      */
-    public function matchManyToOnePropertyMapping(Property $property) : ?array
+    public function matchManyToOnePropertyMapping($property) : ?array
     {
         $propertyName = $this->getPropertyName($property);
         return $this->entityMapping['manyToOne'][$propertyName] ?? null;
     }
     /**
      * @return array<string, mixed>|null
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
      */
-    public function matchOneToManyPropertyMapping(Property $property) : ?array
+    public function matchOneToManyPropertyMapping($property) : ?array
     {
         $propertyName = $this->getPropertyName($property);
         return $this->entityMapping['oneToMany'][$propertyName] ?? null;
@@ -73,14 +80,26 @@ public function getClassMapping() : array
     }
     /**
      * @return array<string, mixed>|null
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
      */
-    public function matchIdPropertyMapping(Property $property) : ?array
+    public function matchIdPropertyMapping($property) : ?array
     {
         $propertyName = $this->getPropertyName($property);
         return $this->entityMapping['id'][$propertyName] ?? null;
     }
-    private function getPropertyName(Property $property) : string
+    /**
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
+     */
+    private function getPropertyName($property) : string
     {
-        return $property->props[0]->name->toString();
+        if ($property instanceof Property) {
+            return $property->props[0]->name->toString();
+        }
+        if ($property->var instanceof Variable) {
+            $paramName = $property->var->name;
+            Assert::string($paramName);
+            return $paramName;
+        }
+        throw new ShouldNotHappenException();
     }
 }
diff --git a/vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php b/vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php
@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Doctrine\NodeManipulator;
 
+use PhpParser\Node\Param;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\Type;
@@ -88,8 +89,9 @@ private function processToManyRelation(Property $property, DoctrineAnnotationTag
     }
     /**
      * @param \PhpParser\Node\Expr|string $targetEntity
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Param $property
      */
-    private function resolveTypeFromTargetEntity($targetEntity, Property $property) : Type
+    private function resolveTypeFromTargetEntity($targetEntity, $property) : Type
     {
         if ($targetEntity instanceof Expr) {
             $targetEntity = $this->valueResolver->getValue($targetEntity);