Fix

sonata-project · Sep 29, 2023 · 1cdad5a · 1cdad5a
1 parent 4697b6e
commit 1cdad5a
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
-        "rector/rector": "^0.17",
+        "rector/rector": "^0.18",
         "sonata-project/admin-bundle": "^4.14",
         "sonata-project/block-bundle": "^4.11 || ^5.0",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",

diff --git a/tests/Controller/CategoryAdminControllerTest.php b/tests/Controller/CategoryAdminControllerTest.php
@@ -173,7 +173,7 @@ public function testListActionWithoutFilter(): void
     }
 
     /**
-     * @dataProvider listActionData
+     * @dataProvider provideListActionCases
      */
     public function testListAction(string|false $context): void
     {
@@ -184,9 +184,7 @@ public function testListAction(string|false $context): void
 
         $datagrid = $this->createMock(DatagridInterface::class);
 
-        $form = $this->getMockBuilder(Form::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $form = $this->createMock(Form::class);
 
         $form->expects(static::once())
              ->method('createView')
@@ -219,20 +217,18 @@ public function testListAction(string|false $context): void
     }
 
     /**
-     * @return array<string, mixed>
+     * @return iterable<string, array{string|false}>
      */
-    public function listActionData(): array
+    public function provideListActionCases(): iterable
     {
-        return [
-            'context' => ['default'],
-            'no context' => [false],
-        ];
+        yield 'context' => ['default'];
+        yield 'no context' => [false];
     }
 
     /**
-     * @dataProvider treeActionData
+     * @dataProvider provideTreeActionCases
      *
-     * @param array<string, string> $categories
+     * @param array<array{string, string}> $categories
      */
     public function testTreeAction(string|false $context, array $categories): void
     {
@@ -292,22 +288,20 @@ public function testTreeAction(string|false $context, array $categories): void
     }
 
     /**
-     * @return array<string, mixed>
+     * @return iterable<string, array{string|false, array<array{string, string}>}>
      */
-    public function treeActionData(): array
+    public function provideTreeActionCases(): iterable
     {
-        return [
-            'context and no categories' => ['default', []],
-            'no context and no categories' => [false, []],
-            'context and categories' => ['default', [
-                ['First Category', 'other'],
-                ['Second Category', 'default'],
-            ]],
-            'no context and categories' => [false, [
-                ['First Category', 'other'],
-                ['Second Category', 'default'],
-            ]],
-        ];
+        yield 'context and no categories' => ['default', []];
+        yield 'no context and no categories' => [false, []];
+        yield 'context and categories' => ['default', [
+            ['First Category', 'other'],
+            ['Second Category', 'default'],
+        ]];
+        yield 'no context and categories' => [false, [
+            ['First Category', 'other'],
+            ['Second Category', 'default'],
+        ]];
     }
 
     /**

diff --git a/tests/Functional/Admin/CategoryAdminTest.php b/tests/Functional/Admin/CategoryAdminTest.php
@@ -57,7 +57,7 @@ public static function provideCrudUrlsCases(): iterable
     }
 
     /**
-     * @dataProvider provideFormUrlsCases
+     * @dataProvider provideFormsUrlsCases
      *
      * @param array<string, mixed> $parameters
      * @param array<string, mixed> $fieldValues
@@ -80,7 +80,7 @@ public function testFormsUrls(string $url, array $parameters, string $button, ar
      *
      * @phpstan-return iterable<array{0: string, 1: array<string, mixed>, 2: string, 3?: array<string, mixed>}>
      */
-    public static function provideFormUrlsCases(): iterable
+    public static function provideFormsUrlsCases(): iterable
     {
         yield 'Create Category' => ['/admin/tests/app/category/create', [
             'uniqid' => 'category',

diff --git a/tests/Functional/Admin/CollectionAdminTest.php b/tests/Functional/Admin/CollectionAdminTest.php
@@ -48,7 +48,7 @@ public static function provideCrudUrlsCases(): iterable
     }
 
     /**
-     * @dataProvider provideFormUrlsCases
+     * @dataProvider provideFormsUrlsCases
      *
      * @param array<string, mixed> $parameters
      * @param array<string, mixed> $fieldValues
@@ -71,7 +71,7 @@ public function testFormsUrls(string $url, array $parameters, string $button, ar
      *
      * @phpstan-return iterable<array{0: string, 1: array<string, mixed>, 2: string, 3?: array<string, mixed>}>
      */
-    public static function provideFormUrlsCases(): iterable
+    public static function provideFormsUrlsCases(): iterable
     {
         yield 'Create Collection' => ['/admin/tests/app/collection/create', [
             'uniqid' => 'collection',

diff --git a/tests/Functional/Admin/ContextAdminTest.php b/tests/Functional/Admin/ContextAdminTest.php
@@ -47,7 +47,7 @@ public static function provideCrudUrlsCases(): iterable
     }
 
     /**
-     * @dataProvider provideFormUrlsCases
+     * @dataProvider provideFormsUrlsCases
      *
      * @param array<string, mixed> $parameters
      * @param array<string, mixed> $fieldValues
@@ -70,7 +70,7 @@ public function testFormsUrls(string $url, array $parameters, string $button, ar
      *
      * @phpstan-return iterable<array{0: string, 1: array<string, mixed>, 2: string, 3?: array<string, mixed>}>
      */
-    public static function provideFormUrlsCases(): iterable
+    public static function provideFormsUrlsCases(): iterable
     {
         yield 'Create Context' => ['/admin/tests/app/context/create', [
             'uniqid' => 'context',

diff --git a/tests/Functional/Admin/TagAdminTest.php b/tests/Functional/Admin/TagAdminTest.php
@@ -48,7 +48,7 @@ public static function provideCrudUrlsCases(): iterable
     }
 
     /**
-     * @dataProvider provideFormUrlsCases
+     * @dataProvider provideFormsUrlsCases
      *
      * @param array<string, mixed> $parameters
      * @param array<string, mixed> $fieldValues
@@ -71,7 +71,7 @@ public function testFormsUrls(string $url, array $parameters, string $button, ar
      *
      * @phpstan-return iterable<array{0: string, 1: array<string, mixed>, 2: string, 3?: array<string, mixed>}>
      */
-    public static function provideFormUrlsCases(): iterable
+    public static function provideFormsUrlsCases(): iterable
     {
         yield 'Create Tag' => ['/admin/tests/app/tag/create', [
             'uniqid' => 'tag',