[rector] Rector fixes

actions-user · actions-user · commit 657b8671d6e9 · 2026-01-16T13:55:17.000Z
diff --git a/rules/CodeQuality/AttributeTransformer/ClassAttributeTransformer/EntityClassAttributeTransformer.php b/rules/CodeQuality/AttributeTransformer/ClassAttributeTransformer/EntityClassAttributeTransformer.php
@@ -14,10 +14,7 @@
 
 final class EntityClassAttributeTransformer implements ClassAttributeTransformerInterface
 {
-    /**
-     * @var string
-     */
-    private const REPOSITORY_CLASS_KEY = 'repositoryClass';
+    private const string REPOSITORY_CLASS_KEY = 'repositoryClass';
 
     public function transform(EntityMapping $entityMapping, Class_ $class): bool
     {
diff --git a/rules/CodeQuality/AttributeTransformer/ClassAttributeTransformer/TableClassAttributeTransformer.php b/rules/CodeQuality/AttributeTransformer/ClassAttributeTransformer/TableClassAttributeTransformer.php
@@ -14,10 +14,7 @@
 
 final readonly class TableClassAttributeTransformer implements ClassAttributeTransformerInterface
 {
-    /**
-     * @var string
-     */
-    private const TABLE_KEY = 'table';
+    private const string TABLE_KEY = 'table';
 
     public function __construct(
         private NodeFactory $nodeFactory
diff --git a/rules/CodeQuality/AttributeTransformer/PropertyAttributeTransformer/IdGeneratorAttributeTransformer.php b/rules/CodeQuality/AttributeTransformer/PropertyAttributeTransformer/IdGeneratorAttributeTransformer.php
@@ -19,7 +19,7 @@
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/3.0/reference/basic-mapping.html#identifier-generation-strategies
      * @var string[]
      */
-    private const AVAILABLE_STRATEGIES = ['auto', 'sequence', 'identity', 'none', 'custom'];
+    private const array AVAILABLE_STRATEGIES = ['auto', 'sequence', 'identity', 'none', 'custom'];
 
     public function __construct(
         //        private ArrayItemNodeFactory $arrayItemNodeFactory
diff --git a/rules/CodeQuality/Enum/CollectionMapping.php b/rules/CodeQuality/Enum/CollectionMapping.php
@@ -12,7 +12,7 @@ final class CollectionMapping
     /**
      * @var string[]
      */
-    public const TO_MANY_CLASSES = [
+    public const array TO_MANY_CLASSES = [
         MappingClass::ONE_TO_MANY,
         MappingClass::MANY_TO_MANY,
         OdmMappingClass::REFERENCE_MANY,
@@ -22,7 +22,7 @@ final class CollectionMapping
     /**
      * @var string[]
      */
-    public const TO_ONE_CLASSES = [
+    public const array TO_ONE_CLASSES = [
         MappingClass::MANY_TO_ONE,
         MappingClass::ONE_TO_ONE,
         OdmMappingClass::REFERENCE_ONE,
diff --git a/rules/CodeQuality/Enum/DoctrineClass.php b/rules/CodeQuality/Enum/DoctrineClass.php
@@ -13,5 +13,5 @@
     /**
      * @deprecated BC only
      */
-    public const COLLECTION = \Rector\Doctrine\Enum\DoctrineClass::COLLECTION;
+    public const string COLLECTION = \Rector\Doctrine\Enum\DoctrineClass::COLLECTION;
 }
diff --git a/rules/CodeQuality/Enum/DocumentMappingKey.php b/rules/CodeQuality/Enum/DocumentMappingKey.php
@@ -9,8 +9,5 @@
  */
 final class DocumentMappingKey
 {
-    /**
-     * @var string
-     */
-    public const TARGET_DOCUMENT = 'targetDocument';
+    public const string TARGET_DOCUMENT = 'targetDocument';
 }
diff --git a/rules/CodeQuality/Enum/EntityMappingKey.php b/rules/CodeQuality/Enum/EntityMappingKey.php
@@ -9,43 +9,19 @@
  */
 final class EntityMappingKey
 {
-    /**
-     * @var string
-     */
-    public const NULLABLE = 'nullable';
-
-    /**
-     * @var string
-     */
-    public const COLUMN_PREFIX = 'columnPrefix';
-
-    /**
-     * @var string
-     */
-    public const COLUMN = 'column';
-
-    /**
-     * @var string
-     */
-    public const STRATEGY = 'strategy';
-
-    /**
-     * @var string
-     */
-    public const GENERATOR = 'generator';
-
-    /**
-     * @var string
-     */
-    public const ORDER_BY = 'orderBy';
-
-    /**
-     * @var string
-     */
-    public const NAME = 'name';
-
-    /**
-     * @var string
-     */
-    public const TARGET_ENTITY = 'targetEntity';
+    public const string NULLABLE = 'nullable';
+
+    public const string COLUMN_PREFIX = 'columnPrefix';
+
+    public const string COLUMN = 'column';
+
+    public const string STRATEGY = 'strategy';
+
+    public const string GENERATOR = 'generator';
+
+    public const string ORDER_BY = 'orderBy';
+
+    public const string NAME = 'name';
+
+    public const string TARGET_ENTITY = 'targetEntity';
 }
diff --git a/rules/CodeQuality/Rector/Class_/GetRepositoryServiceLocatorToRepositoryServiceInjectionRector.php b/rules/CodeQuality/Rector/Class_/GetRepositoryServiceLocatorToRepositoryServiceInjectionRector.php
@@ -32,10 +32,7 @@
  */
 final class GetRepositoryServiceLocatorToRepositoryServiceInjectionRector extends AbstractRector
 {
-    /**
-     * @var string
-     */
-    private const GET_REPOSITORY_METHOD = 'getRepository';
+    private const string GET_REPOSITORY_METHOD = 'getRepository';
 
     public function __construct(
         private readonly ValueResolver $valueResolver,
diff --git a/rules/CodeQuality/Rector/Property/TypedPropertyFromToOneRelationTypeRector.php b/rules/CodeQuality/Rector/Property/TypedPropertyFromToOneRelationTypeRector.php
@@ -33,7 +33,7 @@
  */
 final class TypedPropertyFromToOneRelationTypeRector extends AbstractRector implements MinPhpVersionInterface, ConfigurableRectorInterface
 {
-    public const FORCE_NULLABLE = 'force_nullable';
+    public const string FORCE_NULLABLE = 'force_nullable';
 
     private bool $forceNullable = true;
 
diff --git a/rules/Dbal36/Rector/MethodCall/MigrateQueryBuilderResetQueryPartRector.php b/rules/Dbal36/Rector/MethodCall/MigrateQueryBuilderResetQueryPartRector.php
@@ -24,7 +24,7 @@ final class MigrateQueryBuilderResetQueryPartRector extends AbstractRector
     /**
      * @var array<string, string>
      */
-    private const PART_TO_METHOD_MAP = [
+    private const array PART_TO_METHOD_MAP = [
         'where' => 'resetWhere',
         'groupBy' => 'resetGroupBy',
         'having' => 'resetHaving',
diff --git a/rules/Orm214/Rector/Param/ReplaceLifecycleEventArgsByDedicatedEventArgsRector.php b/rules/Orm214/Rector/Param/ReplaceLifecycleEventArgsByDedicatedEventArgsRector.php
@@ -23,7 +23,7 @@ final class ReplaceLifecycleEventArgsByDedicatedEventArgsRector extends Abstract
     /**
      * @var array<string, EventClass::*>
      */
-    private const EVENT_CLASSES = [
+    private const array EVENT_CLASSES = [
         'prePersist' => EventClass::PRE_PERSIST_EVENT_ARGS,
         'preUpdate' => EventClass::PRE_UPDATE_EVENT_ARGS,
         'preRemove' => EventClass::PRE_REMOVE_EVENT_ARGS,
diff --git a/src/Enum/DoctrineClass.php b/src/Enum/DoctrineClass.php
@@ -6,49 +6,49 @@
 
 final class DoctrineClass
 {
-    public const ABSTRACT_FIXTURE = 'Doctrine\Common\DataFixtures\AbstractFixture';
+    public const string ABSTRACT_FIXTURE = 'Doctrine\Common\DataFixtures\AbstractFixture';
 
-    public const AS_DOCTRINE_LISTENER_ATTRIBUTE = 'Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener';
+    public const string AS_DOCTRINE_LISTENER_ATTRIBUTE = 'Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener';
 
-    public const EVENT_SUBSCRIBER = 'Doctrine\Common\EventSubscriber';
+    public const string EVENT_SUBSCRIBER = 'Doctrine\Common\EventSubscriber';
 
-    public const EVENT_SUBSCRIBER_INTERFACE = 'Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface';
+    public const string EVENT_SUBSCRIBER_INTERFACE = 'Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface';
 
-    public const COLLECTION = 'Doctrine\Common\Collections\Collection';
+    public const string COLLECTION = 'Doctrine\Common\Collections\Collection';
 
-    public const ARRAY_COLLECTION = 'Doctrine\Common\Collections\ArrayCollection';
+    public const string ARRAY_COLLECTION = 'Doctrine\Common\Collections\ArrayCollection';
 
-    public const SERVICE_DOCUMENT_REPOSITORY = 'Doctrine\Bundle\MongoDBBundle\Repository\ServiceDocumentRepository';
+    public const string SERVICE_DOCUMENT_REPOSITORY = 'Doctrine\Bundle\MongoDBBundle\Repository\ServiceDocumentRepository';
 
-    public const SERVICE_ENTITY_REPOSITORY = 'Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository';
+    public const string SERVICE_ENTITY_REPOSITORY = 'Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository';
 
-    public const ENTITY_REPOSITORY = 'Doctrine\ORM\EntityRepository';
+    public const string ENTITY_REPOSITORY = 'Doctrine\ORM\EntityRepository';
 
-    public const OBJECT_REPOSITORY = 'Doctrine\Persistence\ObjectRepository';
+    public const string OBJECT_REPOSITORY = 'Doctrine\Persistence\ObjectRepository';
 
-    public const ARRAY_RESULT = 'Doctrine\DBAL\Cache\ArrayResult';
+    public const string ARRAY_RESULT = 'Doctrine\DBAL\Cache\ArrayResult';
 
-    public const CONNECTION = 'Doctrine\DBAL\Connection';
+    public const string CONNECTION = 'Doctrine\DBAL\Connection';
 
-    public const RESULT_STATEMENT = 'Doctrine\DBAL\Driver\ResultStatement';
+    public const string RESULT_STATEMENT = 'Doctrine\DBAL\Driver\ResultStatement';
 
-    public const DBAL_QUERY_BUILDER = 'Doctrine\DBAL\Query\QueryBuilder';
+    public const string DBAL_QUERY_BUILDER = 'Doctrine\DBAL\Query\QueryBuilder';
 
-    public const QUERY_EXPR = 'Doctrine\ORM\Query\Expr';
+    public const string QUERY_EXPR = 'Doctrine\ORM\Query\Expr';
 
-    public const QUERY_PARAMETER = 'Doctrine\ORM\Query\Parameter';
+    public const string QUERY_PARAMETER = 'Doctrine\ORM\Query\Parameter';
 
-    public const DBAL_STATEMENT = 'Doctrine\DBAL\Statement';
+    public const string DBAL_STATEMENT = 'Doctrine\DBAL\Statement';
 
-    public const COMPOSITE_EXPRESSION = 'Doctrine\DBAL\Query\Expression\CompositeExpression';
+    public const string COMPOSITE_EXPRESSION = 'Doctrine\DBAL\Query\Expression\CompositeExpression';
 
-    public const ABSTRACT_QUERY = 'Doctrine\ORM\AbstractQuery';
+    public const string ABSTRACT_QUERY = 'Doctrine\ORM\AbstractQuery';
 
-    public const LIFECYCLE_EVENT_ARGS = 'Doctrine\ORM\Event\LifecycleEventArgs';
+    public const string LIFECYCLE_EVENT_ARGS = 'Doctrine\ORM\Event\LifecycleEventArgs';
 
-    public const COLLECTIONS_CRITERIA = 'Doctrine\Common\Collections\Criteria';
+    public const string COLLECTIONS_CRITERIA = 'Doctrine\Common\Collections\Criteria';
 
-    public const QUERY_BUILDER = 'Doctrine\ORM\QueryBuilder';
+    public const string QUERY_BUILDER = 'Doctrine\ORM\QueryBuilder';
 
-    public const ORDER = 'Doctrine\Common\Collections\Order';
+    public const string ORDER = 'Doctrine\Common\Collections\Order';
 }
diff --git a/src/Enum/EventClass.php b/src/Enum/EventClass.php
@@ -6,24 +6,24 @@
 
 final class EventClass
 {
-    public const PRE_PERSIST_EVENT_ARGS = 'Doctrine\ORM\Event\PrePersistEventArgs';
+    public const string PRE_PERSIST_EVENT_ARGS = 'Doctrine\ORM\Event\PrePersistEventArgs';
 
-    public const PRE_UPDATE_EVENT_ARGS = 'Doctrine\ORM\Event\PreUpdateEventArgs';
+    public const string PRE_UPDATE_EVENT_ARGS = 'Doctrine\ORM\Event\PreUpdateEventArgs';
 
-    public const PRE_REMOVE_EVENT_ARGS = 'Doctrine\ORM\Event\PreRemoveEventArgs';
+    public const string PRE_REMOVE_EVENT_ARGS = 'Doctrine\ORM\Event\PreRemoveEventArgs';
 
-    public const POST_PERSIST_EVENT_ARGS = 'Doctrine\ORM\Event\PostPersistEventArgs';
+    public const string POST_PERSIST_EVENT_ARGS = 'Doctrine\ORM\Event\PostPersistEventArgs';
 
-    public const POST_UPDATE_EVENT_ARGS = 'Doctrine\ORM\Event\PostUpdateEventArgs';
+    public const string POST_UPDATE_EVENT_ARGS = 'Doctrine\ORM\Event\PostUpdateEventArgs';
 
-    public const POST_REMOVE_EVENT_ARGS = 'Doctrine\ORM\Event\PostRemoveEventArgs';
+    public const string POST_REMOVE_EVENT_ARGS = 'Doctrine\ORM\Event\PostRemoveEventArgs';
 
-    public const POST_LOAD_EVENT_ARGS = 'Doctrine\ORM\Event\PostLoadEventArgs';
+    public const string POST_LOAD_EVENT_ARGS = 'Doctrine\ORM\Event\PostLoadEventArgs';
 
     /**
      * @var array<class-string>
      */
-    public const ALL = [
+    public const array ALL = [
         self::PRE_PERSIST_EVENT_ARGS,
         self::PRE_UPDATE_EVENT_ARGS,
         self::PRE_REMOVE_EVENT_ARGS,
diff --git a/src/Enum/MappingClass.php b/src/Enum/MappingClass.php
@@ -6,47 +6,47 @@
 
 final class MappingClass
 {
-    public const COLUMN = 'Doctrine\ORM\Mapping\Column';
+    public const string COLUMN = 'Doctrine\ORM\Mapping\Column';
 
-    public const TABLE = 'Doctrine\ORM\Mapping\Table';
+    public const string TABLE = 'Doctrine\ORM\Mapping\Table';
 
-    public const ENTITY = 'Doctrine\ORM\Mapping\Entity';
+    public const string ENTITY = 'Doctrine\ORM\Mapping\Entity';
 
-    public const EMBEDDABLE = 'Doctrine\ORM\Mapping\Embeddable';
+    public const string EMBEDDABLE = 'Doctrine\ORM\Mapping\Embeddable';
 
-    public const DISCRIMINATOR_MAP = 'Doctrine\ORM\Mapping\DiscriminatorMap';
+    public const string DISCRIMINATOR_MAP = 'Doctrine\ORM\Mapping\DiscriminatorMap';
 
-    public const INHERITANCE_TYPE = 'Doctrine\ORM\Mapping\InheritanceType';
+    public const string INHERITANCE_TYPE = 'Doctrine\ORM\Mapping\InheritanceType';
 
-    public const DISCRIMINATOR_COLUMN = 'Doctrine\ORM\Mapping\DiscriminatorColumn';
+    public const string DISCRIMINATOR_COLUMN = 'Doctrine\ORM\Mapping\DiscriminatorColumn';
 
-    public const EMBEDDED = 'Doctrine\ORM\Mapping\Embedded';
+    public const string EMBEDDED = 'Doctrine\ORM\Mapping\Embedded';
 
-    public const GEDMO_SOFT_DELETEABLE = 'Gedmo\Mapping\Annotation\SoftDeleteable';
+    public const string GEDMO_SOFT_DELETEABLE = 'Gedmo\Mapping\Annotation\SoftDeleteable';
 
-    public const GEDMO_TIMESTAMPABLE = 'Gedmo\Mapping\Annotation\Timestampable';
+    public const string GEDMO_TIMESTAMPABLE = 'Gedmo\Mapping\Annotation\Timestampable';
 
-    public const ID = 'Doctrine\ORM\Mapping\Id';
+    public const string ID = 'Doctrine\ORM\Mapping\Id';
 
-    public const GENERATED_VALUE = 'Doctrine\ORM\Mapping\GeneratedValue';
+    public const string GENERATED_VALUE = 'Doctrine\ORM\Mapping\GeneratedValue';
 
-    public const INDEX = 'Doctrine\ORM\Mapping\Index';
+    public const string INDEX = 'Doctrine\ORM\Mapping\Index';
 
-    public const INVERSE_JOIN_COLUMN = 'Doctrine\ORM\Mapping\InverseJoinColumn';
+    public const string INVERSE_JOIN_COLUMN = 'Doctrine\ORM\Mapping\InverseJoinColumn';
 
-    public const JOIN_TABLE = 'Doctrine\ORM\Mapping\JoinTable';
+    public const string JOIN_TABLE = 'Doctrine\ORM\Mapping\JoinTable';
 
-    public const MANY_TO_MANY = 'Doctrine\ORM\Mapping\ManyToMany';
+    public const string MANY_TO_MANY = 'Doctrine\ORM\Mapping\ManyToMany';
 
-    public const MANY_TO_ONE = 'Doctrine\ORM\Mapping\ManyToOne';
+    public const string MANY_TO_ONE = 'Doctrine\ORM\Mapping\ManyToOne';
 
-    public const JOIN_COLUMN = 'Doctrine\ORM\Mapping\JoinColumn';
+    public const string JOIN_COLUMN = 'Doctrine\ORM\Mapping\JoinColumn';
 
-    public const ORDER_BY = 'Doctrine\ORM\Mapping\OrderBy';
+    public const string ORDER_BY = 'Doctrine\ORM\Mapping\OrderBy';
 
-    public const ONE_TO_MANY = 'Doctrine\ORM\Mapping\OneToMany';
+    public const string ONE_TO_MANY = 'Doctrine\ORM\Mapping\OneToMany';
 
-    public const ONE_TO_ONE = 'Doctrine\ORM\Mapping\OneToOne';
+    public const string ONE_TO_ONE = 'Doctrine\ORM\Mapping\OneToOne';
 
-    public const UNIQUE_CONSTRAINT = 'Doctrine\ORM\Mapping\UniqueConstraint';
+    public const string UNIQUE_CONSTRAINT = 'Doctrine\ORM\Mapping\UniqueConstraint';
 }
diff --git a/src/Enum/OdmMappingClass.php b/src/Enum/OdmMappingClass.php
@@ -6,28 +6,13 @@
 
 final class OdmMappingClass
 {
-    /**
-     * @var string
-     */
-    public const DOCUMENT = 'Doctrine\ODM\MongoDB\Mapping\Annotations\Document';
+    public const string DOCUMENT = 'Doctrine\ODM\MongoDB\Mapping\Annotations\Document';
 
-    /**
-     * @var string
-     */
-    public const REFERENCE_MANY = 'Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany';
+    public const string REFERENCE_MANY = 'Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany';
 
-    /**
-     * @var string
-     */
-    public const REFERENCE_ONE = 'Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne';
+    public const string REFERENCE_ONE = 'Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne';
 
-    /**
-     * @var string
-     */
-    public const EMBED_MANY = 'Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany';
+    public const string EMBED_MANY = 'Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany';
 
-    /**
-     * @var string
-     */
-    public const EMBED_ONE = 'Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne';
+    public const string EMBED_ONE = 'Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne';
 }
diff --git a/src/Enum/TestClass.php b/src/Enum/TestClass.php
@@ -6,8 +6,5 @@
 
 final class TestClass
 {
-    /**
-     * @var string
-     */
-    public const BEHAT_CONTEXT = 'Behat\Behat\Context\Context';
+    public const string BEHAT_CONTEXT = 'Behat\Behat\Context\Context';
 }
diff --git a/src/NodeAnalyzer/RepositoryClassResolver.php b/src/NodeAnalyzer/RepositoryClassResolver.php
diff --git a/src/NodeManipulator/ColumnPropertyTypeResolver.php b/src/NodeManipulator/ColumnPropertyTypeResolver.php
diff --git a/src/PhpDoc/ShortClassExpander.php b/src/PhpDoc/ShortClassExpander.php
diff --git a/src/Set/DoctrineSetList.php b/src/Set/DoctrineSetList.php
diff --git a/src/TypeAnalyzer/CollectionTypeResolver.php b/src/TypeAnalyzer/CollectionTypeResolver.php

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,7 @@`
`14`	`14`
`15`	`15`	`final class EntityClassAttributeTransformer implements ClassAttributeTransformerInterface`
`16`	`16`	`{`
`17`		`- /**`
`18`		`- * @var string`
`19`		`- */`
`20`		`- private const REPOSITORY_CLASS_KEY = 'repositoryClass';`
	`17`	`+ private const string REPOSITORY_CLASS_KEY = 'repositoryClass';`
`21`	`18`
`22`	`19`	`public function transform(EntityMapping $entityMapping, Class_ $class): bool`
`23`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`/**`
`14`	`14`	`* @deprecated BC only`
`15`	`15`	`*/`
`16`		`- public const COLLECTION = \Rector\Doctrine\Enum\DoctrineClass::COLLECTION;`
	`16`	`+ public const string COLLECTION = \Rector\Doctrine\Enum\DoctrineClass::COLLECTION;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,5 @@`
`9`	`9`	`*/`
`10`	`10`	`final class DocumentMappingKey`
`11`	`11`	`{`
`12`		`- /**`
`13`		`- * @var string`
`14`		`- */`
`15`		`- public const TARGET_DOCUMENT = 'targetDocument';`
	`12`	`+ public const string TARGET_DOCUMENT = 'targetDocument';`
`16`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`*/`
`34`	`34`	`final class TypedPropertyFromToOneRelationTypeRector extends AbstractRector implements MinPhpVersionInterface, ConfigurableRectorInterface`
`35`	`35`	`{`
`36`		`- public const FORCE_NULLABLE = 'force_nullable';`
	`36`	`+ public const string FORCE_NULLABLE = 'force_nullable';`
`37`	`37`
`38`	`38`	`private bool $forceNullable = true;`
`39`	`39`