Bump QA tools to latest

doctrine-extensions · Jun 8, 2024 · a287338 · a287338
1 parent 8d658b4
commit a287338
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -60,11 +60,11 @@
         "doctrine/orm": "^2.14.0",
         "friendsofphp/php-cs-fixer": "^3.14.0",
         "nesbot/carbon": "^2.71 || ^3.0",
-        "phpstan/phpstan": "^1.10.2",
-        "phpstan/phpstan-doctrine": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan-doctrine": "^1.4",
+        "phpstan/phpstan-phpunit": "^1.4",
         "phpunit/phpunit": "^9.6",
-        "rector/rector": "^0.19",
+        "rector/rector": "^1.1",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/phpunit-bridge": "^6.0 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.0 || ^7.0"

diff --git a/rector.php b/rector.php
@@ -10,27 +10,22 @@
  */
 
 use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\LevelSetList;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
+use Rector\ValueObject\PhpVersion;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withPaths([
         __DIR__.'/src',
         __DIR__.'/tests',
         __DIR__.'/example',
-    ]);
-
-    $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_74,
-    ]);
-
-    $rectorConfig->skip([
+    ])
+    ->withPhpVersion(PhpVersion::PHP_74)
+    ->withPhpSets()
+    ->withSkip([
         TypedPropertyFromAssignsRector::class => [
             __DIR__.'/src/Mapping/MappedEventSubscriber.php', // Rector is trying to set a type on the $annotationReader property which requires a union type, not supported on PHP 7.4
             __DIR__.'/tests/Gedmo/Wrapper/Fixture/Entity/CompositeRelation.php', // @todo: remove this when /~https://github.com/doctrine/orm/issues/8255 is solved
         ],
-    ]);
-
-    $rectorConfig->importNames();
-    $rectorConfig->importShortClasses(false);
-};
+    ])
+    ->withImportNames(true, true, false)
+;
diff --git a/tests/Gedmo/Sortable/SortableDocumentGroupTest.php b/tests/Gedmo/Sortable/SortableDocumentGroupTest.php
@@ -175,7 +175,7 @@ private function populate(): void
         $birthdates = [
             new \DateTime(self::KID_DATE1),
             new \DateTime(self::KID_DATE2),
-            ];
+        ];
 
         for ($i = 0; $i < 4; ++$i) {
             $kid = new Kid();