NEXT-38488 - Update friendsofphp/php-cs-fixer to version 3.64.0

Author: mitelg

.php-cs-fixer.dist.php

@@ -46,6 +46,7 @@
         'single_quote' => ['strings_containing_single_quote_chars' => true],
         'strict_comparison' => true,
         'strict_param' => true,
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match']],
         'void_return' => true,
         'yoda_style' => [
             'equal' => false,

composer.json

@@ -167,6 +167,7 @@
         "brianium/paratest": "^7.3",
         "dominikb/composer-license-checker": "^2.5",
         "ergebnis/phpunit-slow-test-detector": "^2.4",
+        "friendsofphp/php-cs-fixer": "3.64.0",
         "jdorn/sql-formatter": "^1.2.17",
         "league/construct-finder": "^1.1",
         "league/flysystem-async-aws-s3": "^3.10.3",
@@ -194,8 +195,7 @@
         "symfony/phpunit-bridge": "~7.1.1",
         "symfony/var-dumper": "~7.1.1",
         "symplify/phpstan-rules": "13.0.0",
-        "tomasvotruba/type-coverage": "0.3.1",
-        "friendsofphp/php-cs-fixer": "3.63.2"
+        "tomasvotruba/type-coverage": "0.3.1"
     },
     "suggest": {
         "shopware/dev-tools": "For development tools, profiler, faker, etc",

src/Core/DevOps/Test/AnnotationTagTester.php

@@ -155,7 +155,7 @@ private function validateExperimentalVersion(string $propertiesString): void
             !isset($properties['stableVersion']) => throw new \InvalidArgumentException('Could not find property stableVersion in experimental annotation.'),
             !isset($properties['feature']) => throw new \InvalidArgumentException('Could not find property feature in experimental annotation.'),
             !preg_match('/^(?:[A-Z]+(_[A-Z]+)*)+$/', $properties['feature']) => throw new \InvalidArgumentException('The value of feature-property can not be empty, contain white spaces and must be in ALL_CAPS format.'),
-            default => $this->validateAgainstPlatformVersion($properties['stableVersion'])
+            default => $this->validateAgainstPlatformVersion($properties['stableVersion']),
         };
     }
 

src/Core/Framework/Api/ApiDefinition/Generator/OpenApi/OpenApiSchemaBuilder.php

@@ -82,7 +82,7 @@ private function createInfo(string $api, string $version): Info
 
 For a better overview, all CRUD-endpoints are hidden by default. If you want to show also CRUD-endpoints
 add the query parameter `type=jsonapi`.
-EOF
+EOF,
         ]);
     }
 

src/Core/Framework/Api/Sync/SyncFkResolver.php

@@ -107,7 +107,7 @@ private function collect(string $entity, array &$payload, string $pointer): arra
                     $ref = match (true) {
                         $field instanceof FkField => $field->getReferenceDefinition()->getEntityName(),
                         $field instanceof IdField => $entity,
-                        default => null
+                        default => null,
                     };
 
                     if ($ref === null) {

src/Core/Framework/DataAbstractionLayer/AttributeEntityCompiler.php

@@ -241,7 +241,7 @@ private function getFieldArgs(string $entity, OneToMany|ManyToMany|ManyToOne|One
             $field instanceof AutoIncrement, $field instanceof Version => [],
             $field instanceof ReferenceVersion => [$field->entity, $column],
             $field instanceof Serialized => [$column, $property->getName(), $field->serializer],
-            default => [$column, $property->getName()]
+            default => [$column, $property->getName()],
         };
     }
 
@@ -316,7 +316,7 @@ private function getFlags(Field $field, \ReflectionProperty $property): array
                 OnDelete::CASCADE => ['class' => CascadeDelete::class],
                 OnDelete::SET_NULL => ['class' => SetNullOnDelete::class],
                 OnDelete::RESTRICT => ['class' => RestrictDelete::class],
-                default => null
+                default => null,
             };
 
             if ($flags['cascade'] === null) {

src/Core/Framework/Plugin/PluginZipDetector.php

@@ -27,7 +27,7 @@ public function detect(string $zipFilePath): string
             return match (true) {
                 $this->isPlugin($archive) => PluginManagementService::PLUGIN,
                 $this->isApp($archive) => PluginManagementService::APP,
-                default => throw PluginException::noPluginFoundInZip($zipFilePath)
+                default => throw PluginException::noPluginFoundInZip($zipFilePath),
             };
         } finally {
             $archive->close();

src/Core/Service/ServiceSourceResolver.php

@@ -53,7 +53,7 @@ public function supports(Manifest|AppEntity $app): bool
     {
         return match (true) {
             $app instanceof AppEntity => $app->getSourceType() === $this->name(),
-            $app instanceof Manifest => preg_match('#^https?://#', $app->getPath()) && $app->getMetadata()->isSelfManaged()
+            $app instanceof Manifest => preg_match('#^https?://#', $app->getPath()) && $app->getMetadata()->isSelfManaged(),
         };
     }
 

src/Elasticsearch/Product/CustomFieldUpdater.php

@@ -83,7 +83,7 @@ public static function getTypeFromCustomFieldType(string $type): array
                 'type' => 'object',
                 'dynamic' => true,
             ],
-            default => AbstractElasticsearchDefinition::KEYWORD_FIELD + AbstractElasticsearchDefinition::SEARCH_FIELD
+            default => AbstractElasticsearchDefinition::KEYWORD_FIELD + AbstractElasticsearchDefinition::SEARCH_FIELD,
         };
     }
 

tests/integration/Core/System/CustomEntity/Xml/Config/CmsAwareAndAdminUiTest.php

@@ -241,7 +241,7 @@ private function assertCmsAwareAndAdminUiIsInstalled(AppEntity|PluginEntity $ent
         $idColumn = match ($entity::class) {
             AppEntity::class => 'app_id',
             PluginEntity::class => 'plugin_id',
-            default => throw new \Exception('Wrong Entity!')
+            default => throw new \Exception('Wrong Entity!'),
         };
         $cmsAwareAndAdminUiSettings = $this->connection->executeQuery(
             "SELECT flags FROM custom_entity WHERE $idColumn = :id",

tests/unit/Core/Content/Product/Stock/OrderStockSubscriberTest.php

@@ -294,7 +294,7 @@ function (array $command) use ($orderItemDefinition, $idMapper) {
                             []
                         ),
                         '/0'
-                    )
+                    ),
                 };
             },
             $commands

tests/unit/Core/Service/ServiceClientTest.php

@@ -202,7 +202,7 @@ public function testDownloadAppZipForVersion(): void
                 2 => 'part2',
                 3 => 'part3',
                 4 => '',
-                default => null
+                default => null,
             };
 
             static::assertSame('/some/file', $filename);

tests/unit/Storefront/Theme/ThemeCompilerTest.php

@@ -318,7 +318,7 @@ public static function configForDumpVariables(): \Generator
 \$sw-custom-media: '456';
 \$sw-asset-theme-url: 'http://localhost';
 
-PHP_EOL
+PHP_EOL,
         ];
 
         yield 'ignores fields with scss config property set to false' => [
@@ -351,7 +351,7 @@ public static function configForDumpVariables(): \Generator
 \$sw-color-brand-secondary: #526e7f;
 \$sw-asset-theme-url: 'http://localhost';
 
-PHP_EOL
+PHP_EOL,
         ];
         yield 'HasNoConfigFieldsAndReturnsOnlyDefaultVariables' => [
             [
@@ -407,7 +407,7 @@ public static function configForDumpVariables(): \Generator
 \$sw-zero-margin: 0;
 \$sw-asset-theme-url: 'http://localhost';
 
-PHP_EOL
+PHP_EOL,
         ];
     }