Merge 4.x into 5.x

composer.json

@@ -52,6 +52,7 @@
         "matthiasnoback/symfony-config-test": "^4.2 || ^5.1",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
         "phpstan/extension-installer": "^1.0",
+        "phpstan/phpdoc-parser": "^1.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",

rector.php

@@ -19,6 +19,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
@@ -40,5 +41,6 @@
     $rectorConfig->skip([
         ExceptionHandlerTypehintRector::class,
         PreferPHPUnitThisCallRector::class,
+        NarrowUnusedSetUpDefinedPropertyRector::class,
     ]);
 };

src/Admin/ContextAwareAdmin.php

@@ -37,7 +37,7 @@ public function __construct(
         $contextManager,
         ?string $deprecatedClass = null,
         ?string $deprecatedBaseControllerName = null,
-        ?ContextManagerInterface $deprecatedContextManager = null
+        ?ContextManagerInterface $deprecatedContextManager = null,
     ) {
         // NEXT_MAJOR: Keep the if part.
         if ($contextManager instanceof ContextManagerInterface) {

src/Block/Service/AbstractCategoriesBlockService.php

@@ -45,7 +45,7 @@ public function __construct(
         Environment $twig,
         ContextManagerInterface $contextManager,
         private CategoryManagerInterface $categoryManager,
-        private ?AdminInterface $categoryAdmin
+        private ?AdminInterface $categoryAdmin,
     ) {
         parent::__construct($twig, $contextManager);
     }

src/Block/Service/AbstractClassificationBlockService.php

@@ -36,7 +36,7 @@ abstract class AbstractClassificationBlockService extends AbstractBlockService
 {
     public function __construct(
         Environment $twig,
-        protected ContextManagerInterface $contextManager
+        protected ContextManagerInterface $contextManager,
     ) {
         parent::__construct($twig);
     }

src/Block/Service/AbstractCollectionsBlockService.php

@@ -45,7 +45,7 @@ public function __construct(
         Environment $twig,
         ContextManagerInterface $contextManager,
         private CollectionManagerInterface $collectionManager,
-        private ?AdminInterface $collectionAdmin = null
+        private ?AdminInterface $collectionAdmin = null,
     ) {
         parent::__construct($twig, $contextManager);
     }

src/Block/Service/AbstractTagsBlockService.php

@@ -45,7 +45,7 @@ public function __construct(
         Environment $twig,
         ContextManagerInterface $contextManager,
         private TagManagerInterface $tagManager,
-        private ?AdminInterface $tagAdmin = null
+        private ?AdminInterface $tagAdmin = null,
     ) {
         parent::__construct($twig, $contextManager);
     }

src/Command/FixContextCommand.php

@@ -30,7 +30,7 @@ public function __construct(
         private ContextManagerInterface $contextManager,
         private TagManagerInterface $tagManager,
         private CollectionManagerInterface $collectionManager,
-        private CategoryManagerInterface $categoryManager
+        private CategoryManagerInterface $categoryManager,
     ) {
         parent::__construct();
     }

src/Document/CategoryManager.php

@@ -36,7 +36,7 @@ final class CategoryManager extends BaseDocumentManager implements CategoryManag
     public function __construct(
         string $class,
         ManagerRegistry $registry,
-        protected ContextManagerInterface $contextManager
+        protected ContextManagerInterface $contextManager,
     ) {
         parent::__construct($class, $registry);
         $this->categories = [];

src/Entity/CategoryManager.php

@@ -36,7 +36,7 @@ final class CategoryManager extends BaseEntityManager implements CategoryManager
     public function __construct(
         string $class,
         ManagerRegistry $registry,
-        protected ContextManagerInterface $contextManager
+        protected ContextManagerInterface $contextManager,
     ) {
         parent::__construct($class, $registry);
         $this->categories = [];