Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/response.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
],
],
];
12 changes: 10 additions & 2 deletions src/Support/Facades/Format.php
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -10,7 +19,6 @@
use Illuminate\Support\Facades\Facade as IlluminateFacade;

/**
*
* @method static JsonResponse response($data = [], int $status = 200, array $headers = [], int $options = 0)
* @method static array data($data, ?string $message, int $code, $errors = null)
* @method static array paginator(AbstractPaginator|AbstractCursorPaginator $resource)
Expand All @@ -25,4 +33,4 @@ protected static function getFacadeAccessor()
{
return config('response.format.class', \Jiannei\Response\Laravel\Support\Format::class);
}
}
}
1 change: 0 additions & 1 deletion src/Support/Facades/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Support/Format.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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();
}

/**
Expand All @@ -118,7 +118,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;
}

Expand Down Expand Up @@ -194,7 +194,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;
}

Expand All @@ -207,7 +207,7 @@ protected function formatDataFields(array $data): array
$key = $alias;
}

if (!$show) {
if (! $show) {
$data = Arr::except($data, $key);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Support/Traits/JsonResponseTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@ public function success($data = [], string $message = '', int $code = 200, array
default => Arr::wrap($data)
};

return Format::response(Format::data($data,$message,$code), $code, $headers, $option);
return Format::response(Format::data($data, $message, $code), $code, $headers, $option);
}
}
4 changes: 1 addition & 3 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
]);
}
}
Expand Down