Add more typehints

src/Admin/AbstractAdmin.php

@@ -1413,7 +1413,7 @@ final public function getPersistentParameters(): array
         return $parameters;
     }
 
-    final public function getPersistentParameter(string $name, $default = null)
+    final public function getPersistentParameter(string $name, $default = null): mixed
     {
         $parameters = $this->getPersistentParameters();
 

src/FieldDescription/BaseFieldDescription.php

@@ -177,7 +177,7 @@ final public function getName(): string
         return $this->name;
     }
 
-    final public function getOption(string $name, mixed $default = null)
+    final public function getOption(string $name, mixed $default = null): mixed
     {
         return $this->options[$name] ?? $default;
     }
@@ -324,15 +324,12 @@ final public function mergeOption(string $name, array $options = []): void
         $this->options[$name] = array_merge($this->options[$name], $options);
     }
 
-    final public function getMappingType()
+    final public function getMappingType(): int|string|null
     {
         return $this->mappingType;
     }
 
-    /**
-     * @return string|false|null
-     */
-    final public function getLabel()
+    final public function getLabel(): string|false|null
     {
         return $this->getOption('label');
     }
@@ -352,7 +349,7 @@ final public function getSortParentAssociationMapping(): array
         return $this->getOption('sort_parent_association_mappings');
     }
 
-    final public function getTranslationDomain()
+    final public function getTranslationDomain(): string|false
     {
         return $this->getOption('translation_domain') ?? $this->getAdmin()->getTranslationDomain();
     }
@@ -384,10 +381,8 @@ abstract protected function setParentAssociationMappings(array $parentAssociatio
 
     /**
      * @throws NoValueException
-     *
-     * @return mixed
      */
-    final protected function getFieldValue(?object $object, string $fieldName)
+    final protected function getFieldValue(?object $object, string $fieldName): mixed
     {
         if ($this->isVirtual() || null === $object) {
             return null;

src/Filter/Filter.php

@@ -72,7 +72,7 @@ final public function getFormName(): string
         return str_replace('.', '__', $this->getName());
     }
 
-    final public function getOption(string $name, $default = null)
+    final public function getOption(string $name, $default = null): mixed
     {
         if (\array_key_exists($name, $this->options)) {
             return $this->options[$name];
@@ -96,7 +96,7 @@ final public function getFieldOptions(): array
         return $this->getOption('field_options', []);
     }
 
-    final public function getFieldOption(string $name, $default = null)
+    final public function getFieldOption(string $name, $default = null): mixed
     {
         if (isset($this->options['field_options'][$name]) && \is_array($this->options['field_options'])) {
             return $this->options['field_options'][$name];
@@ -110,7 +110,7 @@ final public function setFieldOption(string $name, $value): void
         $this->options['field_options'][$name] = $value;
     }
 
-    final public function getLabel()
+    final public function getLabel(): string|false|null
     {
         return $this->getOption('label');
     }

src/Filter/Model/FilterData.php

@@ -56,10 +56,7 @@ public static function fromArray(array $data): self
         return new self($type, \array_key_exists('value', $data), $data['value'] ?? null);
     }
 
-    /**
-     * @return mixed
-     */
-    public function getValue()
+    public function getValue(): mixed
     {
         if (!$this->hasValue) {
             throw new \LogicException('The FilterData object does not have a value.');

src/Form/Extension/Field/Type/FormTypeFieldExtension.php

@@ -201,10 +201,8 @@ public function configureOptions(OptionsResolver $resolver): void
      *
      * return the value related to FieldDescription, if the associated object does no
      * exists => a temporary one is created.
-     *
-     * @return mixed
      */
-    public function getValueFromFieldDescription(?object $object, FieldDescriptionInterface $fieldDescription)
+    public function getValueFromFieldDescription(?object $object, FieldDescriptionInterface $fieldDescription): mixed
     {
         @trigger_error(sprintf(
             'The method "%s()" is deprecated since sonata-project/admin-bundle 4.3 and will be removed in 5.0.',

src/Mapper/BaseGroupedMapper.php

@@ -45,7 +45,7 @@ abstract class BaseGroupedMapper implements MapperInterface
      *
      * @throws \LogicException
      *
-     * @return static
+     * @return $this
      */
     final public function with(string $name, array $options = []): self
     {
@@ -168,7 +168,7 @@ final public function with(string $name, array $options = []): self
     /**
      * Only nested add if the condition match true.
      *
-     * @return static
+     * @return $this
      */
     final public function ifTrue(bool $bool): self
     {
@@ -180,7 +180,7 @@ final public function ifTrue(bool $bool): self
     /**
      * Only nested add if the condition match false.
      *
-     * @return static
+     * @return $this
      */
     final public function ifFalse(bool $bool): self
     {
@@ -192,7 +192,7 @@ final public function ifFalse(bool $bool): self
     /**
      * @throws \LogicException
      *
-     * @return static
+     * @return $this
      */
     final public function ifEnd(): self
     {
@@ -210,7 +210,7 @@ final public function ifEnd(): self
      *
      * @param array<string, mixed> $options
      *
-     * @return static
+     * @return $this
      */
     final public function tab(string $name, array $options = []): self
     {
@@ -222,7 +222,7 @@ final public function tab(string $name, array $options = []): self
      *
      * @throws \LogicException
      *
-     * @return static
+     * @return $this
      */
     final public function end(): self
     {
@@ -256,9 +256,9 @@ final public function hasOpenTab(): bool
      * @param string $tab            The tab the group belongs to, defaults to 'default'
      * @param bool   $deleteEmptyTab Whether or not the Tab should be deleted, when the deleted group leaves the tab empty after deletion
      *
-     * @return static
+     * @return $this
      */
-    final public function removeGroup(string $group, string $tab = 'default', bool $deleteEmptyTab = false)
+    final public function removeGroup(string $group, string $tab = 'default', bool $deleteEmptyTab = false): self
     {
         $groups = $this->getGroups();
 
@@ -293,7 +293,7 @@ final public function removeGroup(string $group, string $tab = 'default', bool $
     /**
      * Removes a tab.
      *
-     * @return static
+     * @return $this
      */
     final public function removeTab(string $tab): self
     {

src/Object/Metadata.php

@@ -65,7 +65,7 @@ public function getOptions(): array
         return $this->options;
     }
 
-    public function getOption($name, $default = null)
+    public function getOption($name, $default = null): mixed
     {
         return \array_key_exists($name, $this->options) ? $this->options[$name] : $default;
     }

src/Route/RouteCollection.php

@@ -53,7 +53,7 @@ public function add(
         array $schemes = [],
         array $methods = [],
         string $condition = ''
-    ): RouteCollectionInterface {
+    ): self {
         $pattern = sprintf('%s/%s', $this->baseRoutePattern, $pattern ?? $name);
         $code = $this->getCode($name);
 
@@ -84,7 +84,7 @@ public function getCode(string $name): string
         return sprintf('%s.%s', $this->baseCodeRoute, $name);
     }
 
-    public function addCollection(RouteCollectionInterface $collection): RouteCollectionInterface
+    public function addCollection(RouteCollectionInterface $collection): self
     {
         foreach ($collection->getElements() as $code => $element) {
             $this->addElement($code, $element);
@@ -127,14 +127,14 @@ public function get(string $name): Route
         throw new \InvalidArgumentException(sprintf('Element "%s" does not exist.', $name));
     }
 
-    public function remove(string $name): RouteCollectionInterface
+    public function remove(string $name): self
     {
         unset($this->elements[$this->getCode($name)]);
 
         return $this;
     }
 
-    public function restore(string $name): RouteCollectionInterface
+    public function restore(string $name): self
     {
         if ($this->hasCached($name)) {
             $code = $this->getCode($name);
@@ -146,12 +146,7 @@ public function restore(string $name): RouteCollectionInterface
         throw new \InvalidArgumentException(sprintf('Element "%s" does not exist in cache.', $name));
     }
 
-    /**
-     * @param string|string[] $routeList
-     *
-     * @return static
-     */
-    public function clearExcept($routeList): RouteCollectionInterface
+    public function clearExcept($routeList): static
     {
         if (!\is_array($routeList)) {
             $routeList = [$routeList];
@@ -172,7 +167,7 @@ public function clearExcept($routeList): RouteCollectionInterface
         return $this;
     }
 
-    public function clear(): RouteCollectionInterface
+    public function clear(): self
     {
         $this->elements = [];
 

src/Security/Handler/AclSecurityHandler.php

@@ -256,7 +256,7 @@ public function deleteAcl(ObjectIdentityInterface $objectIdentity): void
         $this->aclProvider->deleteAcl($objectIdentity);
     }
 
-    public function findClassAceIndexByRole(MutableAclInterface $acl, string $role)
+    public function findClassAceIndexByRole(MutableAclInterface $acl, string $role): int|false
     {
         foreach ($acl->getClassAces() as $index => $entry) {
             $securityIdentity = $entry->getSecurityIdentity();
@@ -268,7 +268,7 @@ public function findClassAceIndexByRole(MutableAclInterface $acl, string $role)
         return false;
     }
 
-    public function findClassAceIndexByUsername(MutableAclInterface $acl, string $username)
+    public function findClassAceIndexByUsername(MutableAclInterface $acl, string $username): int|false
     {
         foreach ($acl->getClassAces() as $index => $entry) {
             $securityIdentity = $entry->getSecurityIdentity();

src/SonataConfiguration.php

@@ -66,10 +66,7 @@ public function getLogo(): string
         return $this->logo;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getOption(string $name, mixed $default = null)
+    public function getOption(string $name, mixed $default = null): mixed
     {
         return $this->options[$name] ?? $default;
     }

src/Twig/Extension/RenderElementExtension.php

@@ -146,10 +146,8 @@ public function renderViewElementCompare(
      * @deprecated since sonata-project/admin-bundle version 4.7 use RenderElementRuntime::renderRelationElement() instead
      *
      * @throws \RuntimeException
-     *
-     * @return mixed
      */
-    public function renderRelationElement(mixed $element, FieldDescriptionInterface $fieldDescription)
+    public function renderRelationElement(mixed $element, FieldDescriptionInterface $fieldDescription): mixed
     {
         @trigger_error(sprintf(
             'The method "%s()" is deprecated since sonata-project/admin-bundle 4.7 and will be removed in 5.0.'

src/Twig/Extension/SonataAdminExtension.php

@@ -36,7 +36,7 @@ public function __construct(
     /**
      * @return TwigFilter[]
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter(

src/Twig/RenderElementRuntime.php

@@ -125,10 +125,8 @@ public function renderViewElementCompare(
 
     /**
      * @throws \RuntimeException
-     *
-     * @return mixed
      */
-    public function renderRelationElement(mixed $element, FieldDescriptionInterface $fieldDescription)
+    public function renderRelationElement(mixed $element, FieldDescriptionInterface $fieldDescription): mixed
     {
         if (!\is_object($element)) {
             return $element;

src/Util/AdminObjectAclManipulator.php

@@ -226,8 +226,6 @@ private function buildForm(AdminObjectAclData $data, FormBuilderInterface $formB
 
     /**
      * Gets a user or a role security identity.
-     *
-     * @return RoleSecurityIdentity|UserSecurityIdentity
      */
     private function getSecurityIdentity(string|UserInterface $aclValue): SecurityIdentityInterface
     {

tests/App/AppKernel.php

@@ -83,8 +83,19 @@ protected function configureContainer(ContainerBuilder $containerBuilder, Loader
             ],
             'http_method_override' => false,
             'session' => [
+                'cookie_secure' => 'auto',
+                'cookie_samesite' => 'lax',
+                'save_path' => null,
                 'storage_factory_id' => 'session.storage.factory.mock_file',
             ],
+            'validation' => [
+                'email_validation_mode' => 'html5',
+            ],
+            'php_errors' => [
+                'log' => true,
+            ],
+            // Not present on all Symfony versions, since 6.3, need to add it conditionally
+            // 'handle_all_throwables' => true,
         ]);
 
         $securityConfig = [

tests/App/Datagrid/ProxyQuery.php

@@ -21,7 +21,7 @@
  */
 final class ProxyQuery implements ProxyQueryInterface
 {
-    public function execute()
+    public function execute(): iterable
     {
         throw new \BadMethodCallException('Not implemented.');
     }

tests/App/FieldDescription/FieldDescription.php

@@ -44,7 +44,7 @@ public function isIdentifier(): bool
         return false;
     }
 
-    public function getValue(object $object)
+    public function getValue(object $object): mixed
     {
         return $this->getFieldValue($object, $this->fieldName);
     }

tests/App/Model/ModelManager.php

@@ -114,7 +114,7 @@ public function addIdentifiersToQuery(string $class, ProxyQueryInterface $query,
     {
     }
 
-    public function getLockVersion(object $object)
+    public function getLockVersion(object $object): mixed
     {
         return null;
     }

tests/App/Model/RepositoryInterface.php

@@ -21,7 +21,7 @@ interface RepositoryInterface
     /**
      * @return T|null
      */
-    public function byId(string $id);
+    public function byId(string $id): ?EntityInterface;
 
     /**
      * @return array<T>

tests/Datagrid/PagerTest.php

@@ -226,10 +226,8 @@ public function testGetPreviousPage(): void
 
     /**
      * @param mixed[] $args
-     *
-     * @return mixed
      */
-    protected function callMethod(object $obj, string $name, array $args = [])
+    protected function callMethod(object $obj, string $name, array $args = []): mixed
     {
         $class = new \ReflectionClass($obj);
         $method = $class->getMethod($name);