Bump phpstan to level 7

Author: VincentLanglet

phpstan.neon.dist

@@ -2,7 +2,7 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-    level: 6
+    level: 7
     paths:
         - src/
     excludePaths:

src/Config/Crud.php

@@ -260,18 +260,21 @@ public function setDecimalSeparator(string $separator): self
      */
     public function setDefaultSort(array $sortFieldsAndOrder): self
     {
-        $sortFieldsAndOrder = array_map('strtoupper', $sortFieldsAndOrder);
+        $defaultSort = [];
         foreach ($sortFieldsAndOrder as $sortField => $sortOrder) {
+            $sortOrder = strtoupper($sortOrder);
             if (!\in_array($sortOrder, [SortOrder::ASC, SortOrder::DESC], true)) {
                 throw new \InvalidArgumentException(sprintf('The sort order can be only "%s" or "%s", "%s" given.', SortOrder::ASC, SortOrder::DESC, $sortOrder));
             }
 
             if (!\is_string($sortField)) {
                 throw new \InvalidArgumentException(sprintf('The keys of the array that defines the default sort must be strings with the field names, but the given "%s" value is a "%s".', $sortField, \gettype($sortField)));
             }
+
+            $defaultSort[$sortField] = $sortOrder;
         }
 
-        $this->dto->setDefaultSort($sortFieldsAndOrder);
+        $this->dto->setDefaultSort($defaultSort);
 
         return $this;
     }

src/Dto/FieldLayoutDto.php

@@ -59,6 +59,7 @@ public function getFields(): array
      */
     public function getFieldsInTab(string $tabUniqueId): array
     {
+        /** @phpstan-ignore-next-line return.type */
         return $this->fields[$tabUniqueId] ?? [];
     }
 }

src/EventListener/AdminRouterSubscriber.php

@@ -163,7 +163,9 @@ public function onKernelRequest(RequestEvent $event): void
 
         // if this is a ugly URL from legacy EasyAdmin versions and the application
         // uses pretty URLs, redirect to the equivalent pretty URL
-        if ($this->adminRouteGenerator->usesPrettyUrls() && null !== $entityFqcnOrCrudControllerFqcn = $request->query->get(EA::CRUD_CONTROLLER_FQCN)) {
+        if ($this->adminRouteGenerator->usesPrettyUrls()) {
+            /** @var class-string|null $entityFqcnOrCrudControllerFqcn */
+            $entityFqcnOrCrudControllerFqcn = $request->query->get(EA::CRUD_CONTROLLER_FQCN);
             if (is_subclass_of($entityFqcnOrCrudControllerFqcn, CrudControllerInterface::class)) {
                 $crudControllerFqcn = $entityFqcnOrCrudControllerFqcn;
             } else {
@@ -209,7 +211,9 @@ public function onKernelController(ControllerEvent $event): void
 
         // if the request is related to a CRUD controller, change the controller to be executed
         if (null !== $crudControllerInstance = $this->getCrudControllerInstance($request)) {
+            /** @var callable $symfonyControllerFqcnCallable */
             $symfonyControllerFqcnCallable = [$crudControllerInstance, $request->attributes->get(EA::CRUD_ACTION) ?? $request->query->get(EA::CRUD_ACTION)];
+            /** @var callable $symfonyControllerStringCallable */
             $symfonyControllerStringCallable = [$crudControllerInstance::class, $request->attributes->get(EA::CRUD_ACTION) ?? $request->query->get(EA::CRUD_ACTION)];
 
             // this makes Symfony believe that another controller is being executed

src/Factory/ActionFactory.php

@@ -171,7 +171,7 @@ private function processActionLabel(ActionDto $actionDto, ?EntityDto $entityDto,
             return;
         }
 
-        if (\is_callable($label) && $label instanceof \Closure) {
+        if (!\is_string($label) && !$label instanceof TranslatableInterface && \is_callable($label)) {
             $label = \call_user_func_array($label, array_filter([$entityDto?->getInstance()], static fn ($item): bool => null !== $item));
 
             if (!\is_string($label) && !$label instanceof TranslatableInterface) {

src/Factory/FormLayoutFactory.php

@@ -16,6 +16,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneCloseType;
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneGroupCloseType;
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneGroupOpenType;
+use Stringable;
 use Symfony\Component\String\Slugger\AsciiSlugger;
 use Symfony\Component\Uid\Ulid;
 
@@ -78,7 +79,10 @@ private function validateLayoutConfiguration(FieldCollection $fields): void
             }
 
             if ($theFirstFieldWhichIsATabOrColumn->isFormColumn() && $fieldDto->isFormTab()) {
-                throw new \InvalidArgumentException(sprintf('When using form columns, you can\'t define tabs inside columns (but you can define columns inside tabs). Move the tab "%s" outside any column.', $fieldDto->getLabel()));
+                $label = $fieldDto->getLabel();
+                $labelAsString = (\is_string($label) || $label instanceof Stringable) ? (string) $label : '';
+
+                throw new \InvalidArgumentException(sprintf('When using form columns, you can\'t define tabs inside columns (but you can define columns inside tabs). Move the tab "%s" outside any column.', $labelAsString));
             }
         }
     }
@@ -181,7 +185,13 @@ private function linearizeLayoutConfiguration(FieldCollection $fields): void
 
             if ($fieldDto->isFormTab()) {
                 $isTabActive = 0 === \count($tabs);
-                $tabId = sprintf('tab-%s', $fieldDto->getLabel() ? $slugger->slug(strip_tags($fieldDto->getLabel()))->lower()->toString() : ++$tabsWithoutLabelCounter);
+                $label = $fieldDto->getLabel();
+                $tabId = sprintf(
+                    'tab-%s',
+                    (\is_string($label) || $label instanceof Stringable)
+                        ? $slugger->slug(strip_tags((string) $label))->lower()->toString()
+                        : ++$tabsWithoutLabelCounter
+                );
                 $fieldDto->setCustomOption(FormField::OPTION_TAB_ID, $tabId);
                 $fieldDto->setCustomOption(FormField::OPTION_TAB_IS_ACTIVE, $isTabActive);
 
@@ -395,6 +405,7 @@ public static function createFromFieldDtos(?FieldCollection $fieldDtos): FieldLa
                 $tabs[$fieldDto->getUniqueId()] = $fieldDto;
             } else {
                 if ($hasTabs) {
+                    /** @phpstan-ignore-next-line offsetAccess.nonOffsetAccessible */
                     $fields[$currentTab->getUniqueId()][] = $fieldDto;
                 } else {
                     $fields[] = $fieldDto;

src/Factory/MenuFactory.php

@@ -15,6 +15,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Dto\UserMenuDto;
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Security\Permission;
+use Stringable;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Http\Logout\LogoutUrlGenerator;
 use function Symfony\Component\Translation\t;
@@ -134,7 +135,10 @@ private function generateMenuItemUrl(MenuItemDto $menuItemDto): string
             $entityFqcn = $routeParameters[EA::ENTITY_FQCN] ?? null;
             $crudControllerFqcn = $routeParameters[EA::CRUD_CONTROLLER_FQCN] ?? null;
             if (null === $entityFqcn && null === $crudControllerFqcn) {
-                throw new \RuntimeException(sprintf('The CRUD menu item with label "%s" must define either the entity FQCN (using the third constructor argument) or the CRUD Controller FQCN (using the "setController()" method).', $menuItemDto->getLabel()));
+                $label = $menuItemDto->getLabel();
+                $labelAsString = (\is_string($label) || $label instanceof Stringable) ? (string) $label : '';
+
+                throw new \RuntimeException(sprintf('The CRUD menu item with label "%s" must define either the entity FQCN (using the third constructor argument) or the CRUD Controller FQCN (using the "setController()" method).', $labelAsString));
             }
 
             // 1. if CRUD controller is defined, use it...

src/Form/Type/CrudFormType.php

@@ -13,6 +13,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormRowType;
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneCloseType;
 use EasyCorp\Bundle\EasyAdminBundle\Form\Type\Layout\EaFormTabPaneOpenType;
+use Stringable;
 use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -94,7 +95,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 $metadata['label'] = $fieldDto->getLabel();
                 $metadata['help'] = $fieldDto->getHelp();
                 $metadata[FormField::OPTION_ICON] = $fieldDto->getCustomOption(FormField::OPTION_ICON);
-                $currentFormTab = (string) $fieldDto->getLabel();
+
+                $label = $fieldDto->getLabel();
+                $currentFormTab = (\is_string($label) || $label instanceof Stringable) ? (string) $label : '';
 
                 // plain arrays are not enough for tabs because they are modified in the
                 // lifecycle of a form (e.g. add info about form errors). Use an ArrayObject instead.

src/Form/Type/FileUploadType.php

@@ -96,7 +96,10 @@ public function configureOptions(OptionsResolver $resolver): void
 
             $index = 1;
             $pathInfo = pathinfo($filename);
-            while (file_exists($filename = sprintf('%s/%s_%d.%s', $pathInfo['dirname'], $pathInfo['filename'], $index, $pathInfo['extension']))) {
+
+            $basePath = isset($pathInfo['dirname']) ? sprintf('%s/%s', $pathInfo['dirname'], $pathInfo['filename']) : $pathInfo['filename'];
+            $endPath = isset($pathInfo['extension']) ? '.'.$pathInfo['extension'] : '';
+            while (file_exists($filename = sprintf('%s_%d%s', $basePath, $index, $endPath))) {
                 ++$index;
             }
 

src/Intl/IntlFormatter.php

@@ -141,15 +141,16 @@ public function formatNumber($number, array $attrs = [], string $style = 'decima
         $formatter = $this->createNumberFormatter($locale, $style, $attrs);
 
         $ret = $formatter->format($number, self::NUMBER_TYPES[$type]);
-        if (!\is_string($formatter->format($number, self::NUMBER_TYPES[$type]))) {
+        if (!\is_string($ret)) {
             throw new RuntimeError('Unable to format the given number.');
         }
 
         return $ret;
     }
 
     /**
-     * @param \DateTimeZone|string|bool|null $timezone The target timezone, null to use the default, false to leave unchanged
+     * @param \DateTimeZone|string|bool|null $timezone The target timezone, null to use the default, false to leave
+     *                                                 unchanged
      */
     public function formatDateTime(?\DateTimeInterface $date, ?string $dateFormat = 'medium', ?string $timeFormat = 'medium', string $pattern = '', $timezone = null, string $calendar = 'gregorian', ?string $locale = null): ?string
     {
@@ -164,15 +165,17 @@ public function formatDateTime(?\DateTimeInterface $date, ?string $dateFormat =
     }
 
     /**
-     * @param \DateTimeZone|string|bool|null $timezone The target timezone, null to use the default, false to leave unchanged
+     * @param \DateTimeZone|string|bool|null $timezone The target timezone, null to use the default, false to leave
+     *                                                 unchanged
      */
     public function formatDate(?\DateTimeInterface $date, ?string $dateFormat = 'medium', string $pattern = '', $timezone = null, string $calendar = 'gregorian', ?string $locale = null): ?string
     {
         return $this->formatDateTime($date, $dateFormat, 'none', $pattern, $timezone, $calendar, $locale);
     }
 
     /**
-     * @param \DateTimeZone|string|bool|null $timezone The target timezone, null to use the default, false to leave unchanged
+     * @param \DateTimeZone|string|bool|null $timezone The target timezone, null to use the default, false to leave
+     *                                                 unchanged
      */
     public function formatTime(?\DateTimeInterface $date, ?string $timeFormat = 'medium', string $pattern = '', $timezone = null, string $calendar = 'gregorian', ?string $locale = null): ?string
     {
@@ -261,14 +264,17 @@ private function createNumberFormatter(?string $locale, string $style, array $at
 
                 $value = self::NUMBER_PADDING_ATTRIBUTES[$value];
             }
+            /** @var int|float $value */
 
             $this->numberFormatters[$hash]->setAttribute(self::NUMBER_ATTRIBUTES[$name], $value);
         }
 
+        /** @var string $value */
         foreach ($textAttrs as $name => $value) {
             $this->numberFormatters[$hash]->setTextAttribute(self::NUMBER_TEXT_ATTRIBUTES[$name], $value);
         }
 
+        /** @var string $value */
         foreach ($symbols as $name => $value) {
             $this->numberFormatters[$hash]->setSymbol(self::NUMBER_SYMBOLS[$name], $value);
         }