Apply fixes from StyleCI

jiannei · Oct 11, 2023 · a4be287 · a4be287
1 parent d7f63e5
commit a4be287
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/config/response.php b/config/response.php
@@ -59,8 +59,8 @@
             'code' => ['alias' => 'code', 'show' => true],
             'message' => ['alias' => 'message', 'show' => true],
             'error' => ['alias' => 'error', 'show' => true],
-            'data' => ['alias' => 'data', 'show' => true,],
-            'data.data' => ['alias' => 'data.data', 'show' => true,],// rows/items/list
+            'data' => ['alias' => 'data', 'show' => true],
+            'data.data' => ['alias' => 'data.data', 'show' => true], // rows/items/list
         ],
     ],
 ];
diff --git a/src/Support/Facades/Format.php b/src/Support/Facades/Format.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the jiannei/laravel-response.
+ *
+ * (c) Jiannei <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Jiannei\Response\Laravel\Support\Facades;
 
 use Illuminate\Http\JsonResponse;
@@ -24,4 +33,4 @@ protected static function getFacadeAccessor()
     {
         return config('response.format.class', \Jiannei\Response\Laravel\Support\Format::class);
     }
-}
+}
diff --git a/src/Support/Facades/Response.php b/src/Support/Facades/Response.php
@@ -12,7 +12,6 @@
 namespace Jiannei\Response\Laravel\Support\Facades;
 
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Facade as IlluminateFacade;
 
 /**

diff --git a/src/Support/Format.php b/src/Support/Format.php
@@ -124,7 +124,7 @@ public function jsonResource(JsonResource $resource, $transformer = null, $resou
     {
         $data = array_merge_recursive($resource->resolve(request()), $resource->with(request()), $resource->additional);
 
-        return fractal()->item($data, $transformer ?: fn() => $data, $resourceName)->serializeWith(ArraySerializer::class)->toArray();
+        return fractal()->item($data, $transformer ?: fn () => $data, $resourceName)->serializeWith(ArraySerializer::class)->toArray();
     }
 
     /**
@@ -136,7 +136,7 @@ public function jsonResource(JsonResource $resource, $transformer = null, $resou
      */
     protected function formatMessage(int $code, ?string $message): ?string
     {
-        if (!$message && class_exists($enumClass = Config::get('response.enum'))) {
+        if (! $message && class_exists($enumClass = Config::get('response.enum'))) {
             $message = $enumClass::fromValue($code)->description;
         }
 
@@ -153,7 +153,7 @@ protected function formatStatus(int $code): string
     {
         $statusCode = $this->formatStatusCode($code);
 
-        return match(true) {
+        return match (true) {
             ($statusCode >= 400 && $statusCode <= 499) => 'error',// client error
             ($statusCode >= 500 && $statusCode <= 599) => 'fail',// service error
             default => 'success'
@@ -210,7 +210,7 @@ protected function formatDataFields(array $data): array
         $formatConfig = \config('response.format.config', []);
 
         foreach ($formatConfig as $key => $config) {
-            if (!Arr::has($data, $key)) {
+            if (! Arr::has($data, $key)) {
                 continue;
             }
 
@@ -223,7 +223,7 @@ protected function formatDataFields(array $data): array
                 $key = $alias;
             }
 
-            if (!$show) {
+            if (! $show) {
                 $data = Arr::except($data, $key);
             }
         }

diff --git a/src/Support/Traits/JsonResponseTrait.php b/src/Support/Traits/JsonResponseTrait.php
@@ -11,15 +11,7 @@
 
 namespace Jiannei\Response\Laravel\Support\Traits;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Pagination\AbstractCursorPaginator;
-use Illuminate\Pagination\AbstractPaginator;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Config;
 use Jiannei\Response\Laravel\Support\Facades\Format;
 
 trait JsonResponseTrait
@@ -168,7 +160,6 @@ public function errorInternal(string $message = ''): void
      * @param  array  $headers
      * @param  int  $option
      * @return JsonResponse
-     *
      */
     public function fail(string $message = '', int $code = 500, $errors = null, array $headers = [], int $option = 0): JsonResponse
     {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -11,8 +11,6 @@
 
 namespace Jiannei\Response\Laravel\Tests;
 
-use Jiannei\Response\Laravel\Tests\Support\Format;
-
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
     protected function getPackageProviders($app)
@@ -47,7 +45,7 @@ protected function defineEnvironment($app)
         $app['config']->set('response.enum', \Jiannei\Response\Laravel\Tests\Repositories\Enums\ResponseCodeEnum::class);
         if ($this instanceof FormatTest) {
             $app['config']->set('response.format', [
-                'class' => \Jiannei\Response\Laravel\Tests\Support\Format::class
+                'class' => \Jiannei\Response\Laravel\Tests\Support\Format::class,
             ]);
         }
     }