Add Rector configuration

.gitattributes

@@ -9,6 +9,7 @@ docs export-ignore
 Makefile export-ignore
 phpunit.xml.dist export-ignore
 bin/console export-ignore
+rector.php export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 phpstan-console-application.php export-ignore

.github/workflows/qa.yaml

@@ -62,3 +62,27 @@ jobs:
 
             - name: Psalm
               run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.1
+    rector:
+        name: Rector
+
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v3
+
+            - name: Install PHP with extensions
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '8.1'
+                  coverage: none
+                  tools: composer:v2
+
+            - name: Install Composer dependencies (highest)
+              uses: ramsey/composer-install@v2
+              with:
+                  dependency-versions: highest
+                  composer-options: --prefer-dist --prefer-stable
+
+            - name: Rector
+              run: vendor/bin/rector --no-progress-bar --dry-run

Makefile

@@ -119,3 +119,7 @@ phpstan:
 psalm:
 	vendor/bin/psalm --php-version=8.1
 .PHONY: psalm
+
+rector:
+	vendor/bin/rector
+.PHONY: rector

composer.json

@@ -57,6 +57,7 @@
         "phpunit/phpunit": "^9.5.13",
         "psalm/plugin-phpunit": "^0.16",
         "psalm/plugin-symfony": "^3.0",
+        "rector/rector": "dev-main",
         "sonata-project/doctrine-extensions": "^1.10.1",
         "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
         "symfony/debug": "^4.4 || ^5.3 || ^6.0",

rector.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * DO NOT EDIT THIS FILE!
+ *
+ * It's auto-generated by sonata-project/dev-kit package.
+ */
+
+use Rector\Config\RectorConfig;
+use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\Php71\Rector\FuncCall\CountOnNullRector;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_74,
+    ]);
+
+    $rectorConfig->importNames();
+    $rectorConfig->disableImportShortClasses();
+    $rectorConfig->skip([
+        CountOnNullRector::class,
+        ExceptionHandlerTypehintRector::class,
+    ]);
+};

src/Block/BlockContext.php

@@ -17,15 +17,12 @@
 
 final class BlockContext implements BlockContextInterface
 {
-    /**
-     * @var BlockInterface
-     */
-    private $block;
+    private BlockInterface $block;
 
     /**
      * @var array<string, mixed>
      */
-    private $settings;
+    private array $settings;
 
     /**
      * @param array<string, mixed> $settings

src/Block/BlockContextManager.php

@@ -23,33 +23,27 @@
 
 final class BlockContextManager implements BlockContextManagerInterface
 {
-    /**
-     * @var BlockLoaderInterface
-     */
-    private $blockLoader;
+    private BlockLoaderInterface $blockLoader;
 
-    /**
-     * @var BlockServiceManagerInterface
-     */
-    private $blockService;
+    private BlockServiceManagerInterface $blockService;
 
     /**
      * @var array<string, array<string, mixed>>
      */
-    private $settingsByType = [];
+    private array $settingsByType = [];
 
     /**
      * @var array<string, array<string, mixed>>
      * @phpstan-var array<class-string, array<string, mixed>>
      */
-    private $settingsByClass = [];
+    private array $settingsByClass = [];
 
     /**
      * NEXT_MAJOR: remove.
      *
      * @var array{by_class: array<class-string, string>, by_type: array<string, string>}
      */
-    private $cacheBlocks = ['by_class' => [], 'by_type' => []];
+    private array $cacheBlocks = ['by_class' => [], 'by_type' => []];
 
     /**
      * @var LoggerInterface

src/Block/BlockLoaderChain.php

@@ -21,7 +21,7 @@ final class BlockLoaderChain implements BlockLoaderInterface
     /**
      * @var BlockLoaderInterface[]
      */
-    private $loaders;
+    private array $loaders;
 
     /**
      * @param BlockLoaderInterface[] $loaders

src/Block/BlockRenderer.php

@@ -26,28 +26,17 @@
  */
 final class BlockRenderer implements BlockRendererInterface
 {
-    /**
-     * @var BlockServiceManagerInterface
-     */
-    private $blockServiceManager;
+    private BlockServiceManagerInterface $blockServiceManager;
 
-    /**
-     * @var StrategyManagerInterface
-     */
-    private $exceptionStrategyManager;
+    private StrategyManagerInterface $exceptionStrategyManager;
 
-    /**
-     * @var LoggerInterface|null
-     */
-    private $logger;
+    private ?LoggerInterface $logger;
 
     /**
      * This property hold the last response available from the child or sibling block
      * The cacheable attributes must be cascaded to the parent.
-     *
-     * @var Response|null
      */
-    private $lastResponse;
+    private ?Response $lastResponse = null;
 
     /**
      * @param BlockServiceManagerInterface $blockServiceManager      Block service manager

src/Block/BlockServiceManager.php

@@ -25,27 +25,21 @@ final class BlockServiceManager implements BlockServiceManagerInterface
     /**
      * @var array<string, string|BlockServiceInterface>
      */
-    private $services;
+    private array $services;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ContainerInterface $container;
 
-    /**
-     * @var bool
-     */
-    private $inValidate = false;
+    private bool $inValidate = false;
 
     /**
      * @var array<string, string[]>
      */
-    private $contexts;
+    private array $contexts;
 
     /**
      * @var string[]
      */
-    private $containerTypes;
+    private array $containerTypes;
 
     /**
      * NEXT_MAJOR: make $containerTypes not nullable.

src/Block/Loader/ServiceLoader.php

@@ -22,7 +22,7 @@ final class ServiceLoader implements BlockLoaderInterface
     /**
      * @var string[]
      */
-    private $types;
+    private array $types;
 
     /**
      * @param string[] $types

src/Block/Service/AbstractBlockService.php

@@ -24,10 +24,7 @@
  */
 abstract class AbstractBlockService implements BlockServiceInterface
 {
-    /**
-     * @var Environment
-     */
-    private $twig;
+    private Environment $twig;
 
     public function __construct(Environment $twig)
     {
@@ -41,7 +38,7 @@ public function __construct(Environment $twig)
      */
     public function renderResponse(string $view, array $parameters = [], ?Response $response = null): Response
     {
-        $response = $response ?? new Response();
+        $response ??= new Response();
 
         $response->setContent($this->twig->render($view, $parameters));
 

src/Block/Service/MenuBlockService.php

@@ -36,15 +36,9 @@
  */
 class MenuBlockService extends AbstractBlockService implements EditableBlockService
 {
-    /**
-     * @var MenuProviderInterface
-     */
-    private $menuProvider;
+    private MenuProviderInterface $menuProvider;
 
-    /**
-     * @var MenuRegistryInterface
-     */
-    private $menuRegistry;
+    private MenuRegistryInterface $menuRegistry;
 
     public function __construct(
         Environment $twig,

src/Cache/HttpCacheHandler.php

@@ -22,10 +22,7 @@
  */
 final class HttpCacheHandler implements HttpCacheHandlerInterface
 {
-    /**
-     * @var int|null
-     */
-    private $currentTtl;
+    private ?int $currentTtl = null;
 
     public function alterResponse(Response $response): void
     {

src/Command/DebugBlocksCommand.php

@@ -26,10 +26,7 @@ final class DebugBlocksCommand extends Command
 {
     protected static $defaultName = 'debug:sonata:block';
 
-    /**
-     * @var BlockServiceManagerInterface
-     */
-    private $blockManager;
+    private BlockServiceManagerInterface $blockManager;
 
     public function __construct(BlockServiceManagerInterface $blockManager)
     {
@@ -68,7 +65,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
 
             try {
                 foreach ($resolver->resolve() as $key => $val) {
-                    $output->writeln(sprintf('    %-30s%s', $key, json_encode($val)));
+                    $output->writeln(sprintf('    %-30s%s', $key, json_encode($val, \JSON_THROW_ON_ERROR)));
                 }
             } catch (MissingOptionsException $e) {
                 foreach ($resolver->getDefinedOptions() as $option) {

src/DependencyInjection/Configuration.php

@@ -28,14 +28,12 @@ final class Configuration implements ConfigurationInterface
     /**
      * @var array<string, string>
      */
-    private $defaultContainerTemplates;
+    private array $defaultContainerTemplates;
 
     /**
      * NEXT_MAJOR: remove this member.
-     *
-     * @var bool
      */
-    private $httpCacheDisabled = false;
+    private bool $httpCacheDisabled = false;
 
     /**
      * @param array<string, string> $defaultContainerTemplates

src/Event/BlockEvent.php

@@ -21,12 +21,12 @@ final class BlockEvent extends Event
     /**
      * @var array<string, mixed>
      */
-    private $settings;
+    private array $settings;
 
     /**
      * @var BlockInterface[]
      */
-    private $blocks = [];
+    private array $blocks = [];
 
     /**
      * @param array<string, mixed> $settings

src/Exception/Filter/DebugOnlyFilter.php

@@ -22,10 +22,7 @@
  */
 final class DebugOnlyFilter implements FilterInterface
 {
-    /**
-     * @var bool
-     */
-    private $debug;
+    private bool $debug;
 
     public function __construct(bool $debug)
     {

src/Exception/Filter/IgnoreClassFilter.php

@@ -23,10 +23,7 @@
  */
 final class IgnoreClassFilter implements FilterInterface
 {
-    /**
-     * @var string
-     */
-    private $class;
+    private string $class;
 
     public function __construct(string $class)
     {