Fix

sonata-project · Sep 28, 2023 · 99777c8 · 99777c8
1 parent cfa6fb1
commit 99777c8
Show file tree

Hide file tree

Showing 21 changed files with 65 additions and 37 deletions.
diff --git a/src/Datagrid/Datagrid.php b/src/Datagrid/Datagrid.php
@@ -154,7 +154,7 @@ public function getValues(): array
         return $this->values;
     }
 
-    public function setValue(string $name, ?string $operator, $value): void
+    public function setValue(string $name, ?string $operator, mixed $value): void
     {
         $this->values[$name] = [
             'type' => $operator,

diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
@@ -330,7 +330,7 @@ public function testConfigureWithValidParentAssociationMapping(): void
     /**
      * @phpstan-return iterable<array-key, array{class-string, string}>
      *
-     * @psalm-suppress InvalidReturnType, InvalidReturnStatement
+     * @psalm-suppress MoreSpecificReturnType
      */
     public function provideGetBaseRoutePattern(): iterable
     {
@@ -339,58 +339,72 @@ public function provideGetBaseRoutePattern(): iterable
             'Application\Sonata\NewsBundle\Entity\Post',
             '/sonata/news/post',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Application\Sonata\NewsBundle\Document\Post',
             '/sonata/news/post',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Post',
             '/myapplication/my/post',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Post\Category',
             '/myapplication/my/post-category',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Product\Category',
             '/myapplication/my/product-category',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Other\Product\Category',
             '/myapplication/my/other-product-category',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Document\Menu',
             '/cmf/foo/menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\Phpcr\Menu',
             '/cmf/foo/menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Bundle\BarBarBundle\Doctrine\Phpcr\Menu',
             '/symfony/barbar/menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Bundle\BarBarBundle\Doctrine\Phpcr\Menu\Item',
             '/symfony/barbar/menu-item',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\Orm\Menu',
             '/cmf/foo/menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\MongoDB\Menu',
             '/cmf/foo/menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\CouchDB\Menu',
             '/cmf/foo/menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'AppBundle\Entity\User',
             '/app/user',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'App\Entity\User',
             '/app/user',
@@ -483,7 +497,7 @@ public function testGetBaseRoutePatternWithUnrecognizedClassname(): void
     /**
      * @phpstan-return iterable<array-key, array{class-string, string}>
      *
-     * @psalm-suppress InvalidReturnType, InvalidReturnStatement
+     * @psalm-suppress MoreSpecificReturnType
      */
     public function provideGetBaseRouteName(): iterable
     {
@@ -492,58 +506,72 @@ public function provideGetBaseRouteName(): iterable
             'Application\Sonata\NewsBundle\Entity\Post',
             'admin_sonata_news_post',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Application\Sonata\NewsBundle\Document\Post',
             'admin_sonata_news_post',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Post',
             'admin_myapplication_my_post',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Post\Category',
             'admin_myapplication_my_post_category',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Product\Category',
             'admin_myapplication_my_product_category',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'MyApplication\MyBundle\Entity\Other\Product\Category',
             'admin_myapplication_my_other_product_category',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Document\Menu',
             'admin_cmf_foo_menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\Phpcr\Menu',
             'admin_cmf_foo_menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Bundle\BarBarBundle\Doctrine\Phpcr\Menu',
             'admin_symfony_barbar_menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Bundle\BarBarBundle\Doctrine\Phpcr\Menu\Item',
             'admin_symfony_barbar_menu_item',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\Orm\Menu',
             'admin_cmf_foo_menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\MongoDB\Menu',
             'admin_cmf_foo_menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'Symfony\Cmf\Bundle\FooBundle\Doctrine\CouchDB\Menu',
             'admin_cmf_foo_menu',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'AppBundle\Entity\User',
             'admin_app_user',
         ];
+        // @phpstan-ignore-next-line
         yield [
             'App\Entity\User',
             'admin_app_user',

diff --git a/tests/Admin/BreadcrumbsBuilderTest.php b/tests/Admin/BreadcrumbsBuilderTest.php
@@ -134,7 +134,7 @@ public function testChildGetBreadCrumbs(): void
     }
 
     /**
-     * @phpstan-return array<array{string}>
+     * @phpstan-return iterable<array{string}>
      */
     public function provideBuildBreadcrumbsCases(): iterable
     {

diff --git a/tests/Form/DataTransformer/ModelToIdPropertyTransformerTest.php b/tests/Form/DataTransformer/ModelToIdPropertyTransformerTest.php
@@ -160,7 +160,7 @@ public function testReverseTransformMultipleInvalidTypeTests(mixed $params, stri
     }
 
     /**
-     * @phpstan-return array<array{mixed, string}>
+     * @phpstan-return iterable<array{mixed, string}>
      */
     public function provideReverseTransformMultipleInvalidTypeTestsCases(): iterable
     {

diff --git a/tests/Form/DataTransformer/ModelToIdTransformerTest.php b/tests/Form/DataTransformer/ModelToIdTransformerTest.php
@@ -48,7 +48,7 @@ public function testReverseTransform(int|string $value): void
     }
 
     /**
-     * @return array<array{int|string}>
+     * @return iterable<array{int|string}>
      */
     public function provideReverseTransformCases(): iterable
     {

diff --git a/tests/Form/DataTransformerResolverTest.php b/tests/Form/DataTransformerResolverTest.php
@@ -55,7 +55,7 @@ public function testFailedResolve(): void
     }
 
     /**
-     * @phpstan-return array<array{string}>
+     * @phpstan-return iterable<array{string}>
      */
     public function provideFieldTypes(): iterable
     {

diff --git a/tests/Form/Type/ChoiceFieldMaskTypeTest.php b/tests/Form/Type/ChoiceFieldMaskTypeTest.php
@@ -43,7 +43,7 @@ public function testGetDefaultOptions2(): void
     }
 
     /**
-     * @phpstan-return array<array{mixed}>
+     * @phpstan-return iterable<array{mixed}>
      */
     public function provideSetAllowedTypesCases(): iterable
     {

diff --git a/tests/Form/Type/ModelTypeTest.php b/tests/Form/Type/ModelTypeTest.php
@@ -110,7 +110,7 @@ public function testCompoundOption(bool $expectedCompound, bool $multiple, bool
     }
 
     /**
-     * @phpstan-return array<array{bool, bool, bool}>
+     * @phpstan-return iterable<array{bool, bool, bool}>
      */
     public function provideCompoundOptionCases(): iterable
     {

diff --git a/tests/Form/Widget/FormSonataNativeCollectionWidgetTest.php b/tests/Form/Widget/FormSonataNativeCollectionWidgetTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
     }
 
     /**
-     * @phpstan-return array<array{array<string, mixed>}>
+     * @phpstan-return iterable<array{array<string, mixed>}>
      */
     public function providePrototypeIsDeletableNoMatterTheShrinkabilityCases(): iterable
     {

diff --git a/tests/Mapper/BaseGroupedMapperTest.php b/tests/Mapper/BaseGroupedMapperTest.php
@@ -204,7 +204,7 @@ public function testIfEndException(): void
     }
 
     /**
-     * @phpstan-return array<array{string, string, string|null, string}>
+     * @phpstan-return iterable<array{string, string, string|null, string}>
      */
     public function provideLabelCases(): iterable
     {

diff --git a/tests/Menu/Provider/GroupMenuProviderTest.php b/tests/Menu/Provider/GroupMenuProviderTest.php
@@ -383,7 +383,7 @@ public function testRootMenuItemUrl(string $expectedUrl, array $item): void
     }
 
     /**
-     * @phpstan-return array<array{Group}>
+     * @phpstan-return iterable<array{Group}>
      */
     public function getAdminGroups(): iterable
     {
@@ -426,7 +426,7 @@ public function getAdminGroups(): iterable
     }
 
     /**
-     * @phpstan-return array<array{Group}>
+     * @phpstan-return iterable<array{Group}>
      */
     public function getAdminGroupsMultipleRoles(): iterable
     {
@@ -523,7 +523,7 @@ public function getAdminGroupsMultipleRoles(): iterable
     }
 
     /**
-     * @phpstan-return array<array{Group}>
+     * @phpstan-return iterable<array{Group}>
      */
     public function provideGetMenuProviderWithCheckerGrantedMultipleGroupRolesOnTopCases(): iterable
     {
@@ -590,7 +590,7 @@ public function provideGetMenuProviderWithCheckerGrantedMultipleGroupRolesOnTopC
     }
 
     /**
-     * @phpstan-return array<array{Group}>
+     * @phpstan-return iterable<array{Group}>
      */
     public function provideGetMenuProviderOnTopOptionsCases(): iterable
     {

diff --git a/tests/Route/DefaultRouteGeneratorTest.php b/tests/Route/DefaultRouteGeneratorTest.php
@@ -104,7 +104,7 @@ public function testGenerateUrl(
     }
 
     /**
-     * @phpstan-return array<array{0: string, 1: string, 2: array<string, mixed>, 3?: int}>
+     * @phpstan-return iterable<array{0: string, 1: string, 2: array<string, mixed>, 3?: int}>
      */
     public function provideGenerateUrlCases(): iterable
     {
@@ -223,7 +223,7 @@ public function testGenerateUrlChild(string $type, string $expected, string $nam
     }
 
     /**
-     * @phpstan-return array<array{string, string, string, array<string, mixed>}>
+     * @phpstan-return iterable<array{string, string, string, array<string, mixed>}>
      */
     public function provideGenerateUrlChildCases(): iterable
     {
@@ -296,7 +296,7 @@ public function testGenerateUrlParentFieldDescription(string $expected, string $
     }
 
     /**
-     * @phpstan-return array<array{string, string, array<string, mixed>}>
+     * @phpstan-return iterable<array{string, string, array<string, mixed>}>
      */
     public function provideGenerateUrlParentFieldDescriptionCases(): iterable
     {
@@ -396,7 +396,7 @@ public function testGenerateUrlLoadCache(string $expected, string $name, array $
     }
 
     /**
-     * @phpstan-return array<array{string, string, array<string, mixed>}>
+     * @phpstan-return iterable<array{string, string, array<string, mixed>}>
      */
     public function provideGenerateUrlLoadCacheCases(): iterable
     {

diff --git a/tests/Security/Acl/Permission/AdminPermissionMapTest.php b/tests/Security/Acl/Permission/AdminPermissionMapTest.php
@@ -54,7 +54,7 @@ public function testGetMaskReturnsNullIfPermissionIsNotSupported(): void
     }
 
     /**
-     * @phpstan-return array<array{bool, string}>
+     * @phpstan-return iterable<array{bool, string}>
      */
     public function provideContainsReturnsABooleanCases(): iterable
     {

diff --git a/tests/Security/Handler/RoleSecurityHandlerTest.php b/tests/Security/Handler/RoleSecurityHandlerTest.php
@@ -57,7 +57,7 @@ public function testGetBaseRole(string $expected, string $code): void
     }
 
     /**
-     * @phpstan-return array<array{string, string}>
+     * @phpstan-return iterable<array{string, string}>
      */
     public function provideGetBaseRoleCases(): iterable
     {
@@ -117,7 +117,7 @@ public function testIsGranted(
     }
 
     /**
-     * @phpstan-return array<array{0: bool, 1: string|array<string>, 2: string, 3: string|Expression|array<string|Expression>, 4?: object|null}>
+     * @phpstan-return iterable<array{0: bool, 1: string|array<string>, 2: string, 3: string|Expression|array<string|Expression>, 4?: object|null}>
      */
     public function provideIsGrantedCases(): iterable
     {

diff --git a/tests/Translator/NativeLabelTranslatorStrategyTest.php b/tests/Translator/NativeLabelTranslatorStrategyTest.php
@@ -29,7 +29,7 @@ public function testLabel(string $expectedLabel, string $label): void
     }
 
     /**
-     * @phpstan-return array<array{string, string}>
+     * @phpstan-return iterable<array{string, string}>
      */
     public function provideLabelCases(): iterable
     {

diff --git a/tests/Twig/CanonicalizeRuntimeTest.php b/tests/Twig/CanonicalizeRuntimeTest.php
@@ -64,7 +64,7 @@ public function testCanonicalizedLocaleForSelect2(?string $expected, string $ori
     /**
      * NEXT_MAJOR: Remove this function.
      *
-     * @return array<array{?string, string}>
+     * @return iterable<array{?string, string}>
      */
     public function provideCanonicalizedLocaleForMomentCases(): iterable
     {
@@ -186,7 +186,7 @@ public function provideCanonicalizedLocaleForMomentCases(): iterable
     }
 
     /**
-     * @return array<array{?string, string}>
+     * @return iterable<array{?string, string}>
      */
     public function provideCanonicalizedLocaleForSelect2Cases(): iterable
     {

diff --git a/tests/Twig/Extension/CanonicalizeExtensionTest.php b/tests/Twig/Extension/CanonicalizeExtensionTest.php
@@ -70,7 +70,7 @@ public function testCanonicalizedLocaleForSelect2(?string $expected, string $ori
     }
 
     /**
-     * @return array<array{?string, string}>
+     * @return iterable<array{?string, string}>
      */
     public function provideCanonicalizedLocaleForMomentCases(): iterable
     {
@@ -192,7 +192,7 @@ public function provideCanonicalizedLocaleForMomentCases(): iterable
     }
 
     /**
-     * @return array<array{?string, string}>
+     * @return iterable<array{?string, string}>
      */
     public function provideCanonicalizedLocaleForSelect2Cases(): iterable
     {