bump static rules

Author: TomasVotruba

composer.json

@@ -5,24 +5,25 @@
     "description": "Rector upgrades rules for Doctrine",
     "require": {
         "php": ">=8.2",
-        "symfony/yaml": "^7.2"
+        "symfony/yaml": "^7.4|8.0.*"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.14",
-        "doctrine/orm": "^2.20",
-        "phpecs/phpecs": "^2.1",
+        "doctrine/doctrine-bundle": "^2.18|^3.0",
+        "doctrine/orm": "^2.20|^3.0",
+        "phpecs/phpecs": "^2.2",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.1.14",
         "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpstan/phpstan-webmozart-assert": "^2.0",
-        "phpunit/phpunit": "^11.5",
+        "phpunit/phpunit": "^11.5|^12.0",
+        "rector/jack": "^0.4.0",
         "rector/rector-src": "dev-main",
         "rector/type-perfect": "^2.1",
         "symplify/phpstan-extensions": "^12.0",
-        "symplify/phpstan-rules": "^14.6.9",
-        "symplify/vendor-patches": "^11.3",
-        "tomasvotruba/class-leak": "^2.0",
-        "tracy/tracy": "^2.10"
+        "symplify/phpstan-rules": "^14.9",
+        "symplify/vendor-patches": "^11.5|^12.0",
+        "tomasvotruba/class-leak": "^2.1",
+        "tracy/tracy": "^2.11"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -1,6 +1,6 @@
-# to be enabled later
 includes:
     - vendor/symplify/phpstan-rules/config/symplify-rules.neon
+    - vendor/symplify/phpstan-rules/config/rector-rules.neon
 
 parameters:
     level: 8
@@ -78,3 +78,10 @@ parameters:
         -
             message: '#Function "property_exists\(\)" cannot be used/left in the code#'
             path: rules/Orm30/Rector/MethodCall/SetParametersArrayToCollectionRector.php
+
+        # stmts aware interface
+#        - '#Access to an undefined property Rector\\Contract\\PhpParser\\Node\\StmtsAwareInterface::\$stmts#'
+
+        -
+            path: tests/debug_functions.php
+            message: '#Function "function_exists\(\)"#'

rector.php

@@ -10,16 +10,23 @@
     ->withPaths(
         [__DIR__ . '/config', __DIR__ . '/src', __DIR__ . '/rules', __DIR__ . '/tests', __DIR__ . '/rules-tests']
     )
-    ->withSkip(['*/Source/*', '*/Fixture/*'])
+    ->withSkip([
+        '*/Source/*',
+        '*/Fixture/*',
+        // class names on string to prevent from scope on downgrade
+        StringClassNameToClassConstantRector::class => [__DIR__ . '/src/Enum/', __DIR__ . '/config/sets/'],
+    ])
     ->withRootFiles()
     ->withPhpSets()
     ->withPreparedSets(
         deadCode: true,
         codeQuality: true,
         codingStyle: true,
         typeDeclarations: true,
+        typeDeclarationDocblocks: true,
         privatization: true,
         naming: true,
+        earlyReturn: true,
         rectorPreset: true
     )
     ->withConfiguredRule(StringClassNameToClassConstantRector::class, [

…teriaOrderingConstantDeprecationTest.php …rderingConstantDeprecationRectorTest.phprules-tests/Collection22/Rector/CriteriaOrderingConstantsDeprecations/CriteriaOrderingConstantDeprecationTest.php renamed to rules-tests/Collection22/Rector/CriteriaOrderingConstantsDeprecations/CriteriaOrderingConstantDeprecationRectorTest.php rules-tests/Collection22/Rector/CriteriaOrderingConstantsDeprecations/CriteriaOrderingConstantDeprecationTest.php renamed to rules-tests/Collection22/Rector/CriteriaOrderingConstantsDeprecations/CriteriaOrderingConstantDeprecationRectorTest.php

@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class CriteriaOrderingConstantDeprecationTest extends AbstractRectorTestCase
+final class CriteriaOrderingConstantDeprecationRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
     public function test(string $filePath): void

rules/CodeQuality/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php

@@ -17,6 +17,7 @@
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
+use Rector\Doctrine\Enum\MappingClass;
 use Rector\Doctrine\NodeAnalyzer\ConstructorAssignPropertyAnalyzer;
 use Rector\Doctrine\NodeFactory\ValueAssignFactory;
 use Rector\Doctrine\NodeManipulator\ConstructorManipulator;
@@ -127,7 +128,7 @@ private function refactorProperty(Property $property, Class_ $class): void
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
 
-        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass('Doctrine\ORM\Mapping\Column');
+        $doctrineAnnotationTagValueNode = $phpDocInfo->getByAnnotationClass(MappingClass::COLUMN);
         if (! $doctrineAnnotationTagValueNode instanceof DoctrineAnnotationTagValueNode) {
             return;
         }

rules/CodeQuality/Rector/Class_/RemoveEmptyTableAttributeRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
+use Rector\Doctrine\Enum\MappingClass;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -67,7 +68,7 @@ public function refactor(Node $node): ?Node
 
         foreach ($node->attrGroups as $attrGroupKey => $attrGroup) {
             foreach ($attrGroup->attrs as $key => $attribute) {
-                if (! $this->isName($attribute, 'Doctrine\ORM\Mapping\Table')) {
+                if (! $this->isName($attribute, MappingClass::TABLE)) {
                     continue;
                 }
 

rules/CodeQuality/Rector/Class_/TypeNullableEntityFromDocblockRector.php

@@ -141,7 +141,11 @@ public function refactor(Node $node): ?Class_
             }
 
             $propertyType = $this->columnPropertyTypeResolver->resolve($property, true);
-            if (! $propertyType instanceof Type || $propertyType instanceof MixedType) {
+            if (! $propertyType instanceof Type) {
+                continue;
+            }
+
+            if ($propertyType instanceof MixedType) {
                 continue;
             }
 

rules/Collection22/Rector/CriteriaOrderingConstantsDeprecationRector.php

@@ -15,20 +15,21 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Type\ObjectType;
+use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see
+ * @see \Rector\Doctrine\Tests\Collection22\Rector\CriteriaOrderingConstantsDeprecations\CriteriaOrderingConstantDeprecationRectorTest
  */
 final class CriteriaOrderingConstantsDeprecationRector extends AbstractRector
 {
     private readonly ObjectType $criteriaObjectType;
 
     public function __construct()
     {
-        $this->criteriaObjectType = new ObjectType('Doctrine\Common\Collections\Criteria');
+        $this->criteriaObjectType = new ObjectType(DoctrineClass::COLLECTIONS_CRITERIA);
     }
 
     public function getRuleDefinition(): RuleDefinition
@@ -92,11 +93,7 @@ public function refactor(Node $node): ?Node
 
     private function refactorClassConstFetch(ClassConstFetch $classConstFetch): ?Node
     {
-        if (! $classConstFetch->name instanceof Identifier) {
-            return null;
-        }
-
-        if (! in_array($classConstFetch->name->name, ['ASC', 'DESC'])) {
+        if (! $this->isNames($classConstFetch->name, ['ASC', 'DESC'])) {
             return null;
         }
 
@@ -110,7 +107,10 @@ private function refactorClassConstFetch(ClassConstFetch $classConstFetch): ?Nod
             return null;
         }
 
-        return match ($classConstFetch->name->name) {
+        /** @var "ASC"|"DESC" $constantName */
+        $constantName = $this->getName($classConstFetch->name);
+
+        return match ($constantName) {
             'ASC' => new String_('ASC'),
             'DESC' => new String_('DESC'),
         };
@@ -195,7 +195,7 @@ private function refactorMethodCall(MethodCall $methodCall): ?Node
     private function buildArrayItem(string $direction, Expr|null $key): ArrayItem
     {
         $classConstFetch = $this->nodeFactory->createClassConstFetch(
-            'Doctrine\Common\Collections\Order',
+            DoctrineClass::ORDER,
             match ($direction) {
                 'ASC' => 'Ascending',
                 'DESC' => 'Descending',

rules/Dbal211/Rector/MethodCall/ExtractArrayArgOnQueryBuilderSelectRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Type\ObjectType;
+use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -65,7 +66,7 @@ public function refactor(Node $node): ?MethodCall
             return null;
         }
 
-        if (! $varType->isInstanceOf('Doctrine\DBAL\Query\QueryBuilder')->yes()) {
+        if (! $varType->isInstanceOf(DoctrineClass::DBAL_QUERY_BUILDER)->yes()) {
             return null;
         }
 

rules/Dbal211/Rector/MethodCall/ReplaceFetchAllMethodCallRector.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Identifier;
 use PHPStan\Type\ObjectType;
+use Rector\Doctrine\Enum\DoctrineClass;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -70,11 +71,11 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($this->isObjectType($node->var, new ObjectType('Doctrine\DBAL\Connection'))) {
+        if ($this->isObjectType($node->var, new ObjectType(DoctrineClass::CONNECTION))) {
             return $this->refactorConnection($node);
         }
 
-        if ($this->isObjectType($node->var, new ObjectType('Doctrine\DBAL\Driver\ResultStatement'))) {
+        if ($this->isObjectType($node->var, new ObjectType(DoctrineClass::RESULT_STATEMENT))) {
             return $this->refactorResultStatement($node);
         }