Skip to content

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
StyleCIBot committed Oct 11, 2023
1 parent b9af97a commit 7b7d1c0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
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
],
],
];
36 changes: 18 additions & 18 deletions src/Support/Format.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ public function format(?array $data, ?string $message, int $code, $errors = null
*/
public function paginator(AbstractPaginator|AbstractCursorPaginator $resource)
{
$fractal = fractal()->collection($resource, function ($item) {
$fractal = fractal()->collection($resource, function ($item) {
return $item->toArray();
})->serializeWith(DataArraySerializer::class);

return tap($fractal, function (Fractal $item) use ($resource) {
if ($resource instanceof CursorPaginator) {
return $item->withCursor(new Cursor(
$resource->cursor()?->encode(),
$resource->previousCursor()?->encode(),
$resource->nextCursor()?->encode(),
count($resource->items()))
$resource->cursor()?->encode(),
$resource->previousCursor()?->encode(),
$resource->nextCursor()?->encode(),
count($resource->items()))
);
}

Expand All @@ -100,8 +100,8 @@ public function paginator(AbstractPaginator|AbstractCursorPaginator $resource)
'current_page' => $resource->currentPage(),
'links' => [
'previous' => $resource->previousPageUrl(),
'next' => $resource->nextPageUrl()
]
'next' => $resource->nextPageUrl(),
],
],
]);
}
Expand All @@ -118,17 +118,17 @@ public function paginator(AbstractPaginator|AbstractCursorPaginator $resource)
*/
public function resourceCollection(ResourceCollection $collection): array
{
$fractal = fractal()->collection($collection->resource,function (JsonResource $resource){
$fractal = fractal()->collection($collection->resource, function (JsonResource $resource) {
return array_merge_recursive($resource->resolve(request()), $resource->with(request()), $resource->additional);
})->serializeWith(DataArraySerializer::class);

return tap($fractal, function (Fractal $item) use ($collection) {
if ($collection->resource instanceof CursorPaginator) {
return $item->withCursor(new Cursor(
$collection->resource->cursor()?->encode(),
$collection->resource->previousCursor()?->encode(),
$collection->resource->nextCursor()?->encode(),
count($collection->resource->items()))
$collection->resource->cursor()?->encode(),
$collection->resource->previousCursor()?->encode(),
$collection->resource->nextCursor()?->encode(),
count($collection->resource->items()))
);
}

Expand All @@ -144,8 +144,8 @@ public function resourceCollection(ResourceCollection $collection): array
'current_page' => $collection->resource->currentPage(),
'links' => [
'previous' => $collection->resource->previousPageUrl(),
'next' => $collection->resource->nextPageUrl()
]
'next' => $collection->resource->nextPageUrl(),
],
],
]);
}
Expand All @@ -161,7 +161,7 @@ public function resourceCollection(ResourceCollection $collection): array
*/
public function jsonResource(JsonResource $resource)
{
return fractal()->item($resource->resource,function (JsonResource $resource){
return fractal()->item($resource->resource, function (JsonResource $resource) {
return array_merge_recursive($resource->resolve(request()), $resource->with(request()), $resource->additional);
})->serializeWith(ArraySerializer::class);
}
Expand All @@ -175,7 +175,7 @@ public function jsonResource(JsonResource $resource)
*/
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 @@ -224,7 +224,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 @@ -237,7 +237,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 tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,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

0 comments on commit 7b7d1c0

Please sign in to comment.