Update PHP-CS-Fixer and code style

vudaltsov · vudaltsov · commit 1e5d49ace64e · 2024-08-08T01:41:39.000+03:00
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "bamarni/composer-bin-plugin": "^1.8.2",
         "dragon-code/benchmark": "^2.6 || ^3",
         "ergebnis/composer-normalize": "^2.43.0",
-        "friendsofphp/php-cs-fixer": "^3.61.1",
+        "friendsofphp/php-cs-fixer": "^3.62.0",
         "mikey179/vfsstream": "^1.6.11",
         "phpstan/phpstan": "^1.11.9",
         "phpyh/coding-standard": "^2.6.1",
diff --git a/src/Type/Visitor/TypeStringifier.php b/src/Type/Visitor/TypeStringifier.php
@@ -107,7 +107,7 @@ public function stringValue(Type $type, string $value): mixed
     public function classString(Type $type, Type $classType): mixed
     {
         $isObject = $classType->accept(
-            new /** @extends DefaultTypeVisitor<bool> */ class () extends DefaultTypeVisitor {
+            new /** @extends DefaultTypeVisitor<bool> */ class extends DefaultTypeVisitor {
                 public function object(Type $type, array $properties): mixed
                 {
                     return true;
@@ -360,7 +360,7 @@ public function varianceAware(Type $type, Type $ofType, Variance $variance): mix
 
     public function union(Type $type, array $ofTypes): mixed
     {
-        $isIntersection = new /** @extends DefaultTypeVisitor<bool> */ class () extends DefaultTypeVisitor {
+        $isIntersection = new /** @extends DefaultTypeVisitor<bool> */ class extends DefaultTypeVisitor {
             public function intersection(Type $type, array $ofTypes): mixed
             {
                 return true;
@@ -396,7 +396,7 @@ public function argument(Type $type, ParameterId $parameterId): mixed
 
     public function intersection(Type $type, array $ofTypes): mixed
     {
-        $isUnion = new /** @extends DefaultTypeVisitor<bool> */ class () extends DefaultTypeVisitor {
+        $isUnion = new /** @extends DefaultTypeVisitor<bool> */ class extends DefaultTypeVisitor {
             public function union(Type $type, array $ofTypes): mixed
             {
                 return true;
diff --git a/tests/Reflection/Internal/NativeAdapter/AdapterCompatibilityTest.php b/tests/Reflection/Internal/NativeAdapter/AdapterCompatibilityTest.php
@@ -617,8 +617,8 @@ private static function getClasses(\ReflectionClass $class): \Generator
             $parent = $parent->getParentClass();
         }
 
-        yield (new class () {})::class;
-        yield (new class () extends \stdClass {})::class;
+        yield (new class {})::class;
+        yield (new class extends \stdClass {})::class;
         yield \Traversable::class;
         yield \Iterator::class;
         yield \IteratorAggregate::class;
@@ -654,9 +654,9 @@ private static function getObjects(\ReflectionClass $class): \Generator
 
         yield static fn(): int => 1;
         yield (static fn(): \Generator => yield 1)();
-        yield new class () {};
-        yield new class () extends \stdClass {};
-        yield new class () {
+        yield new class {};
+        yield new class extends \stdClass {};
+        yield new class {
             public function __toString(): string
             {
                 return '';
diff --git a/tests/Reflection/functional_tests/class/anonymous_class_id.php b/tests/Reflection/functional_tests/class/anonymous_class_id.php
@@ -10,7 +10,7 @@
 use function PHPUnit\Framework\assertSame;
 
 return static function (TyphoonReflector $reflector): void {
-    $object = new class () {};
+    $object = new class {};
 
     $id = $reflector->reflectClass($object::class)->id;
 
diff --git a/tests/Type/Visitor/DefaultTypeVisitorTest.php b/tests/Type/Visitor/DefaultTypeVisitorTest.php
@@ -16,7 +16,7 @@ public function testItCoversAllMethods(): void
         $this->expectNotToPerformAssertions();
 
         /** @phpstan-ignore expr.resultUnused */
-        new /** @extends DefaultTypeVisitor<null> */ class () extends DefaultTypeVisitor {
+        new /** @extends DefaultTypeVisitor<null> */ class extends DefaultTypeVisitor {
             protected function default(Type $type): mixed
             {
                 return null;
diff --git a/tests/Type/Visitor/RecursiveTypeReplacerTest.php b/tests/Type/Visitor/RecursiveTypeReplacerTest.php
@@ -64,7 +64,7 @@ public static function typesProvider(): \Generator
     #[DataProvider('typesProvider')]
     public function testItPreservesTypesIfNothingChanges(Type $type): void
     {
-        $replaced = $type->accept(new class () extends RecursiveTypeReplacer {});
+        $replaced = $type->accept(new class extends RecursiveTypeReplacer {});
 
         self::assertSame($type, $replaced);
     }

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function stringValue(Type $type, string $value): mixed`
`107`	`107`	`public function classString(Type $type, Type $classType): mixed`
`108`	`108`	`{`
`109`	`109`	`$isObject = $classType->accept(`
`110`		`- new /** @extends DefaultTypeVisitor<bool> */ class () extends DefaultTypeVisitor {`
	`110`	`+ new /** @extends DefaultTypeVisitor<bool> */ class extends DefaultTypeVisitor {`
`111`	`111`	`public function object(Type $type, array $properties): mixed`
`112`	`112`	`{`
`113`	`113`	`return true;`
`@@ -360,7 +360,7 @@ public function varianceAware(Type $type, Type $ofType, Variance $variance): mix`
`360`	`360`
`361`	`361`	`public function union(Type $type, array $ofTypes): mixed`
`362`	`362`	`{`
`363`		`- $isIntersection = new /** @extends DefaultTypeVisitor<bool> */ class () extends DefaultTypeVisitor {`
	`363`	`+ $isIntersection = new /** @extends DefaultTypeVisitor<bool> */ class extends DefaultTypeVisitor {`
`364`	`364`	`public function intersection(Type $type, array $ofTypes): mixed`
`365`	`365`	`{`
`366`	`366`	`return true;`
`@@ -396,7 +396,7 @@ public function argument(Type $type, ParameterId $parameterId): mixed`
`396`	`396`
`397`	`397`	`public function intersection(Type $type, array $ofTypes): mixed`
`398`	`398`	`{`
`399`		`- $isUnion = new /** @extends DefaultTypeVisitor<bool> */ class () extends DefaultTypeVisitor {`
	`399`	`+ $isUnion = new /** @extends DefaultTypeVisitor<bool> */ class extends DefaultTypeVisitor {`
`400`	`400`	`public function union(Type $type, array $ofTypes): mixed`
`401`	`401`	`{`
`402`	`402`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function testItCoversAllMethods(): void`
`16`	`16`	`$this->expectNotToPerformAssertions();`
`17`	`17`
`18`	`18`	`/** @phpstan-ignore expr.resultUnused */`
`19`		`- new /** @extends DefaultTypeVisitor<null> */ class () extends DefaultTypeVisitor {`
	`19`	`+ new /** @extends DefaultTypeVisitor<null> */ class extends DefaultTypeVisitor {`
`20`	`20`	`protected function default(Type $type): mixed`
`21`	`21`	`{`
`22`	`22`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static function typesProvider(): \Generator`
`64`	`64`	`#[DataProvider('typesProvider')]`
`65`	`65`	`public function testItPreservesTypesIfNothingChanges(Type $type): void`
`66`	`66`	`{`
`67`		`- $replaced = $type->accept(new class () extends RecursiveTypeReplacer {});`
	`67`	`+ $replaced = $type->accept(new class extends RecursiveTypeReplacer {});`
`68`	`68`
`69`	`69`	`self::assertSame($type, $replaced);`
`70`	`70`	`}`