Fix CS

netgen-layouts · Sep 12, 2023 · 63b96ec · 63b96ec
1 parent 50ab59b
commit 63b96ec
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 53 deletions.
diff --git a/bundle/Controller/Admin/DeleteRule.php b/bundle/Controller/Admin/DeleteRule.php
@@ -49,7 +49,5 @@ public function __invoke(Rule $rule, Request $request): Response
         return new Response('', Response::HTTP_NO_CONTENT);
     }
 
-    public function checkPermissions(): void
-    {
-    }
+    public function checkPermissions(): void {}
 }
diff --git a/phpstan.tests.neon b/phpstan.tests.neon
@@ -12,7 +12,7 @@ parameters:
         - '#Call to an undefined method Netgen\\Layouts\\Ez\\Security\\Role\\RoleHierarchy::getReachableRoles\(\).#'
 
         # Disable errors about missing value types in PHPUnit data providers
-        - '#Method .+Test(Base)?::\w+DataProvider\(\) return type has no value type specified in iterable type array.#'
+        - '#Method .+Test(Base)?::\w+DataProvider\(\) return type has no value type specified in iterable type iterable.#'
 
         # Disable errors for various tests that verify the instance of the value
         - '#Call to static method PHPUnit\\Framework\\Assert::assertInstanceOf\(\)#'
diff --git a/tests/bundle/DependencyInjection/CompilerPass/HttpCache/ConfigureHttpCachePassTest.php b/tests/bundle/DependencyInjection/CompilerPass/HttpCache/ConfigureHttpCachePassTest.php
@@ -55,7 +55,7 @@ public function testProcessWithNoSupportedClient(): void
         $this->assertContainerBuilderNotHasAlias('netgen_layouts.http_cache.client');
     }
 
-    public static function processDataProvider(): array
+    public static function processDataProvider(): iterable
     {
         return [
             [VarnishPurgeClient::class, true],

diff --git a/tests/lib/Block/BlockDefinition/Integration/ComponentTestBase.php b/tests/lib/Block/BlockDefinition/Integration/ComponentTestBase.php
@@ -19,7 +19,7 @@
 
 abstract class ComponentTestBase extends BlockTestCase
 {
-    public static function parametersDataProvider(): array
+    public static function parametersDataProvider(): iterable
     {
         return [
             [
@@ -60,7 +60,7 @@ public static function parametersDataProvider(): array
         ];
     }
 
-    public static function invalidParametersDataProvider(): array
+    public static function invalidParametersDataProvider(): iterable
     {
         return [
             [

diff --git a/tests/lib/Block/BlockDefinition/Integration/ContentFieldTestBase.php b/tests/lib/Block/BlockDefinition/Integration/ContentFieldTestBase.php
@@ -11,7 +11,7 @@
 
 abstract class ContentFieldTestBase extends BlockTestCase
 {
-    public static function parametersDataProvider(): array
+    public static function parametersDataProvider(): iterable
     {
         return [
             [
@@ -53,7 +53,7 @@ public static function parametersDataProvider(): array
         ];
     }
 
-    public static function invalidParametersDataProvider(): array
+    public static function invalidParametersDataProvider(): iterable
     {
         return [
             [

diff --git a/tests/lib/Layout/Resolver/ConditionType/ContentTypeTest.php b/tests/lib/Layout/Resolver/ConditionType/ContentTypeTest.php
@@ -143,7 +143,7 @@ public function testMatchesWithNoContent(): void
         self::assertFalse($this->conditionType->matches($request, ['article']));
     }
 
-    public static function matchesDataProvider(): array
+    public static function matchesDataProvider(): iterable
     {
         return [
             ['not_array', false],

diff --git a/tests/lib/Layout/Resolver/ConditionType/SiteAccessGroupTest.php b/tests/lib/Layout/Resolver/ConditionType/SiteAccessGroupTest.php
@@ -95,7 +95,7 @@ public function testMatchesWithNoSiteAccess(): void
     /**
      * Provider for testing condition type validation.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [['frontend'], true],
@@ -107,7 +107,7 @@ public static function validationDataProvider(): array
         ];
     }
 
-    public static function matchesDataProvider(): array
+    public static function matchesDataProvider(): iterable
     {
         return [
             ['not_array', false],

diff --git a/tests/lib/Layout/Resolver/ConditionType/SiteAccessTest.php b/tests/lib/Layout/Resolver/ConditionType/SiteAccessTest.php
@@ -74,7 +74,7 @@ public function testMatchesWithNoSiteAccess(): void
     /**
      * Provider for testing condition type validation.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [['cro'], true],
@@ -86,7 +86,7 @@ public static function validationDataProvider(): array
         ];
     }
 
-    public static function matchesDataProvider(): array
+    public static function matchesDataProvider(): iterable
     {
         return [
             ['not_array', false],

diff --git a/tests/lib/Layout/Resolver/TargetType/SemanticPathInfoPrefixTest.php b/tests/lib/Layout/Resolver/TargetType/SemanticPathInfoPrefixTest.php
@@ -82,7 +82,7 @@ public function testProvideValueWithNoSemanticPathInfo(): void
     /**
      * Provider for testing target type validation.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['/some/route', true],

diff --git a/tests/lib/Layout/Resolver/TargetType/SemanticPathInfoTest.php b/tests/lib/Layout/Resolver/TargetType/SemanticPathInfoTest.php
@@ -82,7 +82,7 @@ public function testProvideValueWithNoSemanticPathInfo(): void
     /**
      * Provider for testing target type validation.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['/some/route', true],

diff --git a/tests/lib/Parameters/ParameterType/ContentTypeTest.php b/tests/lib/Parameters/ParameterType/ContentTypeTest.php
@@ -120,7 +120,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -172,7 +172,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -294,7 +294,7 @@ static function () use ($value, $type): ContentInfo {
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [12, 24, false, true],
@@ -335,7 +335,7 @@ public function testFromHash($value, $convertedValue): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -368,7 +368,7 @@ public function testIsValueEmpty($value, bool $isEmpty): void
     /**
      * Provider for testing if the value is empty.
      */
-    public static function emptyDataProvider(): array
+    public static function emptyDataProvider(): iterable
     {
         return [
             [null, true],

diff --git a/tests/lib/Parameters/ParameterType/ContentTypeTypeTest.php b/tests/lib/Parameters/ParameterType/ContentTypeTypeTest.php
@@ -88,7 +88,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -140,7 +140,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -193,7 +193,7 @@ static function (string $identifier): EzContentType {
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['news', false, true],
@@ -236,7 +236,7 @@ public function testFromHash($value, $convertedValue, bool $multiple): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -297,7 +297,7 @@ public function testIsValueEmpty($value, bool $isEmpty): void
     /**
      * Provider for testing if the value is empty.
      */
-    public static function emptyDataProvider(): array
+    public static function emptyDataProvider(): iterable
     {
         return [
             [null, true],

diff --git a/tests/lib/Parameters/ParameterType/LocationTypeTest.php b/tests/lib/Parameters/ParameterType/LocationTypeTest.php
@@ -96,7 +96,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -148,7 +148,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -279,7 +279,7 @@ static function () use ($value, $type): Location {
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [12, 'user', false, true],
@@ -320,7 +320,7 @@ public function testFromHash($value, $convertedValue): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -353,7 +353,7 @@ public function testIsValueEmpty($value, bool $isEmpty): void
     /**
      * Provider for testing if the value is empty.
      */
-    public static function emptyDataProvider(): array
+    public static function emptyDataProvider(): iterable
     {
         return [
             [null, true],

diff --git a/tests/lib/Parameters/ParameterType/ObjectStateTypeTest.php b/tests/lib/Parameters/ParameterType/ObjectStateTypeTest.php
@@ -88,7 +88,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -140,7 +140,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -235,7 +235,7 @@ public function testValidationWithEmptyValues($value, bool $required, bool $isVa
         self::assertSame($isValid, $errors->count() === 0);
     }
 
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['group1|state2', false, true],
@@ -255,7 +255,7 @@ public static function validationDataProvider(): array
         ];
     }
 
-    public static function validationWithEmptyValuesDataProvider(): array
+    public static function validationWithEmptyValuesDataProvider(): iterable
     {
         return [
             [[], false, true],
@@ -288,7 +288,7 @@ public function testFromHash($value, $convertedValue, bool $multiple): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -349,7 +349,7 @@ public function testIsValueEmpty($value, bool $isEmpty): void
     /**
      * Provider for testing if the value is empty.
      */
-    public static function emptyDataProvider(): array
+    public static function emptyDataProvider(): iterable
     {
         return [
             [null, true],

diff --git a/tests/lib/Parameters/ParameterType/SectionTypeTest.php b/tests/lib/Parameters/ParameterType/SectionTypeTest.php
@@ -88,7 +88,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -140,7 +140,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -199,7 +199,7 @@ static function (string $identifier): EzSection {
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['standard', false, true],
@@ -242,7 +242,7 @@ public function testFromHash($value, $convertedValue, bool $multiple): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -303,7 +303,7 @@ public function testIsValueEmpty($value, bool $isEmpty): void
     /**
      * Provider for testing if the value is empty.
      */
-    public static function emptyDataProvider(): array
+    public static function emptyDataProvider(): iterable
     {
         return [
             [null, true],

diff --git a/tests/lib/Parameters/ParameterType/TagsTypeTest.php b/tests/lib/Parameters/ParameterType/TagsTypeTest.php
@@ -73,7 +73,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -174,7 +174,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -234,7 +234,7 @@ public function testFromHash($value, $convertedValue): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -354,7 +354,7 @@ static function (int $id): Tag {
         self::assertSame($isValid, $errors->count() === 0);
     }
 
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [[12], false, true],