diff --git a/config/response.php b/config/response.php index d255651..5ac5189 100644 --- 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 index 1490a67..a1cfb17 100644 --- a/src/Support/Facades/Format.php +++ b/src/Support/Facades/Format.php @@ -1,5 +1,14 @@ + * + * 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); } -} \ No newline at end of file +} diff --git a/src/Support/Facades/Response.php b/src/Support/Facades/Response.php index e4909b8..e24854b 100644 --- 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 index 1fdc0d6..affb795 100644 --- a/src/Support/Format.php +++ b/src/Support/Format.php @@ -115,7 +115,7 @@ public function jsonResource(JsonResource $resource): array { $data = array_merge_recursive($resource->resolve(request()), $resource->with(request()), $resource->additional); - return fractal()->item($data, fn() => $data)->serializeWith(ArraySerializer::class)->toArray(); + return fractal()->item($data, fn () => $data)->serializeWith(ArraySerializer::class)->toArray(); } /** @@ -127,7 +127,7 @@ public function jsonResource(JsonResource $resource): array */ 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; } @@ -203,7 +203,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; } @@ -216,7 +216,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 index b375952..213de1c 100644 --- a/src/Support/Traits/JsonResponseTrait.php +++ b/src/Support/Traits/JsonResponseTrait.php @@ -11,14 +11,9 @@ 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; @@ -199,6 +194,6 @@ public function fail(string $message = '', int $code = 500, $errors = null, arra */ public function success($data = [], string $message = '', int $code = 200, array $headers = [], int $option = 0) { - return Format::response(Format::data($data,$message,$code), $code, $headers, $option); + return Format::response(Format::data($data, $message, $code), $code, $headers, $option); } } diff --git a/tests/TestCase.php b/tests/TestCase.php index bf20a51..730dbde 100644 --- 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, ]); } }