Apply fixes from StyleCI

laravel · Feb 11, 2025 · 121d1cf · 121d1cf
1 parent 25ab13a
commit 121d1cf
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 28 deletions.
diff --git a/tests/ReflectionClosurePhp80Test.php b/tests/ReflectionClosurePhp80Test.php
@@ -69,7 +69,7 @@
 });
 
 test('trailing comma', function () {
-    $f1 = function (string $param, ) {
+    $f1 = function (string $param) {
     };
     $e1 = 'function (string $param, ) {
     }';
@@ -190,7 +190,7 @@ function reflection_closure_php_80_switch_statement_test_is_two($a)
 
 class ReflectionClosurePhp80InstanceOfTest
 {
-};
+}
 
 class ReflectionClosurePhp80SwitchStatementTest
 {
@@ -202,7 +202,7 @@ class ReflectionClosurePhp80SwitchStatementTest
 
         return [
             $b,
-            ($a instanceof DateTime || $a instanceof ReflectionClosurePhp80InstanceOfTest || $a instanceof RegularClass),
+            $a instanceof DateTime || $a instanceof ReflectionClosurePhp80InstanceOfTest || $a instanceof RegularClass,
             (function (object $a): bool {
                 return ($a instanceof DateTime || $a instanceof ReflectionClosurePhp80InstanceOfTest || $a instanceof RegularClass) === true;
             })(a: $a),
@@ -235,11 +235,11 @@ class ReflectionClosurePhp80SwitchStatementTest
                 return 'three';
             case (new ReflectionClosurePhp80SwitchStatementTest)->isFour(a: $a):
                 return 'four';
-            case ($a instanceof ReflectionClosurePhp80SwitchStatementTest):
+            case $a instanceof ReflectionClosurePhp80SwitchStatementTest:
                 return 'five';
-            case ($a instanceof DateTime):
+            case $a instanceof DateTime:
                 return 'six';
-            case ($a instanceof RegularClass):
+            case $a instanceof RegularClass:
                 return 'seven';
             default:
                 return 'other';

diff --git a/tests/ReflectionClosurePhp81Test.php b/tests/ReflectionClosurePhp81Test.php
@@ -4,9 +4,11 @@
 use Some\ClassName as ClassAlias;
 use Tests\Fixtures\Model;
 use Tests\Fixtures\RegularClass;
+
 use function Tests\Fixtures\{makeModel};
 
-enum GlobalEnum {
+enum GlobalEnum
+{
     case Admin;
     case Guest;
     case Moderator;
@@ -15,7 +17,7 @@ enum GlobalEnum {
 test('named arguments', function () {
     $variable = new RegularClass();
 
-    $f1 = function (string $a1) use ($variable) {
+    $f1 = function (string $a1) {
         return new RegularClass(
             a1: $a1,
             a2: 'string',
@@ -108,7 +110,7 @@ enum GlobalEnum {
                 a13: RegularClass::staticMethod(),
                 a14: (new RegularClass())->instanceMethod(),
             ),
-            a17: function () use ($variable) {
+            a17: function () {
                 return new RegularClass(
                     a1: $a1,
                     a2: 'string',
@@ -303,7 +305,8 @@ enum GlobalEnum {
 
     expect($f)->toBeCode($e);
 
-    enum ScopedEnum {
+    enum ScopedEnum
+    {
         case Admin;
         case Guest;
         case Moderator;
@@ -320,15 +323,14 @@ enum ScopedEnum {
     expect($f)->toBeCode($e);
 });
 
-
-enum GlobalBackedEnum: string {
+enum GlobalBackedEnum: string
+{
     case Admin = 'Administrator';
     case Guest = 'Guest';
     case Moderator = 'Moderator';
 }
 
 test('backed enums', function () {
-
     $f = function (GlobalBackedEnum $role) {
         return $role;
     };
@@ -339,7 +341,8 @@ enum GlobalBackedEnum: string {
 
     expect($f)->toBeCode($e);
 
-    enum ScopedBackedEnum: string {
+    enum ScopedBackedEnum: string
+    {
         case Admin = 'Administrator';
         case Guest = 'Guest';
         case Moderator = 'Moderator';
@@ -572,7 +575,7 @@ enum ScopedBackedEnum: string {
         return true;
     };
 
-    $e = <<<EOF
+    $e = <<<'EOF'
 #[MyAttribute()]
 function () {
         return true;
@@ -701,7 +704,8 @@ public function getSelf(self $instance): self
     }
 }
 
-enum ReflectionClosureGlobalEnum {
+enum ReflectionClosureGlobalEnum
+{
     case Admin;
     case Guest;
     case Moderator;

diff --git a/tests/SerializerPhp81Test.php b/tests/SerializerPhp81Test.php
@@ -27,7 +27,8 @@
     expect($f())->toBe(SerializerGlobalEnum::Admin);
 
     if (! enum_exists(SerializerScopedEnum::class)) {
-        enum SerializerScopedEnum {
+        enum SerializerScopedEnum
+        {
             case Admin;
             case Guest;
             case Moderator;
@@ -86,7 +87,8 @@ enum SerializerScopedEnum {
     expect($f())->toBe(SerializerGlobalBackedEnum::Admin);
 
     if (! enum_exists(SerializerScopedBackedEnum::class)) {
-        enum SerializerScopedBackedEnum: string {
+        enum SerializerScopedBackedEnum: string
+        {
             case Admin = 'Administrator';
             case Guest = 'Guest';
             case Moderator = 'Moderator';
@@ -396,7 +398,7 @@ enum SerializerScopedBackedEnum: string {
 test('named arguments', function () {
     $variable = 'variableValue';
 
-    $f = function (string $a1) use ($variable) {
+    $f = function (string $a1) {
         return new RegularClass(
             a1: $a1,
             a2: 'string',
@@ -489,7 +491,7 @@ enum SerializerScopedBackedEnum: string {
                 a13: RegularClass::staticMethod(),
                 a14: (new RegularClass())->instanceMethod(),
             ),
-            a17: function () use ($variable) {
+            a17: function () {
                 return new RegularClass(
                     a1: $a1,
                     a2: 'string',
@@ -566,7 +568,6 @@ enum SerializerScopedBackedEnum: string {
     $reflector = new ReflectionFunction($f);
 
     expect($reflector->getAttributes())->sequence(function ($attribute) {
-
         $attribute
             ->getName()->toBe(MyAttribute::class)
             ->getArguments()->toBe([
@@ -603,16 +604,23 @@ enum SerializerScopedBackedEnum: string {
     expect($f())->toBeInstanceOf(SerializerPhp81Service::class);
 })->with('serializers');
 
-interface SerializerPhp81HasId {}
-interface SerializerPhp81HasName {}
+interface SerializerPhp81HasId
+{
+}
+interface SerializerPhp81HasName
+{
+}
 
-class SerializerPhp81Child extends SerializerPhp81Parent {}
+class SerializerPhp81Child extends SerializerPhp81Parent
+{
+}
 
 class SerializerPhp81Parent
 {
     public function __construct(
         public readonly int $property = 1,
-    ) {}
+    ) {
+    }
 }
 
 class SerializerPhp81Service implements SerializerPhp81HasId, SerializerPhp81HasName
@@ -686,19 +694,21 @@ public function getSelf(self $instance): self
     }
 }
 
-enum SerializerGlobalEnum {
+enum SerializerGlobalEnum
+{
     case Admin;
     case Guest;
     case Moderator;
 }
 
-enum SerializerGlobalBackedEnum: string {
+enum SerializerGlobalBackedEnum: string
+{
     case Admin = 'Administrator';
     case Guest = 'Guest';
     case Moderator = 'Moderator';
 }
 
-#[Attribute(Attribute::TARGET_METHOD|Attribute::TARGET_FUNCTION)]
+#[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_FUNCTION)]
 class MyAttribute
 {
     public function __construct(public $string, public $model)