minor #2077 [CI] Update php-cs-fixer config (smnandre)

kbond · kbond · commit 09cc7d0ac4ed · 2024-08-20T11:18:51.000-04:00
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [CI] Update php-cs-fixer config * Update phh-cs-fixer version * Follow symfony/symfony configuration (#57941) * Apply new rules Commits ------- 09597b3 [CI] Update php-cs-fixer config
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -29,8 +29,6 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'header_comment' => ['header' => $fileHeaderComment],
-        // TODO: Remove once the "compiler_optimized" set includes "sprintf"
-        'native_function_invocation' => ['include' => ['@compiler_optimized', 'sprintf'], 'scope' => 'namespaced', 'strict' => true],
         'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
     ])
     ->setRiskyAllowed(true)
diff --git a/composer.json b/composer.json
@@ -7,6 +7,6 @@
     "require-dev": {
         "symfony/filesystem": "^5.2|^6.0|^7.0",
         "symfony/finder": "^5.4|^6.0|^7.0",
-        "php-cs-fixer/shim": "^3.13"
+        "php-cs-fixer/shim": "^3.62"
     }
 }
diff --git a/src/LiveComponent/tests/Integration/LiveComponentHydratorTest.php b/src/LiveComponent/tests/Integration/LiveComponentHydratorTest.php
diff --git a/src/LiveComponent/tests/Unit/Attribute/AsLiveComponentTest.php b/src/LiveComponent/tests/Unit/Attribute/AsLiveComponentTest.php
@@ -29,7 +29,7 @@ final class AsLiveComponentTest extends TestCase
     public function testPreDehydrateMethodsAreOrderedByPriority(): void
     {
         $hooks = AsLiveComponent::preDehydrateMethods(
-            new class() {
+            new class {
                 #[PreDehydrate(priority: -10)]
                 public function hook1()
                 {
@@ -56,7 +56,7 @@ public function hook3()
     public function testPostHydrateMethodsAreOrderedByPriority(): void
     {
         $hooks = AsLiveComponent::postHydrateMethods(
-            new class() {
+            new class {
                 #[PostHydrate(priority: -10)]
                 public function hook1()
                 {
@@ -83,7 +83,7 @@ public function hook3()
     public function testPreMountHooksAreOrderedByPriority(): void
     {
         $hooks = AsLiveComponent::preReRenderMethods(
-            new class() {
+            new class {
                 #[PreReRender(priority: -10)]
                 public function hook1()
                 {
diff --git a/src/LiveComponent/tests/Unit/Attribute/LivePropTest.php b/src/LiveComponent/tests/Unit/Attribute/LivePropTest.php
@@ -33,14 +33,14 @@ public function testDehydrateWithMethod(): void
 
     public function testCanCallCalculateFieldNameAsString(): void
     {
-        $component = new class() {};
+        $component = new class {};
 
         $this->assertSame('field', (new LiveProp(false, null, null, false, [], 'field'))->calculateFieldName($component, 'fallback'));
     }
 
     public function testCanCallCalculateFieldNameAsMethod(): void
     {
-        $component = new class() {
+        $component = new class {
             public function fieldName(): string
             {
                 return 'foo';
@@ -52,7 +52,7 @@ public function fieldName(): string
 
     public function testCanCallCalculateFieldNameWhenNotSet(): void
     {
-        $component = new class() {};
+        $component = new class {};
 
         $this->assertSame('fallback', (new LiveProp())->calculateFieldName($component, 'fallback'));
     }
diff --git a/src/Map/tests/MapTest.php b/src/Map/tests/MapTest.php
@@ -83,7 +83,7 @@ public function testWithMaximumConfiguration(): void
             ->center(new Point(48.8566, 2.3522))
             ->zoom(6)
             ->fitBoundsToMarkers()
-            ->options(new class() implements MapOptionsInterface {
+            ->options(new class implements MapOptionsInterface {
                 public function toArray(): array
                 {
                     return [
diff --git a/src/Turbo/src/TurboBundle.php b/src/Turbo/src/TurboBundle.php
@@ -34,7 +34,7 @@ public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
-        $container->addCompilerPass(new class() implements CompilerPassInterface {
+        $container->addCompilerPass(new class implements CompilerPassInterface {
             public function process(ContainerBuilder $container): void
             {
                 if (!$container->hasDefinition('turbo.broadcaster.imux')) {
diff --git a/src/TwigComponent/src/Attribute/AsTwigComponent.php b/src/TwigComponent/src/Attribute/AsTwigComponent.php
@@ -78,8 +78,6 @@ public function serviceConfig(): array
     /**
      * @param object|class-string $component
      *
-     * @return ?\ReflectionMethod
-     *
      * @internal
      */
     public static function mountMethod(object|string $component): ?\ReflectionMethod
diff --git a/src/TwigComponent/tests/Integration/ComponentFactoryTest.php b/src/TwigComponent/tests/Integration/ComponentFactoryTest.php
@@ -94,7 +94,7 @@ public function testExceptionThrownIfRequiredMountParameterIsMissingFromPassedDa
 
     public function testStringableObjectCanBePassedToComponent(): void
     {
-        $attributes = $this->factory()->create('component_a', ['propB' => 'B', 'data-item-id-param' => new class() {
+        $attributes = $this->factory()->create('component_a', ['propB' => 'B', 'data-item-id-param' => new class {
             public function __toString(): string
             {
                 return 'test';
diff --git a/src/TwigComponent/tests/Unit/Attribute/AsTwigComponentTest.php b/src/TwigComponent/tests/Unit/Attribute/AsTwigComponentTest.php
@@ -24,7 +24,7 @@ final class AsTwigComponentTest extends TestCase
     public function testPreMountHooksAreOrderedByPriority(): void
     {
         $hooks = AsTwigComponent::preMountMethods(
-            new class() {
+            new class {
                 #[PreMount(priority: -10)]
                 public function hook1()
                 {
@@ -51,7 +51,7 @@ public function hook3()
     public function testPostMountHooksAreOrderedByPriority(): void
     {
         $hooks = AsTwigComponent::postMountMethods(
-            new class() {
+            new class {
                 #[PostMount(priority: -10)]
                 public function hook1()
                 {
diff --git a/src/TwigComponent/tests/Unit/ComponentAttributesTest.php b/src/TwigComponent/tests/Unit/ComponentAttributesTest.php
@@ -27,7 +27,7 @@ public function testCanConvertToString(): void
     {
         $attributes = new ComponentAttributes([
             'class' => 'foo',
-            'style' => new class() {
+            'style' => new class {
                 public function __toString(): string
                 {
                     return 'color:black;';
@@ -216,7 +216,7 @@ public function testRenderSingleAttribute(): void
     public function testRenderingSingleAttributeExcludesFromString(): void
     {
         $attributes = new ComponentAttributes([
-            'attr1' => new class() {
+            'attr1' => new class {
                 public function __toString(): string
                 {
                     return 'value1';
diff --git a/src/TwigComponent/tests/Unit/ComputedPropertiesProxyTest.php b/src/TwigComponent/tests/Unit/ComputedPropertiesProxyTest.php
@@ -21,7 +21,7 @@ final class ComputedPropertiesProxyTest extends TestCase
 {
     public function testProxyCachesGetMethodReturns(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {
+        $proxy = new ComputedPropertiesProxy(new class {
             private int $count = 0;
 
             public function getCount(): int
@@ -37,7 +37,7 @@ public function getCount(): int
 
     public function testProxyCachesIsMethodReturns(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {
+        $proxy = new ComputedPropertiesProxy(new class {
             private int $count = 0;
 
             public function isCount(): int
@@ -53,7 +53,7 @@ public function isCount(): int
 
     public function testProxyCachesHasMethodReturns(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {
+        $proxy = new ComputedPropertiesProxy(new class {
             private int $count = 0;
 
             public function hasCount(): int
@@ -69,7 +69,7 @@ public function hasCount(): int
 
     public function testCanProxyPublicProperties(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {
+        $proxy = new ComputedPropertiesProxy(new class {
             public $foo = 'bar';
         });
 
@@ -78,7 +78,7 @@ public function testCanProxyPublicProperties(): void
 
     public function testCanProxyArrayAccess(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() implements \ArrayAccess {
+        $proxy = new ComputedPropertiesProxy(new class implements \ArrayAccess {
             private $array = ['foo' => 'bar'];
 
             public function offsetExists(mixed $offset): bool
@@ -105,7 +105,7 @@ public function offsetUnset(mixed $offset): void
 
     public function testCannotProxyMethodsThatDoNotExist(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {});
+        $proxy = new ComputedPropertiesProxy(new class {});
 
         $this->expectException(\InvalidArgumentException::class);
 
@@ -114,7 +114,7 @@ public function testCannotProxyMethodsThatDoNotExist(): void
 
     public function testCannotPassArgumentsToProxiedMethods(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {});
+        $proxy = new ComputedPropertiesProxy(new class {});
 
         $this->expectException(\InvalidArgumentException::class);
 
@@ -123,7 +123,7 @@ public function testCannotPassArgumentsToProxiedMethods(): void
 
     public function testCannotProxyMethodsWithRequiredArguments(): void
     {
-        $proxy = new ComputedPropertiesProxy(new class() {
+        $proxy = new ComputedPropertiesProxy(new class {
             public function getValue(int $value): int
             {
                 return $value;
diff --git a/src/TwigComponent/tests/Unit/DependencyInjection/TwigComponentExtensionTest.php b/src/TwigComponent/tests/Unit/DependencyInjection/TwigComponentExtensionTest.php
@@ -98,7 +98,7 @@ private function createContainer()
             'kernel.debug' => true,
             'kernel.project_dir' => __DIR__,
             'kernel.bundles' => [
-                'TwigBundle' => new class() {},
+                'TwigBundle' => new class {},
                 'TwigComponentBundle' => TwigComponentBundle::class,
             ],
         ]));
diff --git a/ux.symfony.com/.php-cs-fixer.dist.php b/ux.symfony.com/.php-cs-fixer.dist.php
@@ -30,9 +30,6 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'header_comment' => ['header' => $fileHeaderComment],
-        'nullable_type_declaration' => true,
-        // TODO: Remove once the "compiler_optimized" set includes "sprintf"
-        'native_function_invocation' => ['include' => ['@compiler_optimized', 'sprintf'], 'scope' => 'namespaced', 'strict' => true],
         'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
     ])
     ->setRiskyAllowed(true)

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`"require-dev": {`
`8`	`8`	`"symfony/filesystem": "^5.2\|^6.0\|^7.0",`
`9`	`9`	`"symfony/finder": "^5.4\|^6.0\|^7.0",`
`10`		`- "php-cs-fixer/shim": "^3.13"`
	`10`	`+ "php-cs-fixer/shim": "^3.62"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class AsLiveComponentTest extends TestCase`
`29`	`29`	`public function testPreDehydrateMethodsAreOrderedByPriority(): void`
`30`	`30`	`{`
`31`	`31`	`$hooks = AsLiveComponent::preDehydrateMethods(`
`32`		`- new class() {`
	`32`	`+ new class {`
`33`	`33`	`#[PreDehydrate(priority: -10)]`
`34`	`34`	`public function hook1()`
`35`	`35`	`{`
`@@ -56,7 +56,7 @@ public function hook3()`
`56`	`56`	`public function testPostHydrateMethodsAreOrderedByPriority(): void`
`57`	`57`	`{`
`58`	`58`	`$hooks = AsLiveComponent::postHydrateMethods(`
`59`		`- new class() {`
	`59`	`+ new class {`
`60`	`60`	`#[PostHydrate(priority: -10)]`
`61`	`61`	`public function hook1()`
`62`	`62`	`{`
`@@ -83,7 +83,7 @@ public function hook3()`
`83`	`83`	`public function testPreMountHooksAreOrderedByPriority(): void`
`84`	`84`	`{`
`85`	`85`	`$hooks = AsLiveComponent::preReRenderMethods(`
`86`		`- new class() {`
	`86`	`+ new class {`
`87`	`87`	`#[PreReRender(priority: -10)]`
`88`	`88`	`public function hook1()`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@ public function testDehydrateWithMethod(): void`
`33`	`33`
`34`	`34`	`public function testCanCallCalculateFieldNameAsString(): void`
`35`	`35`	`{`
`36`		`- $component = new class() {};`
	`36`	`+ $component = new class {};`
`37`	`37`
`38`	`38`	`$this->assertSame('field', (new LiveProp(false, null, null, false, [], 'field'))->calculateFieldName($component, 'fallback'));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function testCanCallCalculateFieldNameAsMethod(): void`
`42`	`42`	`{`
`43`		`- $component = new class() {`
	`43`	`+ $component = new class {`
`44`	`44`	`public function fieldName(): string`
`45`	`45`	`{`
`46`	`46`	`return 'foo';`
`@@ -52,7 +52,7 @@ public function fieldName(): string`
`52`	`52`
`53`	`53`	`public function testCanCallCalculateFieldNameWhenNotSet(): void`
`54`	`54`	`{`
`55`		`- $component = new class() {};`
	`55`	`+ $component = new class {};`
`56`	`56`
`57`	`57`	`$this->assertSame('fallback', (new LiveProp())->calculateFieldName($component, 'fallback'));`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function testWithMaximumConfiguration(): void`
`83`	`83`	`->center(new Point(48.8566, 2.3522))`
`84`	`84`	`->zoom(6)`
`85`	`85`	`->fitBoundsToMarkers()`
`86`		`- ->options(new class() implements MapOptionsInterface {`
	`86`	`+ ->options(new class implements MapOptionsInterface {`
`87`	`87`	`public function toArray(): array`
`88`	`88`	`{`
`89`	`89`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function build(ContainerBuilder $container): void`
`34`	`34`	`{`
`35`	`35`	`parent::build($container);`
`36`	`36`
`37`		`- $container->addCompilerPass(new class() implements CompilerPassInterface {`
	`37`	`+ $container->addCompilerPass(new class implements CompilerPassInterface {`
`38`	`38`	`public function process(ContainerBuilder $container): void`
`39`	`39`	`{`
`40`	`40`	`if (!$container->hasDefinition('turbo.broadcaster.imux')) {`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ public function serviceConfig(): array`
`78`	`78`	`/**`
`79`	`79`	`* @param object\|class-string $component`
`80`	`80`	`*`
`81`		`- * @return ?\ReflectionMethod`
`82`		`- *`
`83`	`81`	`* @internal`
`84`	`82`	`*/`
`85`	`83`	`public static function mountMethod(object\|string $component): ?\ReflectionMethod`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function testExceptionThrownIfRequiredMountParameterIsMissingFromPassedDa`
`94`	`94`
`95`	`95`	`public function testStringableObjectCanBePassedToComponent(): void`
`96`	`96`	`{`
`97`		`- $attributes = $this->factory()->create('component_a', ['propB' => 'B', 'data-item-id-param' => new class() {`
	`97`	`+ $attributes = $this->factory()->create('component_a', ['propB' => 'B', 'data-item-id-param' => new class {`
`98`	`98`	`public function __toString(): string`
`99`	`99`	`{`
`100`	`100`	`return 'test';`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ final class AsTwigComponentTest extends TestCase`
`24`	`24`	`public function testPreMountHooksAreOrderedByPriority(): void`
`25`	`25`	`{`
`26`	`26`	`$hooks = AsTwigComponent::preMountMethods(`
`27`		`- new class() {`
	`27`	`+ new class {`
`28`	`28`	`#[PreMount(priority: -10)]`
`29`	`29`	`public function hook1()`
`30`	`30`	`{`
`@@ -51,7 +51,7 @@ public function hook3()`
`51`	`51`	`public function testPostMountHooksAreOrderedByPriority(): void`
`52`	`52`	`{`
`53`	`53`	`$hooks = AsTwigComponent::postMountMethods(`
`54`		`- new class() {`
	`54`	`+ new class {`
`55`	`55`	`#[PostMount(priority: -10)]`
`56`	`56`	`public function hook1()`
`57`	`57`	`{`