Merge remote-tracking branch 'upstream/master'

cjw-network · Sep 12, 2023 · f7941f4 · f7941f4
2 parents f8b5220 + 44b4649
commit f7941f4
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 55 deletions.
diff --git a/.github/workflows/coding_standards.yml b/.github/workflows/coding_standards.yml
@@ -18,6 +18,6 @@ jobs:
         with:
           repository: netgen-layouts/layouts-coding-standard
           path: vendor/netgen/layouts-coding-standard
-      - uses: OskarStark/php-cs-fixer-ga@master
+      - uses: docker://oskarstark/php-cs-fixer-ga
         with:
           args: --diff --dry-run
diff --git a/bundle/Controller/Admin/DeleteRule.php b/bundle/Controller/Admin/DeleteRule.php
@@ -43,7 +43,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/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "netgen/layouts-core": "~1.4.5",
+        "netgen/layouts-core": "~1.4.6",
         "netgen/content-browser-ibexa": "^1.4",
         "ibexa/core": "^4.4",
         "ibexa/admin-ui": "^4.4",

diff --git a/phpstan.tests.neon b/phpstan.tests.neon
@@ -10,7 +10,7 @@ parameters:
         - '#Unreachable statement - code above always terminates.#'
 
         # 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
@@ -51,7 +51,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
@@ -124,7 +124,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
@@ -76,7 +76,7 @@ public function testMatchesWithNoSiteAccess(): void
     /**
      * Provider for testing condition type validation.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [['frontend'], true],
@@ -88,7 +88,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
@@ -59,7 +59,7 @@ public function testMatchesWithNoSiteAccess(): void
     /**
      * Provider for testing condition type validation.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [['cro'], true],
@@ -71,7 +71,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
@@ -67,7 +67,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
@@ -67,7 +67,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
@@ -104,7 +104,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -156,7 +156,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -257,7 +257,7 @@ public function testValidation(mixed $value, int $type, bool $required, bool $is
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [12, 24, false, true],
@@ -291,7 +291,7 @@ public function testFromHash(mixed $value, mixed $convertedValue): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -318,7 +318,7 @@ public function testIsValueEmpty(mixed $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
@@ -79,7 +79,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -131,7 +131,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -175,7 +175,7 @@ public function testValidation(mixed $value, bool $required, bool $isValid): voi
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['news', false, true],
@@ -211,7 +211,7 @@ public function testFromHash(mixed $value, mixed $convertedValue, bool $multiple
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -266,7 +266,7 @@ public function testIsValueEmpty(mixed $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
@@ -86,7 +86,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -138,7 +138,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -248,7 +248,7 @@ public function testValidation(mixed $value, string $type, bool $required, bool
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             [12, 'user', false, true],
@@ -282,7 +282,7 @@ public function testFromHash(mixed $value, mixed $convertedValue): void
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -309,7 +309,7 @@ public function testIsValueEmpty(mixed $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
@@ -79,7 +79,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -131,7 +131,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -214,7 +214,7 @@ public function testValidationWithEmptyValues(mixed $value, bool $required, bool
         self::assertSame($isValid, $errors->count() === 0);
     }
 
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['group1|state2', false, true],
@@ -234,7 +234,7 @@ public static function validationDataProvider(): array
         ];
     }
 
-    public static function validationWithEmptyValuesDataProvider(): array
+    public static function validationWithEmptyValuesDataProvider(): iterable
     {
         return [
             [[], false, true],
@@ -260,7 +260,7 @@ public function testFromHash(mixed $value, mixed $convertedValue, bool $multiple
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -315,7 +315,7 @@ public function testIsValueEmpty(mixed $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
@@ -79,7 +79,7 @@ public function testInvalidOptions(array $options): void
     /**
      * Provider for testing valid parameter attributes.
      */
-    public static function validOptionsDataProvider(): array
+    public static function validOptionsDataProvider(): iterable
     {
         return [
             [
@@ -131,7 +131,7 @@ public static function validOptionsDataProvider(): array
     /**
      * Provider for testing invalid parameter attributes.
      */
-    public static function invalidOptionsDataProvider(): array
+    public static function invalidOptionsDataProvider(): iterable
     {
         return [
             [
@@ -181,7 +181,7 @@ public function testValidation(mixed $value, bool $required, bool $isValid): voi
     /**
      * Provider for testing valid parameter values.
      */
-    public static function validationDataProvider(): array
+    public static function validationDataProvider(): iterable
     {
         return [
             ['standard', false, true],
@@ -217,7 +217,7 @@ public function testFromHash(mixed $value, mixed $convertedValue, bool $multiple
         );
     }
 
-    public static function fromHashDataProvider(): array
+    public static function fromHashDataProvider(): iterable
     {
         return [
             [
@@ -272,7 +272,7 @@ public function testIsValueEmpty(mixed $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],