Fix phpstan errors for tests

composer.json

@@ -74,8 +74,9 @@
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^0.12.29",
-        "phpstan/phpstan-symfony": "^0.12.10",
+        "phpstan/phpstan": "^0.12.82",
+        "phpstan/phpstan-phpunit": "^0.12.18",
+        "phpstan/phpstan-symfony": "^0.12.21",
         "psalm/plugin-symfony": "^2.0",
         "psr/event-dispatcher": "^1.0",
         "sonata-project/intl-bundle": "^2.4",
@@ -107,5 +108,13 @@
         "psr-4": {
             "Sonata\\AdminBundle\\Tests\\": "tests/"
         }
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/simple-phpunit install"
+        ],
+        "post-update-cmd": [
+            "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/simple-phpunit install"
+        ]
     }
 }

phpstan.neon.dist

@@ -1,7 +1,10 @@
 parameters:
     level: 5
+    bootstrapFiles:
+        - vendor/bin/.phpunit/phpunit/vendor/autoload.php
     paths:
         - src
+        - tests
     excludes_analyse:
         # temporarily ignore template files
         - src/Resources/**.tpl.php

src/Admin/AdminInterface.php

@@ -357,8 +357,6 @@ public function setSubClasses(array $subClasses): void;
 
     /**
      * Returns true if the admin has the sub classes.
-     *
-     * @phpstan-param class-string<T> $name
      */
     public function hasSubClass(string $name): bool;
 

src/Admin/Pool.php

@@ -67,6 +67,14 @@ final class Pool
      */
     private $adminClasses = [];
 
+    /**
+     * @param string[]                            $adminServices
+     * @param array<string, array<string, mixed>> $adminGroups
+     * @param array<class-string, string[]>       $adminClasses
+     *
+     * @phpstan-param array<string, array<string, mixed>> $adminGroups
+     * @psalm-param array<string, Group> $adminGroups
+     */
     public function __construct(
         ContainerInterface $container,
         array $adminServices = [],

src/FieldDescription/FieldDescriptionInterface.php

@@ -231,7 +231,7 @@ public function hasAdmin(): bool;
     /**
      * Merge option values related to the provided option name.
      *
-     * @param array<string, mixed> $options
+     * @param mixed[] $options
      *
      * @throws \RuntimeException
      */

src/Filter/FilterInterface.php

@@ -57,6 +57,11 @@ public function setLabel($label): void;
      */
     public function getDefaultOptions(): array;
 
+    /**
+     * @return array<string, mixed>
+     */
+    public function getOptions(): array;
+
     /**
      * @param mixed $default
      *
@@ -80,7 +85,7 @@ public function initialize(string $name, array $options = []): void;
     public function getFieldName(): string;
 
     /**
-     * @return array<string, string> array of mappings
+     * @return array<array<string, mixed>> array of mappings
      */
     public function getParentAssociationMappings(): array;
 

src/Form/DataTransformer/ModelToIdPropertyTransformer.php

@@ -122,13 +122,13 @@ public function reverseTransform($value)
     }
 
     /**
-     * @param object|object[]|null $value
+     * @param object|object[]|\ArrayAccess<string|int, object>|null $value
      *
      * @throws \InvalidArgumentException
      *
      * @return array<string|int, int|string|array<string>>
      *
-     * @phpstan-param T|T[]|null $value
+     * @phpstan-param T|T[]|\ArrayAccess<string|int, T>|null $value
      */
     public function transform($value)
     {

src/Route/RouteCollectionInterface.php

@@ -24,8 +24,8 @@ interface RouteCollectionInterface
      * @param array<string, mixed>  $defaults
      * @param array<string, string> $requirements
      * @param array<string, mixed>  $options
-     * @param array<string, string> $schemes
-     * @param array<string, string> $methods
+     * @param string[]              $schemes
+     * @param string[]              $methods
      *
      * @return static
      */

tests/Action/AppendFormFieldElementActionTest.php

@@ -13,9 +13,9 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Action\AppendFormFieldElementAction;
-use Sonata\AdminBundle\Action\GetShortObjectDescriptionAction;
 use Sonata\AdminBundle\Admin\AdminHelper;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\Pool;
@@ -37,34 +37,34 @@ final class AppendFormFieldElementActionTest extends TestCase
     private $pool;
 
     /**
-     * @var Environment
+     * @var Environment&MockObject
      */
     private $twig;
 
     /**
-     * @var GetShortObjectDescriptionAction
+     * @var AppendFormFieldElementAction
      */
     private $action;
 
     /**
-     * @var AdminInterface
+     * @var AdminInterface&MockObject
      */
     private $admin;
 
     /**
-     * @var AdminHelper
+     * @var AdminHelper&MockObject
      */
     private $helper;
 
     protected function setUp(): void
     {
-        $this->twig = $this->createStub(Environment::class);
+        $this->twig = $this->createMock(Environment::class);
         $this->admin = $this->createMock(AdminInterface::class);
         $this->admin->expects($this->once())->method('setRequest');
         $container = new Container();
         $container->set('sonata.post.admin', $this->admin);
         $this->pool = new Pool($container, ['sonata.post.admin']);
-        $this->helper = $this->createStub(AdminHelper::class);
+        $this->helper = $this->createMock(AdminHelper::class);
         $this->action = new AppendFormFieldElementAction(
             $this->twig,
             $this->pool,

tests/Action/DashboardActionTest.php

@@ -13,6 +13,7 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Action\DashboardAction;
 use Sonata\AdminBundle\Admin\BreadcrumbsBuilderInterface;
@@ -26,7 +27,7 @@
 class DashboardActionTest extends TestCase
 {
     /**
-     * @var MutableTemplateRegistryInterface
+     * @var MutableTemplateRegistryInterface&Stub
      */
     private $templateRegistry;
 

tests/Action/GetShortObjectDescriptionActionTest.php

@@ -13,6 +13,7 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Action\GetShortObjectDescriptionAction;
 use Sonata\AdminBundle\Admin\AdminInterface;
@@ -42,7 +43,7 @@ final class GetShortObjectDescriptionActionTest extends TestCase
     private $action;
 
     /**
-     * @var AdminInterface
+     * @var AdminInterface&MockObject
      */
     private $admin;
 

tests/Action/RetrieveAutocompleteItemsActionTest.php

@@ -13,9 +13,8 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
-use PHPUnit\Framework\MockObject\Stub;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Sonata\AdminBundle\Action\GetShortObjectDescriptionAction;
 use Sonata\AdminBundle\Action\RetrieveAutocompleteItemsAction;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\Pool;
@@ -39,12 +38,12 @@ final class RetrieveAutocompleteItemsActionTest extends TestCase
     private $pool;
 
     /**
-     * @var GetShortObjectDescriptionAction
+     * @var RetrieveAutocompleteItemsAction
      */
     private $action;
 
     /**
-     * @var AdminInterface
+     * @var AdminInterface&MockObject
      */
     private $admin;
 
@@ -230,12 +229,12 @@ public function testRetrieveAutocompleteItemsComplexProperty(): void
         $this->assertSame('{"status":"OK","more":false,"items":[{"id":"123","label":"FOO"}]}', $response->getContent());
     }
 
-    private function configureAutocompleteItemsDatagrid(): Stub
+    private function configureAutocompleteItemsDatagrid(): MockObject
     {
         $model = new \stdClass();
 
         $targetAdmin = $this->createMock(AdminInterface::class);
-        $datagrid = $this->createStub(DatagridInterface::class);
+        $datagrid = $this->createMock(DatagridInterface::class);
         $metadata = $this->createStub(MetadataInterface::class);
         $pager = $this->createStub(PagerInterface::class);
         $fieldDescription = $this->createStub(FieldDescriptionInterface::class);

tests/Action/RetrieveFormFieldElementActionTest.php

@@ -13,8 +13,8 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Sonata\AdminBundle\Action\GetShortObjectDescriptionAction;
 use Sonata\AdminBundle\Action\RetrieveFormFieldElementAction;
 use Sonata\AdminBundle\Admin\AdminHelper;
 use Sonata\AdminBundle\Admin\AdminInterface;
@@ -37,34 +37,34 @@ final class RetrieveFormFieldElementActionTest extends TestCase
     private $pool;
 
     /**
-     * @var GetShortObjectDescriptionAction
+     * @var RetrieveFormFieldElementAction
      */
     private $action;
 
     /**
-     * @var AdminInterface
+     * @var AdminInterface&MockObject
      */
     private $admin;
 
     /**
-     * @var Environment
+     * @var Environment&MockObject
      */
     private $twig;
 
     /**
-     * @var AdminHelper
+     * @var AdminHelper&MockObject
      */
     private $helper;
 
     protected function setUp(): void
     {
-        $this->twig = $this->createStub(Environment::class);
+        $this->twig = $this->createMock(Environment::class);
         $this->admin = $this->createMock(AdminInterface::class);
         $this->admin->expects($this->once())->method('setRequest');
         $container = new Container();
         $container->set('sonata.post.admin', $this->admin);
         $this->pool = new Pool($container, ['sonata.post.admin']);
-        $this->helper = $this->createStub(AdminHelper::class);
+        $this->helper = $this->createMock(AdminHelper::class);
         $this->action = new RetrieveFormFieldElementAction(
             $this->twig,
             $this->pool,

tests/Action/SearchActionTest.php

@@ -13,6 +13,7 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Action\SearchAction;
@@ -50,7 +51,7 @@ final class SearchActionTest extends TestCase
     private $action;
 
     /**
-     * @var Stub&Environment
+     * @var MockObject&Environment
      */
     private $twig;
 
@@ -70,7 +71,7 @@ protected function setUp(): void
 
         $this->breadcrumbsBuilder = $this->createStub(BreadcrumbsBuilderInterface::class);
         $this->searchHandler = new SearchHandler(true);
-        $this->twig = $this->createStub(Environment::class);
+        $this->twig = $this->createMock(Environment::class);
 
         $this->action = new SearchAction(
             $this->pool,

tests/Action/SetObjectFieldValueActionTest.php

@@ -13,6 +13,7 @@
 
 namespace Sonata\AdminBundle\Tests\Action;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Sonata\AdminBundle\Action\SetObjectFieldValueAction;
 use Sonata\AdminBundle\Admin\AdminInterface;
@@ -52,17 +53,17 @@ final class SetObjectFieldValueActionTest extends TestCase
     private $action;
 
     /**
-     * @var AdminInterface
+     * @var AdminInterface&MockObject
      */
     private $admin;
 
     /**
-     * @var ValidatorInterface
+     * @var ValidatorInterface&MockObject
      */
     private $validator;
 
     /**
-     * @var ModelManagerInterface
+     * @var ModelManagerInterface&MockObject
      */
     private $modelManager;
 
@@ -93,8 +94,8 @@ protected function setUp(): void
         $container->set($this->adminCode, $this->admin);
         $this->pool = new Pool($container, [$this->adminCode]);
         $this->admin->expects($this->once())->method('setRequest');
-        $this->validator = $this->createStub(ValidatorInterface::class);
-        $this->modelManager = $this->createStub(ModelManagerInterface::class);
+        $this->validator = $this->createMock(ValidatorInterface::class);
+        $this->modelManager = $this->createMock(ModelManagerInterface::class);
         $this->resolver = new DataTransformerResolver();
         $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
         $this->action = new SetObjectFieldValueAction(

tests/Admin/AdminHelperTest.php

@@ -336,7 +336,7 @@ public function testAppendFormFieldElementWithoutFormFieldDescriptionInAdminAndN
 
         $this->expectException(\TypeError::class);
         $this->expectExceptionMessage(sprintf('Collection must be an instance of %s, "%s" given.', Collection::class, \gettype(null)));
-        $this->helper->appendFormFieldElement($admin, $foo, 'test_bar')[1];
+        $this->helper->appendFormFieldElement($admin, $foo, 'test_bar');
     }
 
     public function testAppendFormFieldElementWithCollection(): void