min PHP version to typed property rules

rectorphp · Jul 13, 2023 · d321502 · d321502
1 parent 440e2a0
commit d321502
Show file tree

Hide file tree

Showing 28 changed files with 73 additions and 29 deletions.
diff --git a/config/sets/doctrine-code-quality.php b/config/sets/doctrine-code-quality.php
@@ -4,12 +4,12 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Doctrine\CodeQuality\Rector\Class_\InitializeDefaultEntityCollectionRector;
+use Rector\Doctrine\CodeQuality\Rector\Class_\RemoveEmptyTableAttributeRector;
 use Rector\Doctrine\CodeQuality\Rector\ClassMethod\MakeEntitySetterNullabilityInSyncWithPropertyRector;
 use Rector\Doctrine\CodeQuality\Rector\Property\ChangeBigIntEntityPropertyToIntTypeRector;
 use Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector;
 use Rector\Doctrine\CodeQuality\Rector\Property\MakeEntityDateTimePropertyDateTimeInterfaceRector;
 use Rector\Doctrine\Rector\Class_\MoveCurrentDateTimeDefaultInEntityToConstructorRector;
-use Rector\Doctrine\Rector\Class_\RemoveEmptyTableAttributeRector;
 use Rector\Doctrine\Rector\Property\CorrectDefaultTypesOnEntityPropertyRector;
 use Rector\Doctrine\Rector\Property\TypedPropertyFromColumnTypeRector;
 use Rector\Doctrine\Rector\Property\TypedPropertyFromDoctrineCollectionRector;

diff --git a/...lass_/RemoveEmptyTableAttributeRector.php → ...lass_/RemoveEmptyTableAttributeRector.php b/...lass_/RemoveEmptyTableAttributeRector.php → ...lass_/RemoveEmptyTableAttributeRector.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Doctrine\Rector\Class_;
+namespace Rector\Doctrine\CodeQuality\Rector\Class_;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;

diff --git a/src/Rector/Property/TypedPropertyFromColumnTypeRector.php b/src/Rector/Property/TypedPropertyFromColumnTypeRector.php
@@ -14,17 +14,19 @@
 use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersion;
+use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\Doctrine\NodeManipulator\ColumnPropertyTypeResolver;
 use Rector\Doctrine\NodeManipulator\NullabilityColumnPropertyTypeResolver;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator;
+use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
  * @see \Rector\Doctrine\Tests\Rector\Property\TypedPropertyFromColumnTypeRector\TypedPropertyFromColumnTypeRectorTest
  */
-final class TypedPropertyFromColumnTypeRector extends AbstractRector
+final class TypedPropertyFromColumnTypeRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
         private readonly PropertyTypeDecorator $propertyTypeDecorator,
@@ -120,4 +122,9 @@ public function refactor(Node $node): Property|null
         $this->phpDocTypeChanger->changeVarType($node, $phpDocInfo, $propertyType);
         return $node;
     }
+
+    public function provideMinPhpVersion(): int
+    {
+        return PhpVersionFeature::TYPED_PROPERTIES;
+    }
 }
diff --git a/src/Rector/Property/TypedPropertyFromToManyRelationTypeRector.php b/src/Rector/Property/TypedPropertyFromToManyRelationTypeRector.php
@@ -13,16 +13,18 @@
 use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersion;
+use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\Doctrine\NodeManipulator\ToManyRelationPropertyTypeResolver;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator;
+use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
  * @see \Rector\Doctrine\Tests\Rector\Property\TypedPropertyFromToManyRelationTypeRector\TypedPropertyFromToManyRelationTypeRectorTest
  */
-final class TypedPropertyFromToManyRelationTypeRector extends AbstractRector
+final class TypedPropertyFromToManyRelationTypeRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
         private readonly PropertyTypeDecorator $propertyTypeDecorator,
@@ -118,4 +120,9 @@ public function refactor(Node $node): Property|null
 
         return $node;
     }
+
+    public function provideMinPhpVersion(): int
+    {
+        return PhpVersionFeature::TYPED_PROPERTIES;
+    }
 }
diff --git a/src/Rector/Property/TypedPropertyFromToOneRelationTypeRector.php b/src/Rector/Property/TypedPropertyFromToOneRelationTypeRector.php
@@ -16,16 +16,18 @@
 use Rector\Core\Php\PhpVersionProvider;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersion;
+use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\Doctrine\NodeManipulator\ToOneRelationPropertyTypeResolver;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\TypeDeclaration\NodeTypeAnalyzer\PropertyTypeDecorator;
+use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
  * @see \Rector\Doctrine\Tests\Rector\Property\TypedPropertyFromToOneRelationTypeRector\TypedPropertyFromToOneRelationTypeRectorTest
  */
-final class TypedPropertyFromToOneRelationTypeRector extends AbstractRector
+final class TypedPropertyFromToOneRelationTypeRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
         private readonly PropertyTypeDecorator $propertyTypeDecorator,
@@ -101,6 +103,11 @@ public function refactor(Node $node): Property|null
         return $node;
     }
 
+    public function provideMinPhpVersion(): int
+    {
+        return PhpVersionFeature::TYPED_PROPERTIES;
+    }
+
     private function completePropertyTypeOrVarDoc(
         Type $propertyType,
         Name|ComplexType|Identifier $typeNode,

diff --git a/...lassMethod/MakeEntitySetterNullabilityInSyncWithPropertyRector/config/configured_rule.php b/...lassMethod/MakeEntitySetterNullabilityInSyncWithPropertyRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\CodeQuality\Rector\ClassMethod\MakeEntitySetterNullabilityInSyncWithPropertyRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/...Rector/ClassMethod/ServiceEntityRepositoryParentCallToDIRector/config/configured_rule.php b/...Rector/ClassMethod/ServiceEntityRepositoryParentCallToDIRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\ClassMethod\ServiceEntityRepositoryParentCallToDIRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/tests/Rector/Class_/AddEntityIdByConditionRector/config/configured_rule.php b/tests/Rector/Class_/AddEntityIdByConditionRector/config/configured_rule.php
@@ -1,11 +1,12 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\Class_\AddEntityIdByConditionRector;
+
+use Rector\Doctrine\Tests\ConfigList;
 use Rector\Doctrine\Tests\Rector\Class_\AddEntityIdByConditionRector\Source\SomeTrait;
 
 return static function (RectorConfig $rectorConfig): void {

diff --git a/.../Rector/Class_/ClassAnnotationToNamedArgumentConstructorRector/config/configured_rule.php b/.../Rector/Class_/ClassAnnotationToNamedArgumentConstructorRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\Class_\ClassAnnotationToNamedArgumentConstructorRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/config/auto_import.php b/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/config/auto_import.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\CodeQuality\Rector\Class_\InitializeDefaultEntityCollectionRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
     $rectorConfig->importNames();

diff --git a/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/config/configured_rule.php b/tests/Rector/Class_/InitializeDefaultEntityCollectionRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\CodeQuality\Rector\Class_\InitializeDefaultEntityCollectionRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/...r/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector/config/configured_rule.php b/...r/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\Class_\MoveCurrentDateTimeDefaultInEntityToConstructorRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/tests/Rector/Class_/RemoveEmptyTableAttributeRector/config/configured_rule.php b/tests/Rector/Class_/RemoveEmptyTableAttributeRector/config/configured_rule.php
@@ -1,11 +1,12 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
-use Rector\Doctrine\Rector\Class_\RemoveEmptyTableAttributeRector;
+use Rector\Doctrine\CodeQuality\Rector\Class_\RemoveEmptyTableAttributeRector;
+
+use Rector\Doctrine\Tests\ConfigList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);

diff --git a/tests/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector/config/configured_rule.php b/tests/Rector/Class_/RemoveRepositoryFromEntityAnnotationRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\Class_\RemoveRepositoryFromEntityAnnotationRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/.../MethodCall/ChangeCompositeExpressionAddMultipleWithWithRector/config/configured_rule.php b/.../MethodCall/ChangeCompositeExpressionAddMultipleWithWithRector/config/configured_rule.php
@@ -1,10 +1,11 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
+
 use Rector\Doctrine\Rector\MethodCall\ChangeCompositeExpressionAddMultipleWithWithRector;
+use Rector\Doctrine\Tests\ConfigList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);

diff --git a/...tor/MethodCall/ChangeSetParametersArrayToArrayCollectionRector/config/configured_rule.php b/...tor/MethodCall/ChangeSetParametersArrayToArrayCollectionRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\MethodCall\ChangeSetParametersArrayToArrayCollectionRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/tests/Rector/MethodCall/EntityAliasToClassConstantReferenceRector/config/configured_rule.php b/tests/Rector/MethodCall/EntityAliasToClassConstantReferenceRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\MethodCall\EntityAliasToClassConstantReferenceRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/...ctor/Param/ReplaceLifecycleEventArgsByDedicatedEventArgsRector/config/configured_rule.php b/...ctor/Param/ReplaceLifecycleEventArgsByDedicatedEventArgsRector/config/configured_rule.php
@@ -1,10 +1,11 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
+
 use Rector\Doctrine\Rector\Param\ReplaceLifecycleEventArgsByDedicatedEventArgsRector;
+use Rector\Doctrine\Tests\ConfigList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);

diff --git a/tests/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector/config/configured_rule.php b/tests/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\CodeQuality\Rector\Property\ChangeBigIntEntityPropertyToIntTypeRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/tests/Rector/Property/CorrectDefaultTypesOnEntityPropertyRector/config/configured_rule.php b/tests/Rector/Property/CorrectDefaultTypesOnEntityPropertyRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\Rector\Property\CorrectDefaultTypesOnEntityPropertyRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/...ector/Property/DoctrineTargetEntityStringToClassConstantRector/config/configured_rule.php b/...ector/Property/DoctrineTargetEntityStringToClassConstantRector/config/configured_rule.php
@@ -1,10 +1,11 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
+
 use Rector\Doctrine\Rector\Property\DoctrineTargetEntityStringToClassConstantRector;
+use Rector\Doctrine\Tests\ConfigList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);

diff --git a/...Rector/Property/ImproveDoctrineCollectionDocTypeInEntityRector/config/configured_rule.php b/...Rector/Property/ImproveDoctrineCollectionDocTypeInEntityRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/...tor/Property/MakeEntityDateTimePropertyDateTimeInterfaceRector/config/configured_rule.php b/...tor/Property/MakeEntityDateTimePropertyDateTimeInterfaceRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Doctrine\CodeQuality\Rector\Property\MakeEntityDateTimePropertyDateTimeInterfaceRector;
 
+use Rector\Doctrine\Tests\ConfigList;
+
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);
 

diff --git a/tests/Rector/Property/TypedPropertyFromColumnTypeRector/config/configured_rule.php b/tests/Rector/Property/TypedPropertyFromColumnTypeRector/config/configured_rule.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
-use Rector\Doctrine\Tests\ConfigList;
 
 use Rector\Config\RectorConfig;
 
 use Rector\Core\ValueObject\PhpVersionFeature;
+
 use Rector\Doctrine\Rector\Property\TypedPropertyFromColumnTypeRector;
+use Rector\Doctrine\Tests\ConfigList;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(ConfigList::MAIN);