Merge pull request spatie#199 from shuvroroy/patch-1

Migrate to PHP-CS-Fixer 3.x

.github/workflows/php-cs-fixer.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Run PHP CS Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --config=.php_cs.dist --allow-risky=yes
+          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.gitignore

@@ -1,6 +1,6 @@
 .idea
 .php_cs
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 build
 composer.lock

.php_cs.dist → .php-cs-fixer.dist.php

@@ -13,14 +13,14 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -31,7 +31,7 @@
         'phpdoc_var_without_name' => true,
         'class_attributes_separation' => [
             'elements' => [
-                'method',
+                'method' => 'one'
             ],
         ],
         'method_argument_space' => [

src/Watchers/ApplicationLogWatcher.php

@@ -34,9 +34,11 @@ public function register(): void
                 case 'alert':
                 case 'emergency':
                     $ray->color('red');
+
                     break;
                 case 'warning':
                     $ray->color('orange');
+
                     break;
             }
         });

src/Watchers/HttpClientWatcher.php

@@ -3,14 +3,13 @@
 
 namespace Spatie\LaravelRay\Watchers;
 
-
 use Illuminate\Http\Client\Events\RequestSending;
 use Illuminate\Http\Client\Events\ResponseReceived;
 use Illuminate\Http\Client\Request;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Event;
-use Spatie\Ray\Payloads\TablePayload;
 use Spatie\LaravelRay\Ray;
+use Spatie\Ray\Payloads\TablePayload;
 use Spatie\Ray\Settings\Settings;
 use SplObjectStorage;
 
@@ -93,7 +92,9 @@ protected function handleResponse(Request $request, Response $response)
             'Success' => $response->successful(),
             'Status' => $response->status(),
             'Headers' => $response->headers(),
-            'Body' => rescue(function() use ($response) { return $response->json(); }, $response->body(), false),
+            'Body' => rescue(function () use ($response) {
+                return $response->json();
+            }, $response->body(), false),
             'Cookies' => $response->cookies(),
             'Duration' => $this->calculateResponseTime($request),
         ], 'Http');
@@ -112,7 +113,8 @@ protected function calculateResponseTime(Request $request)
         return $timing;
     }
 
-    public static function supportedByLaravelVersion() {
+    public static function supportedByLaravelVersion()
+    {
         return version_compare(app()->version(), '8.45.0',  '>=');
     }
 }

tests/Unit/HttpClientTest.php

@@ -3,7 +3,6 @@
 
 namespace Spatie\LaravelRay\Tests\Unit;
 
-
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Http;
 use Spatie\LaravelRay\Tests\TestCase;
@@ -23,7 +22,7 @@ public function setUp(): void
             [
                 '*/ok*' => Http::response(['hello' => 'world'], 200, ['Content-Type' => 'application/json']),
                 '*/not-found*' => Http::response(null, 404),
-                '*/json*' => Http::response(['foo' => 'bar'])
+                '*/json*' => Http::response(['foo' => 'bar']),
             ]
         );
     }
@@ -83,5 +82,4 @@ public function show_http_client_can_be_colorized()
         $this->assertEquals($sentPayloads[0]['uuid'], $sentPayloads[1]['uuid']);
         $this->assertNotEquals('fakeUuid', $sentPayloads[0]['uuid']);
     }
-
 }