Fix psalm issues

composer.json

@@ -91,7 +91,7 @@
         "symfony/maker-bundle": "^1.25",
         "symfony/phpunit-bridge": "^5.1.8",
         "symfony/yaml": "^4.4 || ^5.1",
-        "vimeo/psalm": "^4.7.2"
+        "vimeo/psalm": "^4.9.2"
     },
     "suggest": {
         "jms/translation-bundle": "Extract message keys from Admins",

phpstan-baseline.neon

@@ -78,12 +78,36 @@ parameters:
             count: 1
             path: src/Form/FormMapper.php
 
+        -
+            # will be fixed in v4. Currently BC break
+            message: "#^Method Sonata\\\\AdminBundle\\\\FieldDescription\\\\FieldDescriptionInterface\\:\\:getLabel\\(\\) invoked with 1 parameter, 0 required\\.$#"
+            count: 1
+            path: src/Show/ShowMapper.php
+
+        -
+            # will be fixed in v4. Currently BC break
+            message: "#^Method Sonata\\\\AdminBundle\\\\Admin\\\\AdminInterface\\<T of object\\>\\:\\:getShowGroups\\(\\) invoked with 1 parameter, 0 required\\.$#"
+            count: 1
+            path: src/Show/ShowMapper.php
+
+        -
+            # will be fixed in v4. Currently BC break
+            message: "#^Method Sonata\\\\AdminBundle\\\\Admin\\\\AdminInterface\\<T of object\\>\\:\\:getShowTabs\\(\\) invoked with 1 parameter, 0 required\\.$#"
+            count: 1
+            path: src/Show/ShowMapper.php
+
         -
             # will be fixed in v4. Currently BC break
             message: "#^Method Sonata\\\\AdminBundle\\\\Admin\\\\AdminInterface\\<T of object\\>\\:\\:getFormTabs\\(\\) invoked with 1 parameter, 0 required\\.$#"
             count: 1
             path: src/Form/FormMapper.php
 
+        -
+            # will be fixed in v4.
+            message: "#^Right side of && is always true\\.$#"
+            count: 1
+            path: src/Mapper/BaseGroupedMapper.php
+
         -
             # will be fixed in v4. Currently BC break
             message: "#^Negated boolean expression is always false\\.$#"

src/Admin/AdminExtensionInterface.php

@@ -43,21 +43,29 @@ interface AdminExtensionInterface
 {
     /**
      * @return void
+     *
+     * @phpstan-param FormMapper<T> $form
      */
     public function configureFormFields(FormMapper $form);
 
     /**
      * @return void
+     *
+     * @phpstan-param ListMapper<T> $list
      */
     public function configureListFields(ListMapper $list);
 
     /**
      * @return void
+     *
+     * @phpstan-param DatagridMapper<T> $filter
      */
     public function configureDatagridFilters(DatagridMapper $filter);
 
     /**
      * @return void
+     *
+     * @phpstan-param ShowMapper<T> $show
      */
     public function configureShowFields(ShowMapper $show);
 

src/Datagrid/DatagridMapper.php

@@ -30,6 +30,7 @@
  *
  * @phpstan-template T of object
  * @phpstan-implements MapperInterface<T>
+ * @phpstan-extends BaseMapper<T>
  */
 class DatagridMapper extends BaseMapper implements MapperInterface
 {

src/Datagrid/ListMapper.php

@@ -31,6 +31,7 @@
  *
  * @phpstan-template T of object
  * @phpstan-implements MapperInterface<T>
+ * @phpstan-extends BaseMapper<T>
  */
 class ListMapper extends BaseMapper implements MapperInterface
 {

src/Mapper/BaseGroupedMapper.php

@@ -24,6 +24,7 @@
  *
  * @phpstan-template T of object
  * @phpstan-implements MapperInterface<T>
+ * @phpstan-extends BaseMapper<T>
  */
 abstract class BaseGroupedMapper extends BaseMapper implements MapperInterface
 {

src/Mapper/BaseMapper.php

@@ -22,11 +22,14 @@
  * This class is used to simulate the Form API.
  *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * @phpstan-template T of object
  */
 abstract class BaseMapper
 {
     /**
      * @var AdminInterface
+     * @phpstan-var AdminInterface<T>
      */
     protected $admin;
 
@@ -35,6 +38,9 @@ abstract class BaseMapper
      */
     protected $builder;
 
+    /**
+     * @phpstan-param AdminInterface<T> $admin
+     */
     public function __construct(BuilderInterface $builder, AdminInterface $admin)
     {
         @trigger_error(sprintf(
@@ -46,6 +52,9 @@ public function __construct(BuilderInterface $builder, AdminInterface $admin)
         $this->admin = $admin;
     }
 
+    /**
+     * @phpstan-return AdminInterface<T>
+     */
     public function getAdmin()
     {
         return $this->admin;

src/Security/Handler/AclSecurityHandler.php

@@ -165,8 +165,6 @@ public function getObjectAcl(ObjectIdentityInterface $objectIdentity)
     {
         try {
             $acl = $this->aclProvider->findAcl($objectIdentity);
-            // todo - remove `assert` statement after https://github.com/phpstan/phpstan-symfony/pull/92 is released
-            \assert($acl instanceof MutableAclInterface);
         } catch (AclNotFoundException $e) {
             return null;
         }

src/Security/Handler/AclSecurityHandlerInterface.php

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