chore(deps): update dependency friendsofphp/php-cs-fixer to v3.84.0

api/composer.json

@@ -53,7 +53,7 @@
     },
     "require-dev": {
         "brianium/paratest": "v7.8.4",
-        "friendsofphp/php-cs-fixer": "3.77.0",
+        "friendsofphp/php-cs-fixer": "3.84.0",
         "hautelook/alice-bundle": "2.15.1",
         "justinrainbow/json-schema": "6.4.2",
         "php-coveralls/php-coveralls": "2.8.0",

api/tests/Api/CampCollaborations/UpdateCampCollaborationTest.php

@@ -403,6 +403,14 @@ public function testPatchCampCollaborationValidatesInvalidAbbreviation($abbrevia
         ]);
     }
 
+    public static function invalidAbbreviations(): \Iterator {
+        yield ['ABC'];
+
+        yield ['D3C'];
+
+        yield ['🧑🏿‍🚀🙋🏼‍♀️😊'];
+    }
+
     #[DataProvider('validAbbreviations')]
     public function testPatchCampCollaborationValidatesValidAbbreviation($abbreviation) {
         $campCollaboration = static::getFixture('campCollaboration5inactive');
@@ -415,6 +423,20 @@ public function testPatchCampCollaborationValidatesValidAbbreviation($abbreviati
         ]);
     }
 
+    public static function validAbbreviations(): \Iterator {
+        yield ['A'];
+
+        yield ['33'];
+
+        yield ['X4'];
+
+        yield ['✅😊'];
+
+        yield ['🧑🏿‍🚀🧑🏼‍🔧'];
+
+        yield ['⚜️'];
+    }
+
     #[DataProvider('usersWhichCanEditCampCollaborations')]
     public function testRejectsPatchStatusFromEstablishedToInactiveIfNoManagerWouldBeInCamp(string $userFixtureName) {
         $campCollaboration = static::getFixture('campCollaboration1camp2manager');
@@ -507,26 +529,4 @@ public static function usersWhichCanEditCampCollaborations(): \Iterator {
 
         yield 'user2member' => ['user2member'];
     }
-
-    public static function invalidAbbreviations(): \Iterator {
-        yield ['ABC'];
-
-        yield ['D3C'];
-
-        yield ['🧑🏿‍🚀🙋🏼‍♀️😊'];
-    }
-
-    public static function validAbbreviations(): \Iterator {
-        yield ['A'];
-
-        yield ['33'];
-
-        yield ['X4'];
-
-        yield ['✅😊'];
-
-        yield ['🧑🏿‍🚀🧑🏼‍🔧'];
-
-        yield ['⚜️'];
-    }
 }

api/tests/Api/ContentNodes/CreateContentNodeTestCase.php

@@ -107,6 +107,24 @@ public function testCreateRejectsParentsWhichDontSupportChildren(string $idOfPar
         ]);
     }
 
+    public static function getContentNodesWhichCannotHaveChildren(): \Iterator {
+        yield ContentNode\MaterialNode::class => [
+            'materialNode1',
+        ];
+
+        yield ContentNode\MultiSelect::class => [
+            'multiSelect1',
+        ];
+
+        yield ContentNode\SingleText::class => [
+            'singleText1',
+        ];
+
+        yield ContentNode\StoryBoard::class => [
+            'storyboard1',
+        ];
+    }
+
     public function testCreateValidatesIncompatibleContentType() {
         // given
         /** @var ContentType $contentType */
@@ -268,24 +286,6 @@ public function testCreatePurgesCacheTags() {
         ], $cacheManager->getInvalidatedTags());
     }
 
-    public static function getContentNodesWhichCannotHaveChildren(): \Iterator {
-        yield ContentNode\MaterialNode::class => [
-            'materialNode1',
-        ];
-
-        yield ContentNode\MultiSelect::class => [
-            'multiSelect1',
-        ];
-
-        yield ContentNode\SingleText::class => [
-            'singleText1',
-        ];
-
-        yield ContentNode\StoryBoard::class => [
-            'storyboard1',
-        ];
-    }
-
     protected function getExampleWritePayload($attributes = [], $except = []) {
         return parent::getExampleWritePayload(
             array_merge([

api/tests/Api/ContentNodes/UpdateContentNodeTestCase.php

@@ -75,6 +75,24 @@ public function testPatchRejectsParentsWhichDontSupportChildren(string $idOfPare
         ]);
     }
 
+    public static function getContentNodesWhichCannotHaveChildren(): \Iterator {
+        yield ContentNode\MaterialNode::class => [
+            'materialNode1',
+        ];
+
+        yield ContentNode\MultiSelect::class => [
+            'multiSelect1',
+        ];
+
+        yield ContentNode\SingleText::class => [
+            'singleText1',
+        ];
+
+        yield ContentNode\StoryBoard::class => [
+            'storyboard1',
+        ];
+    }
+
     public function testPatchValidatesThatParentSupportsSlotName() {
         $this->patch(payload: ['slot' => 'invalidSlot']);
 
@@ -192,22 +210,4 @@ public function testPatchCleansTextOfInstanceName() {
             'instanceName' => 'control',
         ]);
     }
-
-    public static function getContentNodesWhichCannotHaveChildren(): \Iterator {
-        yield ContentNode\MaterialNode::class => [
-            'materialNode1',
-        ];
-
-        yield ContentNode\MultiSelect::class => [
-            'multiSelect1',
-        ];
-
-        yield ContentNode\SingleText::class => [
-            'singleText1',
-        ];
-
-        yield ContentNode\StoryBoard::class => [
-            'storyboard1',
-        ];
-    }
 }

api/tests/Api/Profiles/UpdateProfileTest.php

@@ -475,6 +475,14 @@ public function testPatchCampCollaborationValidatesInvalidAbbreviation($abbrevia
         ]);
     }
 
+    public static function invalidAbbreviations(): \Iterator {
+        yield ['ABC'];
+
+        yield ['D3C'];
+
+        yield ['🧑🏿‍🚀🙋🏼‍♀️😊'];
+    }
+
     #[DataProvider('validAbbreviations')]
     public function testPatchCampCollaborationValidatesValidAbbreviation($abbreviation) {
         $profile = static::getFixture('profile1manager');
@@ -487,6 +495,18 @@ public function testPatchCampCollaborationValidatesValidAbbreviation($abbreviati
         ]);
     }
 
+    public static function validAbbreviations(): \Iterator {
+        yield ['AB'];
+
+        yield ['33'];
+
+        yield ['X4'];
+
+        yield ['✅😊'];
+
+        yield ['🧑🏿‍🚀🧑🏼‍🔧'];
+    }
+
     public function testPatchProfileValidatesInvalidLanguage() {
         $profile = static::getFixture('profile1manager');
         static::createClientWithCredentials()->request('PATCH', '/profiles/'.$profile->getId(), ['json' => [
@@ -555,24 +575,4 @@ public static function notWriteableProfileProperties(): \Iterator {
 
         yield 'user' => ['user'];
     }
-
-    public static function invalidAbbreviations(): \Iterator {
-        yield ['ABC'];
-
-        yield ['D3C'];
-
-        yield ['🧑🏿‍🚀🙋🏼‍♀️😊'];
-    }
-
-    public static function validAbbreviations(): \Iterator {
-        yield ['AB'];
-
-        yield ['33'];
-
-        yield ['X4'];
-
-        yield ['✅😊'];
-
-        yield ['🧑🏿‍🚀🧑🏼‍🔧'];
-    }
 }

api/tests/Api/SnapshotTests/EndpointPerformanceTest.php

@@ -150,6 +150,21 @@ public function testNumberOfQueriesDidNotChangeForContentNodeItemEndpoints(strin
         }
     }
 
+    public static function getContentNodeEndpoints(): array {
+        $collectionEndpoints = self::getCollectionEndpoints();
+        $normalEndpoints = array_filter($collectionEndpoints, function (string $endpoint) {
+            return str_contains($endpoint, '/content_node');
+        });
+
+        // @noinspection PhpUnnecessaryLocalVariableInspection
+        return array_reduce($normalEndpoints, function (?array $left, string $right) {
+            $newArray = $left ?? [];
+            $newArray[$right] = [$right];
+
+            return $newArray;
+        });
+    }
+
     /**
      * @param mixed $collectionEndpoint
      *
@@ -176,21 +191,6 @@ public function measurePerformanceFor(string $collectionEndpoint): array {
         ];
     }
 
-    public static function getContentNodeEndpoints(): array {
-        $collectionEndpoints = self::getCollectionEndpoints();
-        $normalEndpoints = array_filter($collectionEndpoints, function (string $endpoint) {
-            return str_contains($endpoint, '/content_node');
-        });
-
-        // @noinspection PhpUnnecessaryLocalVariableInspection
-        return array_reduce($normalEndpoints, function (?array $left, string $right) {
-            $newArray = $left ?? [];
-            $newArray[$right] = [$right];
-
-            return $newArray;
-        });
-    }
-
     protected function getSnapshotId(): string {
         return $this->getEnvironment().'_'.parent::getSnapshotId();
     }

api/tests/Types/Doctrine/BaseDateTypeTestCase.php

@@ -40,16 +40,6 @@ public function testInvalidTypeConversionToDatabaseValue(mixed $value): void {
         $this->type->convertToDatabaseValue($value, $this->platform);
     }
 
-    public function testNullConversion(): void {
-        self::assertNull($this->type->convertToPHPValue(null, $this->platform));
-    }
-
-    public function testConvertDateTimeToPHPValue(): void {
-        $date = new \DateTime('now');
-
-        self::assertSame($date, $this->type->convertToPHPValue($date, $this->platform));
-    }
-
     /** @return \Iterator<(int | string), array<mixed>> */
     public static function invalidPHPValuesProvider(): \Iterator {
         yield [0];
@@ -76,4 +66,14 @@ public static function invalidPHPValuesProvider(): \Iterator {
 
         yield [['an array']];
     }
+
+    public function testNullConversion(): void {
+        self::assertNull($this->type->convertToPHPValue(null, $this->platform));
+    }
+
+    public function testConvertDateTimeToPHPValue(): void {
+        $date = new \DateTime('now');
+
+        self::assertSame($date, $this->type->convertToPHPValue($date, $this->platform));
+    }
 }