Fix

src/Admin/AbstractAdmin.php

@@ -2411,7 +2411,8 @@ private function buildDatagrid(): ?DatagridInterface
 
         $this->datagrid->getPager()->setMaxPageLinks($this->getMaxPageLinks());
 
-        $mapper = new DatagridMapper($this->getDatagridBuilder(), $this->datagrid, $this);
+        /** @psalm-suppress InvalidArgument https://github.com/vimeo/psalm/issues/8423 */
+        $mapper = new DatagridMapper($this->getDatagridBuilder(), $this->datagrid, $admin);
 
         // build the datagrid filter
         $this->configureDatagridFilters($mapper);

src/Admin/AdminHelper.php

@@ -78,11 +78,11 @@ public function getChildFormView(FormView $formView, string $elementId): ?FormVi
      * Note:
      *   This code is ugly, but there is no better way of doing it.
      *
+     * @return array{FieldDescriptionInterface|null, FormInterface}
+     *
      * @throws \RuntimeException
      * @throws \Exception
      *
-     * @return array{FieldDescriptionInterface|null, FormInterface}
-     *
      * @phpstan-template T of object
      * @phpstan-param AdminInterface<T> $admin
      */

src/Admin/Pool.php

@@ -186,9 +186,9 @@ public function hasAdminByClass(string $class): bool
      * Returns an admin class by its Admin code
      * ie : sonata.news.admin.post|sonata.news.admin.comment => return the child class of post.
      *
-     * @throws AdminCodeNotFoundException
-     *
      * @return AdminInterface<object>
+     *
+     * @throws AdminCodeNotFoundException
      */
     public function getAdminByAdminCode(string $adminCode): AdminInterface
     {
@@ -237,11 +237,11 @@ public function hasAdminByAdminCode(string $adminCode): bool
     }
 
     /**
+     * @return AdminInterface<object>
+     *
      * @throws AdminClassNotFoundException if there is no admin for the field description target model
      * @throws TooManyAdminClassException  if there is too many admin for the field description target model
      * @throws AdminCodeNotFoundException  if the admin_code option is invalid
-     *
-     * @return AdminInterface<object>
      */
     public function getAdminByFieldDescription(FieldDescriptionInterface $fieldDescription): AdminInterface
     {
@@ -262,9 +262,9 @@ public function getAdminByFieldDescription(FieldDescriptionInterface $fieldDescr
     /**
      * Returns a new admin instance depends on the given code.
      *
-     * @throws AdminCodeNotFoundException if the code is not found in admin pool
-     *
      * @return AdminInterface<object>
+     *
+     * @throws AdminCodeNotFoundException if the code is not found in admin pool
      */
     public function getInstance(string $id): AdminInterface
     {

src/Block/AdminPreviewBlockService.php

@@ -79,9 +79,9 @@ public function configureSettings(OptionsResolver $resolver): void
     }
 
     /**
-     * @throws \InvalidArgumentException if the provided admin code is invalid
-     *
      * @return AdminInterface<object>
+     *
+     * @throws \InvalidArgumentException if the provided admin code is invalid
      */
     private function getAdmin(string $code): AdminInterface
     {

src/Controller/CRUDController.php

@@ -1075,9 +1075,9 @@ protected function handleModelManagerException(\Exception $exception): void
     /**
      * NEXT_MAJOR: Add typehint.
      *
-     * @throws ModelManagerThrowable
-     *
      * @return string|null A custom error message to display in the flag bag instead of the generic one
+     *
+     * @throws ModelManagerThrowable
      */
     protected function handleModelManagerThrowable(ModelManagerThrowable $exception)
     {

src/Datagrid/DatagridMapper.php

@@ -70,10 +70,10 @@ public function getAdmin(): AdminInterface
      * @param array<string, mixed> $filterOptions
      * @param array<string, mixed> $fieldDescriptionOptions
      *
-     * @throws \LogicException
-     *
      * @return static
      *
+     * @throws \LogicException
+     *
      * @phpstan-param class-string|null $type
      * @phpstan-param FieldDescriptionOptions $fieldDescriptionOptions
      */

src/Datagrid/ListMapper.php

@@ -89,10 +89,10 @@ public function addIdentifier(string $name, ?string $type = null, array $fieldDe
     /**
      * @param array<string, mixed> $fieldDescriptionOptions
      *
-     * @throws \LogicException
-     *
      * @return static
      *
+     * @throws \LogicException
+     *
      * @phpstan-param FieldDescriptionOptions $fieldDescriptionOptions
      */
     public function add(string $name, ?string $type = null, array $fieldDescriptionOptions = []): self

src/FieldDescription/BaseFieldDescription.php

@@ -373,9 +373,9 @@ abstract protected function setAssociationMapping(array $associationMapping): vo
     abstract protected function setParentAssociationMappings(array $parentAssociationMappings): void;
 
     /**
-     * @throws NoValueException
-     *
      * @return mixed
+     *
+     * @throws NoValueException
      */
     final protected function getFieldValue(?object $object, string $fieldName)
     {

src/FieldDescription/FieldDescriptionInterface.php

@@ -137,9 +137,9 @@ public function setParent(AdminInterface $parent): void;
     /**
      * Returns the parent Admin (only used in nested admin).
      *
-     * @throws \LogicException
-     *
      * @return AdminInterface<object>
+     *
+     * @throws \LogicException
      */
     public function getParent(): AdminInterface;
 
@@ -186,9 +186,9 @@ public function setAssociationAdmin(AdminInterface $associationAdmin): void;
     /**
      * Returns the associated Admin instance (only used if the field is linked to an Admin).
      *
-     * @throws \LogicException
-     *
      * @return AdminInterface<object>
+     *
+     * @throws \LogicException
      */
     public function getAssociationAdmin(): AdminInterface;
 
@@ -217,9 +217,9 @@ public function isIdentifier(): bool;
     /**
      * Returns the value linked to the description.
      *
-     * @throws NoValueException if the value cannot be determined
-     *
      * @return mixed
+     *
+     * @throws NoValueException if the value cannot be determined
      */
     public function getValue(object $object);
 
@@ -232,9 +232,9 @@ public function getValue(object $object);
     public function setAdmin(AdminInterface $admin): void;
 
     /**
-     * @throws \LogicException
-     *
      * @return AdminInterface<object>
+     *
+     * @throws \LogicException
      */
     public function getAdmin(): AdminInterface;
 

src/Filter/FilterInterface.php

@@ -93,16 +93,16 @@ public function getFieldName(): string;
     public function getParentAssociationMappings(): array;
 
     /**
-     * @throws \RuntimeException if the `field_mapping` option is not set
-     *
      * @return array<string, mixed> field mapping
+     *
+     * @throws \RuntimeException if the `field_mapping` option is not set
      */
     public function getFieldMapping(): array;
 
     /**
-     * @throws \RuntimeException if the `association_mapping` option is not set
-     *
      * @return array<string, mixed> association mapping
+     *
+     * @throws \RuntimeException if the `association_mapping` option is not set
      */
     public function getAssociationMapping(): array;
 

src/Form/DataTransformer/ModelToIdPropertyTransformer.php

@@ -80,10 +80,10 @@ public function __construct(
     /**
      * @param int|string|array<int|string|array<string>>|null $value
      *
-     * @throws \UnexpectedValueException
-     *
      * @return Collection<int|string, object>|object|null
      *
+     * @throws \UnexpectedValueException
+     *
      * @psalm-param int|string|(array{_labels?: array<string>}&array<int|string>)|null $value
      * @phpstan-param int|string|array<int|string|array<string>>|null $value
      * @phpstan-return Collection<array-key, T>|T|null
@@ -118,10 +118,10 @@ public function reverseTransform($value)
     /**
      * @param object|array<object>|\Traversable<object>|null $value
      *
-     * @throws \InvalidArgumentException
-     *
      * @return array<string|int, int|string|array<string>>
      *
+     * @throws \InvalidArgumentException
+     *
      * @phpstan-param T|array<T>|\Traversable<T>|null $value
      * @psalm-return array{_labels?: array<string>}&array<int|string>
      * @phpstan-return array<int|string|array<string>>

src/Form/DataTransformer/ModelsToArrayTransformer.php

@@ -87,10 +87,10 @@ public function transform($value): array
     /**
      * @param array<int|string>|null $value
      *
-     * @throws UnexpectedTypeException
-     *
      * @return Collection<int|string, object>|null
      *
+     * @throws UnexpectedTypeException
+     *
      * @phpstan-return Collection<array-key, T>|null
      */
     public function reverseTransform($value)

src/Mapper/BaseGroupedMapper.php

@@ -43,9 +43,9 @@ abstract class BaseGroupedMapper implements MapperInterface
      *
      * @param array<string, mixed> $options
      *
-     * @throws \LogicException
-     *
      * @return static
+     *
+     * @throws \LogicException
      */
     final public function with(string $name, array $options = []): self
     {
@@ -190,9 +190,9 @@ final public function ifFalse(bool $bool): self
     }
 
     /**
-     * @throws \LogicException
-     *
      * @return static
+     *
+     * @throws \LogicException
      */
     final public function ifEnd(): self
     {
@@ -220,9 +220,9 @@ final public function tab(string $name, array $options = []): self
     /**
      * Close the current group or tab.
      *
-     * @throws \LogicException
-     *
      * @return static
+     *
+     * @throws \LogicException
      */
     final public function end(): self
     {

src/Request/AdminFetcherInterface.php

@@ -20,10 +20,10 @@
 interface AdminFetcherInterface
 {
     /**
+     * @return AdminInterface<object>
+     *
      * @throws \InvalidArgumentException  if the admin code is not found in the request
      * @throws AdminCodeNotFoundException if no admin was found for the admin code provided
-     *
-     * @return AdminInterface<object>
      */
     public function get(Request $request): AdminInterface;
 }

src/Route/RouteCollectionInterface.php

@@ -68,9 +68,9 @@ public function get(string $name): Route;
     public function remove(string $name): self;
 
     /**
-     * @throws \InvalidArgumentException
-     *
      * @return static
+     *
+     * @throws \InvalidArgumentException
      */
     public function restore(string $name): self;
 

src/Route/RoutesCache.php

@@ -35,10 +35,10 @@ public function __construct(string $cacheFolder, bool $debug)
     /**
      * @param AdminInterface<object> $admin
      *
-     * @throws \RuntimeException
-     *
      * @return array<string, string>
      *
+     * @throws \RuntimeException
+     *
      * @phpstan-template T of object
      * @phpstan-param AdminInterface<T> $admin
      */

src/Security/Handler/AclSecurityHandlerInterface.php

@@ -63,9 +63,9 @@ public function getObjectAcl(ObjectIdentityInterface $objectIdentity): ?MutableA
      * @param \Traversable<ObjectIdentityInterface> $oids
      * @param SecurityIdentityInterface[]           $sids
      *
-     * @throws \Exception
-     *
      * @return \SplObjectStorage<ObjectIdentityInterface, MutableAclInterface> mapping the passed object identities to ACLs
+     *
+     * @throws \Exception
      */
     public function findObjectAcls(\Traversable $oids, array $sids = []): \SplObjectStorage;
 

src/Show/ShowMapper.php

@@ -65,10 +65,10 @@ public function getAdmin(): AdminInterface
     }
 
     /**
-     * @throws \LogicException
-     *
      * @return static
      *
+     * @throws \LogicException
+     *
      * @phpstan-param FieldDescriptionOptions $fieldDescriptionOptions
      */
     public function add(string $name, ?string $type = null, array $fieldDescriptionOptions = []): self

src/Twig/Extension/RenderElementExtension.php

@@ -152,9 +152,9 @@ public function renderViewElementCompare(
      *
      * @param mixed $element
      *
-     * @throws \RuntimeException
-     *
      * @return mixed
+     *
+     * @throws \RuntimeException
      */
     public function renderRelationElement($element, FieldDescriptionInterface $fieldDescription)
     {

src/Twig/RenderElementRuntime.php

@@ -128,9 +128,9 @@ public function renderViewElementCompare(
     /**
      * @param mixed $element
      *
-     * @throws \RuntimeException
-     *
      * @return mixed
+     *
+     * @throws \RuntimeException
      */
     public function renderRelationElement($element, FieldDescriptionInterface $fieldDescription)
     {
@@ -174,9 +174,9 @@ public function renderRelationElement($element, FieldDescriptionInterface $field
      *
      * @param object|mixed[] $listElement
      *
-     * @throws \TypeError when $listElement is not an object or an array with an object on offset 0
-     *
      * @return array{object, mixed} An array containing object and value
+     *
+     * @throws \TypeError when $listElement is not an object or an array with an object on offset 0
      */
     private function getObjectAndValueFromListElement(
         $listElement,

src/Util/ObjectAclManipulator.php

@@ -30,10 +30,10 @@ abstract class ObjectAclManipulator implements ObjectAclManipulatorInterface
      * @param AdminInterface<object>                $admin
      * @param \Traversable<ObjectIdentityInterface> $oids
      *
-     * @throws \Exception
-     *
      * @return array{int, int} [countAdded, countUpdated]
      *
+     * @throws \Exception
+     *
      * @phpstan-template T of object
      * @phpstan-param AdminInterface<T> $admin
      */

src/Util/TraversableToCollection.php

@@ -28,10 +28,10 @@ final class TraversableToCollection
      *
      * @param iterable<mixed, mixed> $value
      *
-     * @throws \TypeError
-     *
      * @return Collection<int|string, mixed>
      *
+     * @throws \TypeError
+     *
      * @phpstan-template T
      * @phpstan-param iterable<mixed, T> $value
      * @phpstan-return Collection<array-key, T>