[Chore] Bump PHPStan & Rector versions

Author: loic425

composer.json

@@ -65,11 +65,11 @@
         "pamil/phpspec-skip-example-extension": "^4.2",
         "phpspec/phpspec": "^7.5",
         "phpspec/prophecy-phpunit": "^2.2",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-webmozart-assert": "^1.2",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^10.0",
-        "rector/rector": "^0.18.2",
+        "rector/rector": "^2.0",
         "sylius-labs/coding-standard": "^4.4",
         "sylius/grid-bundle": "^1.13",
         "symfony/console": "^6.4 || ^7.1",
@@ -137,7 +137,8 @@
         "analyse": [
             "@composer validate --strict",
             "vendor/bin/ecs check",
-            "vendor/bin/phpstan analyse --ansi --memory-limit=256M -c phpstan.neon -l max src"
+            "vendor/bin/phpstan analyse --ansi --memory-limit=256M -c phpstan.neon -l max src",
+            "vendor/bin/rector process --dry-run"
         ],
         "fix": [
             "vendor/bin/ecs check --fix"

phpstan-baseline.neon

@@ -3,6 +3,7 @@ includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
 
     - vendor/phpstan/phpstan-phpunit/rules.neon
+    - phpstan-baseline.neon
 
 parameters:
     reportUnmatchedIgnoredErrors: false

phpstan.neon

@@ -2,17 +2,14 @@
 
 declare(strict_types=1);
 
-use Rector\Core\Configuration\Option;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
-use Rector\Set\ValueObject\SetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-
-return static function (ContainerConfigurator $containerConfigurator): void
-{
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
-
-    $services = $containerConfigurator->services();
-    $services->set(TypedPropertyRector::class);
-};
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src'
+    ])
+    ->withSkipPath('src/Bundle/spec')
+    ->withSkipPath('src/Component/legacy/spec')
+    ->withSkipPath('src/Component/spec')
+    ->withPhpSets(php80: true)
+;

rector.php

@@ -94,7 +94,7 @@ protected function getModelNamespace(): ?string
     /**
      * Return mapping compiler pass class depending on driver.
      *
-     *
+     * @return string[]
      *
      * @throws UnknownDriverException
      */

src/Bundle/AbstractResourceBundle.php

@@ -146,7 +146,7 @@ protected function json($data, int $status = 200, array $headers = [], array $co
     protected function file($file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse
     {
         $response = new BinaryFileResponse($file);
-        $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName);
+        $response->setContentDisposition($disposition, $fileName ?? $response->getFile()->getFilename());
 
         return $response;
     }

src/Bundle/Controller/ControllerTrait.php

@@ -19,11 +19,8 @@
 
 final class EventDispatcher implements EventDispatcherInterface
 {
-    private SymfonyEventDispatcherInterface $eventDispatcher;
-
-    public function __construct(SymfonyEventDispatcherInterface $eventDispatcher)
+    public function __construct(private SymfonyEventDispatcherInterface $eventDispatcher)
     {
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     public function dispatch(

src/Bundle/Controller/EventDispatcher.php

@@ -27,14 +27,10 @@ final class FlashHelper implements FlashHelperInterface
     /** @var RequestStack|SessionInterface */
     private $requestStack;
 
-    private TranslatorInterface $translator;
-
-    private string $defaultLocale;
-
     /**
      * @param RequestStack|SessionInterface $requestStack
      */
-    public function __construct(/* RequestStack */ $requestStack, TranslatorInterface $translator, string $defaultLocale)
+    public function __construct(/* RequestStack */ $requestStack, private TranslatorInterface $translator, private string $defaultLocale)
     {
         /** @phpstan-ignore-next-line */
         if (!$requestStack instanceof SessionInterface && !$requestStack instanceof RequestStack) {
@@ -53,8 +49,6 @@ public function __construct(/* RequestStack */ $requestStack, TranslatorInterfac
         }
 
         $this->requestStack = $requestStack;
-        $this->translator = $translator;
-        $this->defaultLocale = $defaultLocale;
     }
 
     public function addSuccessFlash(

src/Bundle/Controller/FlashHelper.php

@@ -21,14 +21,8 @@
 
 final class ParametersParser implements ParametersParserInterface
 {
-    private ContainerInterface $container;
-
-    private ExpressionLanguage $expression;
-
-    public function __construct(ContainerInterface $container, ExpressionLanguage $expression)
+    public function __construct(private ContainerInterface $container, private ExpressionLanguage $expression)
     {
-        $this->container = $container;
-        $this->expression = $expression;
     }
 
     public function parseRequestValues(array $parameters, Request $request): array
@@ -61,15 +55,15 @@ private function parseRequestValue($parameter, Request $request)
             return $parameter;
         }
 
-        if (0 === strpos($parameter, '$')) {
+        if (str_starts_with($parameter, '$')) {
             return RequestParameterProvider::provide($request, substr($parameter, 1));
         }
 
-        if (0 === strpos($parameter, 'expr:')) {
+        if (str_starts_with($parameter, 'expr:')) {
             return $this->parseRequestValueExpression(substr($parameter, 5), $request);
         }
 
-        if (0 === strpos($parameter, '!!')) {
+        if (str_starts_with($parameter, '!!')) {
             return $this->parseRequestValueTypecast($parameter, $request);
         }
 

src/Bundle/Controller/ParametersParser.php

@@ -22,11 +22,8 @@
 
 final class RedirectHandler implements RedirectHandlerInterface
 {
-    private RouterInterface $router;
-
-    public function __construct(RouterInterface $router)
+    public function __construct(private RouterInterface $router)
     {
-        $this->router = $router;
     }
 
     public function redirectToResource(RequestConfiguration $configuration, ResourceInterface $resource): Response
@@ -37,7 +34,7 @@ public function redirectToResource(RequestConfiguration $configuration, Resource
                 (string) $configuration->getRedirectRoute(ResourceActions::SHOW),
                 $configuration->getRedirectParameters($resource),
             );
-        } catch (RouteNotFoundException $exception) {
+        } catch (RouteNotFoundException) {
             return $this->redirectToRoute(
                 $configuration,
                 (string) $configuration->getRedirectRoute(ResourceActions::INDEX),