Merge branch '2.5' of github.com:sulu/skeleton into 2.6

sulu · Nov 21, 2024 · 835ccad · 835ccad
2 parents 6d69f84 + 826a9ee
commit 835ccad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -58,7 +58,7 @@
         "php-cs-fixer/shim": "^3.58",
         "phpspec/prophecy-phpunit": "^2.1",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-doctrine": "^1.3",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.3",

diff --git a/config/router.php b/config/router.php
@@ -13,7 +13,6 @@
 
 // Workaround https://bugs.php.net/64566
 $autoPrependFile = \ini_get('auto_prepend_file');
-// @phpstan-ignore-next-line https://github.com/phpstan/phpstan/issues/7685
 if (false !== (bool) $autoPrependFile && !\in_array(\realpath($autoPrependFile), \get_included_files(), true)) {
     require \ini_get('auto_prepend_file');
 }

diff --git a/rector.php b/rector.php
@@ -3,59 +3,35 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Doctrine\Set\DoctrineSetList;
-use Rector\PHPUnit\Set\PHPUnitLevelSetList;
-use Rector\PHPUnit\Set\PHPUnitSetList;
-use Rector\Set\ValueObject\LevelSetList;
-use Rector\Set\ValueObject\SetList;
-use Rector\Symfony\Set\SymfonyLevelSetList;
 use Rector\Symfony\Set\SymfonySetList;
-use Sulu\Rector\Set\SuluLevelSetList;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([__DIR__ . '/src', __DIR__ . '/tests']);
-
-    $rectorConfig->phpstanConfigs([
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->withRootFiles()
+    ->withPHPStanConfigs([
         __DIR__ . '/phpstan.dist.neon',
         // rector does not load phpstan extension automatically so require them manually here:
         __DIR__ . '/vendor/phpstan/phpstan-doctrine/extension.neon',
         __DIR__ . '/vendor/phpstan/phpstan-symfony/extension.neon',
-    ]);
-
-    // basic rules
-    $rectorConfig->importNames();
-    $rectorConfig->importShortClasses(false);
-
-    $rectorConfig->sets([
-        SetList::CODE_QUALITY,
-        LevelSetList::UP_TO_PHP_81,
-    ]);
+    ])
+    ->withImportNames(importShortClasses: false)
+    ->withPreparedSets(codeQuality: true, doctrineCodeQuality: true)
+    ->withPhpSets()
 
     // symfony rules
-    $rectorConfig->symfonyContainerPhp(__DIR__ . '/var/cache/website/dev/App_KernelDevDebugContainer.xml');
-
-    $rectorConfig->sets([
+    ->withSymfonyContainerPhp(__DIR__ . '/var/cache/website/dev/App_KernelDevDebugContainer.xml')
+    ->withSets([
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
         // activate when doing updates:
         // SymfonyLevelSetList::UP_TO_SYMFONY_63,
-    ]);
-
-    // doctrine rules
-    $rectorConfig->sets([
-        DoctrineSetList::DOCTRINE_CODE_QUALITY,
-    ]);
-
-    // phpunit rules
-    $rectorConfig->sets([
         // activate when doing updates:
         // PHPUnitLevelSetList::UP_TO_PHPUNIT_90,
         // PHPUnitSetList::PHPUNIT_91,
-    ]);
-
-    // sulu rules
-    $rectorConfig->sets([
+        // sulu rules
         // activate for updates when doing updates:
         // SuluLevelSetList::UP_TO_SULU_25,
     ]);
-};