Fix build (#8215)

composer.json

@@ -71,6 +71,7 @@
         "matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^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/Action/AppendFormFieldElementAction.php

@@ -27,7 +27,7 @@ final class AppendFormFieldElementAction
     public function __construct(
         private Environment $twig,
         private AdminFetcherInterface $adminFetcher,
-        private AdminHelper $helper
+        private AdminHelper $helper,
     ) {
     }
 

src/Action/DashboardAction.php

@@ -26,7 +26,7 @@ final class DashboardAction
     public function __construct(
         private array $dashboardBlocks,
         private TemplateRegistryInterface $templateRegistry,
-        private Environment $twig
+        private Environment $twig,
     ) {
     }
 

src/Action/GetShortObjectDescriptionAction.php

@@ -26,7 +26,7 @@ final class GetShortObjectDescriptionAction
 {
     public function __construct(
         private Environment $twig,
-        private AdminFetcherInterface $adminFetcher
+        private AdminFetcherInterface $adminFetcher,
     ) {
     }
 

src/Action/RetrieveAutocompleteItemsAction.php

@@ -31,7 +31,7 @@
 final class RetrieveAutocompleteItemsAction
 {
     public function __construct(
-        private AdminFetcherInterface $adminFetcher
+        private AdminFetcherInterface $adminFetcher,
     ) {
     }
 
@@ -232,7 +232,7 @@ public function __invoke(Request $request): JsonResponse
      */
     private function retrieveFilterFieldDescription(
         AdminInterface $admin,
-        string $field
+        string $field,
     ): FieldDescriptionInterface {
         if (!$admin->hasFilterFieldDescription($field)) {
             throw new \RuntimeException(\sprintf('The field "%s" does not exist.', $field));
@@ -256,7 +256,7 @@ private function retrieveFilterFieldDescription(
      */
     private function retrieveFormFieldDescription(
         AdminInterface $admin,
-        string $field
+        string $field,
     ): FieldDescriptionInterface {
         if (!$admin->hasFormFieldDescription($field)) {
             throw new \RuntimeException(\sprintf('The field "%s" does not exist.', $field));

src/Action/RetrieveFormFieldElementAction.php

@@ -27,7 +27,7 @@ final class RetrieveFormFieldElementAction
     public function __construct(
         private Environment $twig,
         private AdminFetcherInterface $adminFetcher,
-        private AdminHelper $helper
+        private AdminHelper $helper,
     ) {
     }
 

src/Action/SearchAction.php

@@ -24,7 +24,7 @@ final class SearchAction
     public function __construct(
         private Pool $pool,
         private TemplateRegistryInterface $templateRegistry,
-        private Environment $twig
+        private Environment $twig,
     ) {
     }
 

src/Action/SetObjectFieldValueAction.php

@@ -38,7 +38,7 @@ public function __construct(
         private ValidatorInterface $validator,
         private DataTransformerResolverInterface $resolver,
         private PropertyAccessorInterface $propertyAccessor,
-        ?RenderElementRuntime $renderElementRuntime = null
+        ?RenderElementRuntime $renderElementRuntime = null,
     ) {
         // NEXT_MAJOR: Remove the deprecation and restrict param constructor to RenderElementRuntime.
         if (null === $renderElementRuntime) {

src/Admin/AbstractAdmin.php

@@ -1370,7 +1370,7 @@ final public function isChild(): bool
     /**
      * Returns true if the admin has children, false otherwise.
      *
-     * @phpstan-assert-if-true non-empty-array $this->children
+     * @phpstan-assert-if-true non-empty-array<string, AdminInterface<object>> $this->children
      */
     final public function hasChildren(): bool
     {

src/Admin/AbstractAdminExtension.php

@@ -141,7 +141,7 @@ public function configureActionButtons(
         AdminInterface $admin,
         array $list,
         string $action,
-        ?object $object = null
+        ?object $object = null,
     ): array {
         return $list;
     }

src/Admin/AdminExtensionInterface.php

@@ -28,6 +28,8 @@
  *
  * @method void preBatchAction(AdminInterface $admin, string $actionName, ProxyQueryInterface $query, array &$idx, bool $allElements)
  *
+ * @phpstan-method void preBatchAction(AdminInterface<T> $admin, string $actionName, ProxyQueryInterface<T> $query, array<mixed> &$idx, bool $allElements)
+ *
  * @phpstan-template T of object
  */
 interface AdminExtensionInterface
@@ -68,7 +70,7 @@ public function configureTabMenu(
         AdminInterface $admin,
         MenuItemInterface $menu,
         string $action,
-        ?AdminInterface $childAdmin = null
+        ?AdminInterface $childAdmin = null,
     ): void;
 
     /**
@@ -137,6 +139,7 @@ public function configureBatchActions(AdminInterface $admin, array $actions): ar
     // /**
     // * @param mixed[] $idx
     // * @phpstan-param AdminInterface<T> $admin
+    // * @phpstan-param ProxyQueryInterface<T> $query
     // */
     // public function preBatchAction(AdminInterface $admin, string $actionName, ProxyQueryInterface $query, array &$idx, bool $allElements): void;
 
@@ -203,7 +206,7 @@ public function configureActionButtons(
         AdminInterface $admin,
         array $list,
         string $action,
-        ?object $object = null
+        ?object $object = null,
     ): array;
 
     /**

src/Admin/AdminHelper.php

@@ -36,7 +36,7 @@ class AdminHelper
     private const FORM_FIELD_DELETE = '_delete';
 
     public function __construct(
-        private PropertyAccessorInterface $propertyAccessor
+        private PropertyAccessorInterface $propertyAccessor,
     ) {
     }
 

src/Admin/AdminInterface.php

@@ -33,6 +33,8 @@
  * @method bool showInDashboard()
  * @method void removeExtension(AdminExtensionInterface $extension)
  *
+ * @phpstan-method void removeExtension(AdminExtensionInterface<T> $extension)
+ *
  * @phpstan-import-type FieldDescriptionOptions from FieldDescriptionInterface
  *
  * @phpstan-template T of object

src/Admin/BreadcrumbsBuilder.php

@@ -75,7 +75,7 @@ public function getBreadcrumbs(AdminInterface $admin, string $action): array
     public function buildBreadcrumbs(
         AdminInterface $admin,
         string $action,
-        ?ItemInterface $menu = null
+        ?ItemInterface $menu = null,
     ): ItemInterface {
         if (null === $menu) {
             $menu = $admin->getMenuFactory()->createItem('root');
@@ -161,7 +161,7 @@ private function createMenuItem(
         ItemInterface $menu,
         string $name,
         ?string $translationDomain = null,
-        array $options = []
+        array $options = [],
     ): ItemInterface {
         $options = array_merge([
             'extras' => [

src/Admin/Pool.php

@@ -62,7 +62,7 @@ public function __construct(
         private ContainerInterface $container,
         private array $adminServiceCodes = [],
         private array $adminGroups = [],
-        private array $adminClasses = []
+        private array $adminClasses = [],
     ) {
     }
 

src/Admin/UrlGeneratorInterface.php

@@ -51,7 +51,7 @@ public function generateObjectUrl(
         string $name,
         object $object,
         array $parameters = [],
-        int $referenceType = RoutingUrlGeneratorInterface::ABSOLUTE_PATH
+        int $referenceType = RoutingUrlGeneratorInterface::ABSOLUTE_PATH,
     ): string;
 
     /**

src/ArgumentResolver/AdminValueResolver.php

@@ -21,7 +21,7 @@
 final class AdminValueResolver implements CompatibleValueResolverInterface
 {
     public function __construct(
-        private AdminFetcherInterface $adminFetcher
+        private AdminFetcherInterface $adminFetcher,
     ) {
     }
 

src/Block/AdminListBlockService.php

@@ -29,7 +29,7 @@ final class AdminListBlockService extends AbstractBlockService
     public function __construct(
         Environment $twig,
         private Pool $pool,
-        private TemplateRegistryInterface $templateRegistry
+        private TemplateRegistryInterface $templateRegistry,
     ) {
         parent::__construct($twig);
     }

src/Block/AdminPreviewBlockService.php

@@ -31,7 +31,7 @@ final class AdminPreviewBlockService extends AbstractBlockService
 {
     public function __construct(
         Environment $twig,
-        private Pool $pool
+        private Pool $pool,
     ) {
         parent::__construct($twig);
     }

src/Block/AdminSearchBlockService.php

@@ -40,7 +40,7 @@ public function __construct(
         private SearchHandlerInterface $searchHandler,
         private TemplateRegistryInterface $templateRegistry,
         private string $emptyBoxesOption,
-        private string $adminRoute
+        private string $adminRoute,
     ) {
         parent::__construct($twig);
     }

src/Block/AdminStatsBlockService.php

@@ -28,7 +28,7 @@ final class AdminStatsBlockService extends AbstractBlockService
 {
     public function __construct(
         Environment $twig,
-        private Pool $pool
+        private Pool $pool,
     ) {
         parent::__construct($twig);
     }

src/Bridge/Exporter/AdminExporter.php

@@ -22,7 +22,7 @@
 final class AdminExporter
 {
     public function __construct(
-        private ExporterInterface $exporter
+        private ExporterInterface $exporter,
     ) {
     }
 

src/Builder/AbstractFormContractor.php

@@ -69,7 +69,7 @@ final public function getFormBuilder(string $name, array $formOptions = []): For
     final public function getDefaultOptions(
         ?string $type,
         FieldDescriptionInterface $fieldDescription,
-        array $formOptions = []
+        array $formOptions = [],
     ): array {
         $options = [];
         $options['sonata_field_description'] = $fieldDescription;

src/Builder/DatagridBuilderInterface.php

@@ -33,7 +33,7 @@ interface DatagridBuilderInterface extends BuilderInterface
     public function addFilter(
         DatagridInterface $datagrid,
         ?string $type,
-        FieldDescriptionInterface $fieldDescription
+        FieldDescriptionInterface $fieldDescription,
     ): void;
 
     /**

src/Builder/FormContractorInterface.php

@@ -45,6 +45,6 @@ public function getFormBuilder(string $name, array $formOptions = []): FormBuild
     public function getDefaultOptions(
         ?string $type,
         FieldDescriptionInterface $fieldDescription,
-        array $formOptions = []
+        array $formOptions = [],
     ): array;
 }

src/Builder/ListBuilderInterface.php

@@ -43,6 +43,6 @@ public function buildField(?string $type, FieldDescriptionInterface $fieldDescri
     public function addField(
         FieldDescriptionCollection $list,
         ?string $type,
-        FieldDescriptionInterface $fieldDescription
+        FieldDescriptionInterface $fieldDescription,
     ): void;
 }

src/Builder/ShowBuilderInterface.php

@@ -36,6 +36,6 @@ public function getBaseList(array $options = []): FieldDescriptionCollection;
     public function addField(
         FieldDescriptionCollection $list,
         ?string $type,
-        FieldDescriptionInterface $fieldDescription
+        FieldDescriptionInterface $fieldDescription,
     ): void;
 }

src/Command/ExplainAdminCommand.php

@@ -30,7 +30,7 @@ final class ExplainAdminCommand extends Command
      * @internal This class should only be used through the console
      */
     public function __construct(
-        private Pool $pool
+        private Pool $pool,
     ) {
         parent::__construct();
     }

src/Command/GenerateObjectAclCommand.php

@@ -37,7 +37,7 @@ final class GenerateObjectAclCommand extends QuestionableCommand
      */
     public function __construct(
         private Pool $pool,
-        private array $aclObjectManipulators
+        private array $aclObjectManipulators,
     ) {
         parent::__construct();
     }

src/Command/ListAdminCommand.php

@@ -29,7 +29,7 @@ final class ListAdminCommand extends Command
      * @internal This class should only be used through the console
      */
     public function __construct(
-        private Pool $pool
+        private Pool $pool,
     ) {
         parent::__construct();
     }

src/Command/QuestionableCommand.php

@@ -34,7 +34,7 @@ final protected function askAndValidate(
         OutputInterface $output,
         string $questionText,
         string $default,
-        callable $validator
+        callable $validator,
     ) {
         $questionHelper = $this->getQuestionHelper();
 
@@ -49,7 +49,7 @@ final protected function askConfirmation(
         InputInterface $input,
         OutputInterface $output,
         string $questionText,
-        string $default
+        string $default,
     ): bool {
         $questionHelper = $this->getQuestionHelper();
         $question = new ConfirmationQuestion(

src/Command/SetupAclCommand.php

@@ -31,7 +31,7 @@ final class SetupAclCommand extends Command
      */
     public function __construct(
         private Pool $pool,
-        private AdminAclManipulatorInterface $aclManipulator
+        private AdminAclManipulatorInterface $aclManipulator,
     ) {
         parent::__construct();
     }

src/Datagrid/Datagrid.php

@@ -62,7 +62,7 @@ public function __construct(
         private FieldDescriptionCollection $columns,
         private PagerInterface $pager,
         private FormBuilderInterface $formBuilder,
-        private array $values = []
+        private array $values = [],
     ) {
     }
 

src/Datagrid/DatagridMapper.php

@@ -39,7 +39,7 @@ final class DatagridMapper implements MapperInterface
     public function __construct(
         private DatagridBuilderInterface $builder,
         private DatagridInterface $datagrid,
-        private AdminInterface $admin
+        private AdminInterface $admin,
     ) {
     }
 
@@ -63,7 +63,7 @@ public function add(
         string $name,
         ?string $type = null,
         array $filterOptions = [],
-        array $fieldDescriptionOptions = []
+        array $fieldDescriptionOptions = [],
     ): self {
         if (
             isset($fieldDescriptionOptions['role'])

src/Datagrid/ListMapper.php

@@ -48,7 +48,7 @@ final class ListMapper implements MapperInterface
     public function __construct(
         private ListBuilderInterface $builder,
         private FieldDescriptionCollection $list,
-        private AdminInterface $admin
+        private AdminInterface $admin,
     ) {
     }