@@ -251,7 +251,7 @@ |
||
251 | 251 | * Make a closure based transformer from the model's fillable attributes. |
252 | 252 | * |
253 | 253 | * @param \Illuminate\Database\Eloquent\Model $model |
254 | - * @return \Flugg\Responder\Transformer|callable |
|
254 | + * @return \Closure |
|
255 | 255 | */ |
256 | 256 | protected function makeClosureTransformer(Model $model) |
257 | 257 | { |
@@ -5,10 +5,7 @@ |
||
5 | 5 | use Flugg\Responder\Contracts\Transformable; |
6 | 6 | use Flugg\Responder\Exceptions\InvalidSerializerException; |
7 | 7 | use Flugg\Responder\Exceptions\InvalidTransformerException; |
8 | -use Flugg\Responder\Exceptions\SerializerNotFoundException; |
|
9 | 8 | use Flugg\Responder\ResourceFactory; |
10 | -use Flugg\Responder\ResourceResolver; |
|
11 | -use Flugg\Responder\Transformation; |
|
12 | 9 | use Flugg\Responder\Transformer; |
13 | 10 | use Illuminate\Contracts\Routing\ResponseFactory; |
14 | 11 | use Illuminate\Database\Eloquent\Model; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * |
40 | 40 | * @var array |
41 | 41 | */ |
42 | - protected $meta = []; |
|
42 | + protected $meta = [ ]; |
|
43 | 43 | |
44 | 44 | /** |
45 | 45 | * The Fractal resource instance containing the data and transformer. |
@@ -69,13 +69,13 @@ discard block |
||
69 | 69 | * @param \Flugg\Responder\ResourceFactory $resourceFactory |
70 | 70 | * @param \League\Fractal\Manager $manager |
71 | 71 | */ |
72 | - public function __construct(ResponseFactory $responseFactory, ResourceFactory $resourceFactory, Manager $manager) |
|
72 | + public function __construct( ResponseFactory $responseFactory, ResourceFactory $resourceFactory, Manager $manager ) |
|
73 | 73 | { |
74 | 74 | $this->resourceFactory = $resourceFactory; |
75 | 75 | $this->manager = $manager; |
76 | 76 | $this->resource = $this->resourceFactory->make(); |
77 | 77 | |
78 | - parent::__construct($responseFactory); |
|
78 | + parent::__construct( $responseFactory ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | * @param array $data |
85 | 85 | * @return self |
86 | 86 | */ |
87 | - public function addMeta(array $data):SuccessResponseBuilder |
|
87 | + public function addMeta( array $data ):SuccessResponseBuilder |
|
88 | 88 | { |
89 | - $this->meta = array_merge($this->meta, $data); |
|
89 | + $this->meta = array_merge( $this->meta, $data ); |
|
90 | 90 | |
91 | 91 | return $this; |
92 | 92 | } |
@@ -97,9 +97,9 @@ discard block |
||
97 | 97 | * @param \League\Fractal\Serializer\SerializerAbstract|string $serializer |
98 | 98 | * @return self |
99 | 99 | */ |
100 | - public function serializer($serializer):SuccessResponseBuilder |
|
100 | + public function serializer( $serializer ):SuccessResponseBuilder |
|
101 | 101 | { |
102 | - $this->manager->setSerializer($this->resolveSerializer($serializer)); |
|
102 | + $this->manager->setSerializer( $this->resolveSerializer( $serializer ) ); |
|
103 | 103 | |
104 | 104 | return $this; |
105 | 105 | } |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | * @return self |
112 | 112 | * @throws \InvalidArgumentException |
113 | 113 | */ |
114 | - public function setStatus(int $statusCode):ResponseBuilder |
|
114 | + public function setStatus( int $statusCode ):ResponseBuilder |
|
115 | 115 | { |
116 | - if ($statusCode < 100 || $statusCode >= 400) { |
|
117 | - throw new InvalidArgumentException("{$statusCode} is not a valid success HTTP status code."); |
|
116 | + if ( $statusCode < 100 || $statusCode >= 400 ) { |
|
117 | + throw new InvalidArgumentException( "{$statusCode} is not a valid success HTTP status code." ); |
|
118 | 118 | } |
119 | 119 | |
120 | - return parent::setStatus($statusCode); |
|
120 | + return parent::setStatus( $statusCode ); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -129,17 +129,17 @@ discard block |
||
129 | 129 | * @param string|null $resourceKey |
130 | 130 | * @return self |
131 | 131 | */ |
132 | - public function transform($data = null, $transformer = null, string $resourceKey = null):SuccessResponseBuilder |
|
132 | + public function transform( $data = null, $transformer = null, string $resourceKey = null ):SuccessResponseBuilder |
|
133 | 133 | { |
134 | - $resource = $this->resourceFactory->make($data); |
|
134 | + $resource = $this->resourceFactory->make( $data ); |
|
135 | 135 | |
136 | - if (! is_null($resource->getData())) { |
|
137 | - $model = $this->resolveModel($resource->getData()); |
|
138 | - $transformer = $this->resolveTransformer($model, $transformer); |
|
139 | - $resourceKey = $this->resolveResourceKey($model, $resourceKey); |
|
136 | + if ( ! is_null( $resource->getData() ) ) { |
|
137 | + $model = $this->resolveModel( $resource->getData() ); |
|
138 | + $transformer = $this->resolveTransformer( $model, $transformer ); |
|
139 | + $resourceKey = $this->resolveResourceKey( $model, $resourceKey ); |
|
140 | 140 | } |
141 | 141 | |
142 | - $this->resource = $resource->setTransformer($transformer)->setResourceKey($resourceKey); |
|
142 | + $this->resource = $resource->setTransformer( $transformer )->setResourceKey( $resourceKey ); |
|
143 | 143 | |
144 | 144 | return $this; |
145 | 145 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | */ |
152 | 152 | public function toArray():array |
153 | 153 | { |
154 | - return $this->serialize($this->getResource()); |
|
154 | + return $this->serialize( $this->getResource() ); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | /** |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | */ |
162 | 162 | public function getResource():ResourceInterface |
163 | 163 | { |
164 | - return $this->resource->setMeta($this->meta); |
|
164 | + return $this->resource->setMeta( $this->meta ); |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
@@ -181,13 +181,13 @@ discard block |
||
181 | 181 | * @return \League\Fractal\Serializer\SerializerAbstract |
182 | 182 | * @throws \Flugg\Responder\Exceptions\InvalidSerializerException |
183 | 183 | */ |
184 | - protected function resolveSerializer($serializer):SerializerAbstract |
|
184 | + protected function resolveSerializer( $serializer ):SerializerAbstract |
|
185 | 185 | { |
186 | - if (is_string($serializer)) { |
|
186 | + if ( is_string( $serializer ) ) { |
|
187 | 187 | $serializer = new $serializer; |
188 | 188 | } |
189 | 189 | |
190 | - if (! $serializer instanceof SerializerAbstract) { |
|
190 | + if ( ! $serializer instanceof SerializerAbstract ) { |
|
191 | 191 | throw new InvalidSerializerException(); |
192 | 192 | } |
193 | 193 | |
@@ -201,15 +201,15 @@ discard block |
||
201 | 201 | * @return \Illuminate\Database\Eloquent\Model |
202 | 202 | * @throws \InvalidArgumentException |
203 | 203 | */ |
204 | - protected function resolveModel($data):Model |
|
204 | + protected function resolveModel( $data ):Model |
|
205 | 205 | { |
206 | - if ($data instanceof Model) { |
|
206 | + if ( $data instanceof Model ) { |
|
207 | 207 | return $data; |
208 | 208 | } |
209 | 209 | |
210 | - $model = $data[0]; |
|
211 | - if (! $model instanceof Model) { |
|
212 | - throw new InvalidArgumentException('You can only transform data containing Eloquent models.'); |
|
210 | + $model = $data[ 0 ]; |
|
211 | + if ( ! $model instanceof Model ) { |
|
212 | + throw new InvalidArgumentException( 'You can only transform data containing Eloquent models.' ); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | return $model; |
@@ -223,25 +223,25 @@ discard block |
||
223 | 223 | * @return \Flugg\Responder\Transformer|callable |
224 | 224 | * @throws \InvalidTransformerException |
225 | 225 | */ |
226 | - protected function resolveTransformer(Model $model, $transformer = null) |
|
226 | + protected function resolveTransformer( Model $model, $transformer = null ) |
|
227 | 227 | { |
228 | - if (is_null($transformer)) { |
|
229 | - if (! $model instanceof Transformable) { |
|
230 | - return $this->makeClosureTransformer($model); |
|
228 | + if ( is_null( $transformer ) ) { |
|
229 | + if ( ! $model instanceof Transformable ) { |
|
230 | + return $this->makeClosureTransformer( $model ); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | $transformer = $model::transformer(); |
234 | 234 | } |
235 | 235 | |
236 | 236 | |
237 | - if (is_string($transformer)) { |
|
237 | + if ( is_string( $transformer ) ) { |
|
238 | 238 | $transformer = new $transformer; |
239 | 239 | } |
240 | 240 | |
241 | - if ($transformer instanceof Transformer) { |
|
242 | - $this->setRelations($transformer, $model); |
|
243 | - } elseif (! is_callable($transformer)) { |
|
244 | - throw new InvalidTransformerException($model); |
|
241 | + if ( $transformer instanceof Transformer ) { |
|
242 | + $this->setRelations( $transformer, $model ); |
|
243 | + } elseif ( ! is_callable( $transformer ) ) { |
|
244 | + throw new InvalidTransformerException( $model ); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | return $transformer; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * @param \Illuminate\Database\Eloquent\Model $model |
254 | 254 | * @return \Flugg\Responder\Transformer|callable |
255 | 255 | */ |
256 | - protected function makeClosureTransformer(Model $model) |
|
256 | + protected function makeClosureTransformer( Model $model ) |
|
257 | 257 | { |
258 | 258 | return function () use ($model) { |
259 | 259 | return $model->toArray(); |
@@ -267,11 +267,11 @@ discard block |
||
267 | 267 | * @param \Illuminate\Database\Eloquent\Model $model |
268 | 268 | * @return void |
269 | 269 | */ |
270 | - protected function setRelations(Transformer $transformer, Model $model) |
|
270 | + protected function setRelations( Transformer $transformer, Model $model ) |
|
271 | 271 | { |
272 | - $transformer->setRelations($this->resolveRelations($model)); |
|
272 | + $transformer->setRelations( $this->resolveRelations( $model ) ); |
|
273 | 273 | |
274 | - $this->manager->parseIncludes($transformer->getRelations()); |
|
274 | + $this->manager->parseIncludes( $transformer->getRelations() ); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | /** |
@@ -280,9 +280,9 @@ discard block |
||
280 | 280 | * @param \Illuminate\Database\Eloquent\Model $model |
281 | 281 | * @return array |
282 | 282 | */ |
283 | - protected function resolveRelations(Model $model):array |
|
283 | + protected function resolveRelations( Model $model ):array |
|
284 | 284 | { |
285 | - return array_keys($model->getRelations()); |
|
285 | + return array_keys( $model->getRelations() ); |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | /** |
@@ -292,13 +292,13 @@ discard block |
||
292 | 292 | * @param string|null $resourceKey |
293 | 293 | * @return string |
294 | 294 | */ |
295 | - protected function resolveResourceKey(Model $model, string $resourceKey = null):string |
|
295 | + protected function resolveResourceKey( Model $model, string $resourceKey = null ):string |
|
296 | 296 | { |
297 | - if (! is_null($resourceKey)) { |
|
297 | + if ( ! is_null( $resourceKey ) ) { |
|
298 | 298 | return $resourceKey; |
299 | 299 | } |
300 | 300 | |
301 | - if (method_exists($model, 'getResourceKey')) { |
|
301 | + if ( method_exists( $model, 'getResourceKey' ) ) { |
|
302 | 302 | return $model->getResourceKey(); |
303 | 303 | } |
304 | 304 | |
@@ -311,8 +311,8 @@ discard block |
||
311 | 311 | * @param ResourceInterface $resource |
312 | 312 | * @return array |
313 | 313 | */ |
314 | - protected function serialize(ResourceInterface $resource):array |
|
314 | + protected function serialize( ResourceInterface $resource ):array |
|
315 | 315 | { |
316 | - return $this->manager->createData($resource)->toArray(); |
|
316 | + return $this->manager->createData( $resource )->toArray(); |
|
317 | 317 | } |
318 | 318 | } |
319 | 319 | \ No newline at end of file |
@@ -2,10 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Flugg\Responder; |
4 | 4 | |
5 | -use Flugg\Responder\ErrorResponse; |
|
6 | 5 | use Flugg\Responder\Http\ErrorResponseBuilder; |
7 | 6 | use Flugg\Responder\Http\SuccessResponseBuilder; |
8 | -use Flugg\Responder\SuccessResponse; |
|
9 | 7 | use Illuminate\Http\JsonResponse; |
10 | 8 | |
11 | 9 | /** |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * @param \Flugg\Responder\Http\ErrorResponseBuilder $errorResponse |
38 | 38 | * @param \Flugg\Responder\Http\SuccessResponseBuilder $successResponse |
39 | 39 | */ |
40 | - public function __construct(SuccessResponseBuilder $successResponse, ErrorResponseBuilder $errorResponse) |
|
40 | + public function __construct( SuccessResponseBuilder $successResponse, ErrorResponseBuilder $errorResponse ) |
|
41 | 41 | { |
42 | 42 | $this->successResponse = $successResponse; |
43 | 43 | $this->errorResponse = $errorResponse; |
@@ -51,9 +51,9 @@ discard block |
||
51 | 51 | * @param mixed $message |
52 | 52 | * @return \Illuminate\Http\JsonResponse |
53 | 53 | */ |
54 | - public function error(string $errorCode = null, int $statusCode = null, $message = null):JsonResponse |
|
54 | + public function error( string $errorCode = null, int $statusCode = null, $message = null ):JsonResponse |
|
55 | 55 | { |
56 | - return $this->errorResponse->setError($errorCode, $message)->respond($statusCode); |
|
56 | + return $this->errorResponse->setError( $errorCode, $message )->respond( $statusCode ); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -64,17 +64,17 @@ discard block |
||
64 | 64 | * @param array $meta |
65 | 65 | * @return \Illuminate\Http\JsonResponse |
66 | 66 | */ |
67 | - public function success($data = null, $statusCode = null, array $meta = []):JsonResponse |
|
67 | + public function success( $data = null, $statusCode = null, array $meta = [ ] ):JsonResponse |
|
68 | 68 | { |
69 | - if (is_integer($data)) { |
|
70 | - list($data, $statusCode, $meta) = [null, $data, is_array($statusCode) ? $statusCode : []]; |
|
69 | + if ( is_integer( $data ) ) { |
|
70 | + list($data, $statusCode, $meta) = [ null, $data, is_array( $statusCode ) ? $statusCode : [ ] ]; |
|
71 | 71 | } |
72 | 72 | |
73 | - if (is_array($statusCode)) { |
|
74 | - list($statusCode, $meta) = [200, $statusCode]; |
|
73 | + if ( is_array( $statusCode ) ) { |
|
74 | + list($statusCode, $meta) = [ 200, $statusCode ]; |
|
75 | 75 | } |
76 | 76 | |
77 | - return $this->successResponse->transform($data)->addMeta($meta)->respond($statusCode); |
|
77 | + return $this->successResponse->transform( $data )->addMeta( $meta )->respond( $statusCode ); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | * @param callable|string|null $transformer |
85 | 85 | * @return \Flugg\Responder\Http\SuccessResponseBuilder |
86 | 86 | */ |
87 | - public function transform($data = null, $transformer = null):SuccessResponseBuilder |
|
87 | + public function transform( $data = null, $transformer = null ):SuccessResponseBuilder |
|
88 | 88 | { |
89 | - return $this->successResponse->transform($data, $transformer); |
|
89 | + return $this->successResponse->transform( $data, $transformer ); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | \ No newline at end of file |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Flugg\Responder; |
4 | 4 | |
5 | 5 | use Flugg\Responder\Console\MakeTransformer; |
6 | -use Flugg\Responder\Contracts\Manager as ManagerContract; |
|
7 | 6 | use Flugg\Responder\Http\ErrorResponseBuilder; |
8 | 7 | use Flugg\Responder\Http\SuccessResponseBuilder; |
9 | 8 | use Illuminate\Contracts\Routing\ResponseFactory; |
@@ -43,18 +43,18 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function boot() |
45 | 45 | { |
46 | - if ($this->app instanceof Laravel && $this->app->runningInConsole()) { |
|
46 | + if ( $this->app instanceof Laravel && $this->app->runningInConsole() ) { |
|
47 | 47 | $this->bootLaravelApplication(); |
48 | 48 | |
49 | - } elseif ($this->app instanceof Lumen) { |
|
49 | + } elseif ( $this->app instanceof Lumen ) { |
|
50 | 50 | $this->bootLumenApplication(); |
51 | 51 | } |
52 | 52 | |
53 | - $this->mergeConfigFrom(__DIR__ . '/../resources/config/responder.php', 'responder'); |
|
53 | + $this->mergeConfigFrom( __DIR__ . '/../resources/config/responder.php', 'responder' ); |
|
54 | 54 | |
55 | - $this->commands([ |
|
55 | + $this->commands( [ |
|
56 | 56 | MakeTransformer::class |
57 | - ]); |
|
57 | + ] ); |
|
58 | 58 | |
59 | 59 | include __DIR__ . '/helpers.php'; |
60 | 60 | } |
@@ -66,34 +66,34 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function register() |
68 | 68 | { |
69 | - $this->app->bind(SerializerAbstract::class, function ($app) { |
|
70 | - $serializer = $app->config->get('responder.serializer'); |
|
69 | + $this->app->bind( SerializerAbstract::class, function ( $app ) { |
|
70 | + $serializer = $app->config->get( 'responder.serializer' ); |
|
71 | 71 | |
72 | 72 | return new $serializer; |
73 | 73 | }); |
74 | 74 | |
75 | - $this->app->bind(Manager::class, function ($app) { |
|
76 | - return (new Manager())->setSerializer($app[SerializerAbstract::class]); |
|
75 | + $this->app->bind( Manager::class, function ( $app ) { |
|
76 | + return (new Manager())->setSerializer( $app[ SerializerAbstract::class ] ); |
|
77 | 77 | }); |
78 | 78 | |
79 | - $this->app->bind(ResourceFactory::class, function () { |
|
79 | + $this->app->bind( ResourceFactory::class, function () { |
|
80 | 80 | return new ResourceFactory(); |
81 | 81 | }); |
82 | 82 | |
83 | - $this->app->bind(SuccessResponseBuilder::class, function ($app) { |
|
84 | - $builder = new SuccessResponseBuilder($app[ResponseFactory::class], $app[ResourceFactory::class], $app[Manager::class]); |
|
83 | + $this->app->bind( SuccessResponseBuilder::class, function ( $app ) { |
|
84 | + $builder = new SuccessResponseBuilder( $app[ ResponseFactory::class ], $app[ ResourceFactory::class ], $app[ Manager::class ] ); |
|
85 | 85 | |
86 | - return $builder->setIncludeStatusCode($app->config->get('responder.include_status_code')); |
|
86 | + return $builder->setIncludeStatusCode( $app->config->get( 'responder.include_status_code' ) ); |
|
87 | 87 | }); |
88 | 88 | |
89 | - $this->app->bind(ErrorResponseBuilder::class, function ($app) { |
|
90 | - $builder = new ErrorResponseBuilder($app[ResponseFactory::class], $app['translator']); |
|
89 | + $this->app->bind( ErrorResponseBuilder::class, function ( $app ) { |
|
90 | + $builder = new ErrorResponseBuilder( $app[ ResponseFactory::class ], $app[ 'translator' ] ); |
|
91 | 91 | |
92 | - return $builder->setIncludeStatusCode($app->config->get('responder.include_status_code')); |
|
92 | + return $builder->setIncludeStatusCode( $app->config->get( 'responder.include_status_code' ) ); |
|
93 | 93 | }); |
94 | 94 | |
95 | - $this->app->bind(Responder::class, function ($app) { |
|
96 | - return new Responder($app[SuccessResponseBuilder::class], $app[ErrorResponseBuilder::class]); |
|
95 | + $this->app->bind( Responder::class, function ( $app ) { |
|
96 | + return new Responder( $app[ SuccessResponseBuilder::class ], $app[ ErrorResponseBuilder::class ] ); |
|
97 | 97 | }); |
98 | 98 | |
99 | 99 | $this->registerAliases(); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function provides() |
108 | 108 | { |
109 | - return ['responder', 'responder.success', 'responder.error', 'responder.manager', 'responder.serializer']; |
|
109 | + return [ 'responder', 'responder.success', 'responder.error', 'responder.manager', 'responder.serializer' ]; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -116,11 +116,11 @@ discard block |
||
116 | 116 | */ |
117 | 117 | protected function registerAliases() |
118 | 118 | { |
119 | - $this->app->alias(Responder::class, 'responder'); |
|
120 | - $this->app->alias(SuccessResponseBuilder::class, 'responder.success'); |
|
121 | - $this->app->alias(ErrorResponseBuilder::class, 'responder.error'); |
|
122 | - $this->app->alias(Manager::class, 'responder.manager'); |
|
123 | - $this->app->alias(Manager::class, 'responder.serializer'); |
|
119 | + $this->app->alias( Responder::class, 'responder' ); |
|
120 | + $this->app->alias( SuccessResponseBuilder::class, 'responder.success' ); |
|
121 | + $this->app->alias( ErrorResponseBuilder::class, 'responder.error' ); |
|
122 | + $this->app->alias( Manager::class, 'responder.manager' ); |
|
123 | + $this->app->alias( Manager::class, 'responder.serializer' ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -130,13 +130,13 @@ discard block |
||
130 | 130 | */ |
131 | 131 | protected function bootLaravelApplication() |
132 | 132 | { |
133 | - $this->publishes([ |
|
134 | - __DIR__ . '/../resources/config/responder.php' => config_path('responder.php') |
|
135 | - ], 'config'); |
|
133 | + $this->publishes( [ |
|
134 | + __DIR__ . '/../resources/config/responder.php' => config_path( 'responder.php' ) |
|
135 | + ], 'config' ); |
|
136 | 136 | |
137 | - $this->publishes([ |
|
138 | - __DIR__ . '/../resources/lang/en/errors.php' => resource_path('lang/en/errors.php') |
|
139 | - ], 'lang'); |
|
137 | + $this->publishes( [ |
|
138 | + __DIR__ . '/../resources/lang/en/errors.php' => resource_path( 'lang/en/errors.php' ) |
|
139 | + ], 'lang' ); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
@@ -146,6 +146,6 @@ discard block |
||
146 | 146 | */ |
147 | 147 | protected function bootLumenApplication() |
148 | 148 | { |
149 | - $this->app->configure('responder'); |
|
149 | + $this->app->configure( 'responder' ); |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | \ No newline at end of file |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function getRelations():array |
25 | 25 | { |
26 | - return array_merge($this->getAvailableIncludes(), $this->getDefaultIncludes()); |
|
26 | + return array_merge( $this->getAvailableIncludes(), $this->getDefaultIncludes() ); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | * @param array|string $relations |
33 | 33 | * @return self |
34 | 34 | */ |
35 | - public function setRelations($relations) |
|
35 | + public function setRelations( $relations ) |
|
36 | 36 | { |
37 | - $this->setAvailableIncludes(array_merge($this->availableIncludes, (array) $relations)); |
|
37 | + $this->setAvailableIncludes( array_merge( $this->availableIncludes, (array) $relations ) ); |
|
38 | 38 | |
39 | 39 | return $this; |
40 | 40 | } |
@@ -49,13 +49,13 @@ discard block |
||
49 | 49 | * @return \League\Fractal\Resource\ResourceInterface|bool |
50 | 50 | * @throws \Exception |
51 | 51 | */ |
52 | - protected function callIncludeMethod(Scope $scope, $includeName, $data) |
|
52 | + protected function callIncludeMethod( Scope $scope, $includeName, $data ) |
|
53 | 53 | { |
54 | - if ($includeName === 'pivot') { |
|
55 | - return $this->includePivot($data->$includeName); |
|
54 | + if ( $includeName === 'pivot' ) { |
|
55 | + return $this->includePivot( $data->$includeName ); |
|
56 | 56 | } |
57 | 57 | |
58 | - return app(Responder::class)->transform($data->$includeName)->getResource(); |
|
58 | + return app( Responder::class )->transform( $data->$includeName )->getResource(); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | * @param Pivot $pivot |
65 | 65 | * @return \League\Fractal\Resource\ResourceInterface|bool |
66 | 66 | */ |
67 | - protected function includePivot(Pivot $pivot) |
|
67 | + protected function includePivot( Pivot $pivot ) |
|
68 | 68 | { |
69 | - if (! method_exists($this, 'transformPivot')) { |
|
69 | + if ( ! method_exists( $this, 'transformPivot' ) ) { |
|
70 | 70 | return false; |
71 | 71 | } |
72 | 72 | |
73 | - return app(Responder::class)->transform($pivot, function () use ($pivot) { |
|
74 | - return $this->transformPivot($pivot); |
|
73 | + return app( Responder::class )->transform( $pivot, function () use ($pivot) { |
|
74 | + return $this->transformPivot( $pivot ); |
|
75 | 75 | })->getResource(); |
76 | 76 | } |
77 | 77 | } |
78 | 78 | \ No newline at end of file |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | * @param array $data |
23 | 23 | * @return array |
24 | 24 | */ |
25 | - public function collection($resourceKey, array $data) |
|
25 | + public function collection( $resourceKey, array $data ) |
|
26 | 26 | { |
27 | - return $this->item($resourceKey, $data); |
|
27 | + return $this->item( $resourceKey, $data ); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | * @param array $data |
35 | 35 | * @return array |
36 | 36 | */ |
37 | - public function item($resourceKey, array $data) |
|
37 | + public function item( $resourceKey, array $data ) |
|
38 | 38 | { |
39 | - return array_merge($this->null(), [ |
|
39 | + return array_merge( $this->null(), [ |
|
40 | 40 | 'data' => $data |
41 | - ]); |
|
41 | + ] ); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @param array $meta |
61 | 61 | * @return array |
62 | 62 | */ |
63 | - public function meta(array $meta) |
|
63 | + public function meta( array $meta ) |
|
64 | 64 | { |
65 | 65 | return $meta; |
66 | 66 | } |
@@ -72,19 +72,19 @@ discard block |
||
72 | 72 | * |
73 | 73 | * @return array |
74 | 74 | */ |
75 | - public function paginator(PaginatorInterface $paginator) |
|
75 | + public function paginator( PaginatorInterface $paginator ) |
|
76 | 76 | { |
77 | - $pagination = parent::paginator($paginator)['pagination']; |
|
77 | + $pagination = parent::paginator( $paginator )[ 'pagination' ]; |
|
78 | 78 | |
79 | 79 | $data = [ |
80 | - 'total' => $pagination['total'], |
|
81 | - 'count' => $pagination['count'], |
|
82 | - 'perPage' => $pagination['per_page'], |
|
83 | - 'currentPage' => $pagination['current_page'], |
|
84 | - 'totalPages' => $pagination['total_pages'], |
|
80 | + 'total' => $pagination[ 'total' ], |
|
81 | + 'count' => $pagination[ 'count' ], |
|
82 | + 'perPage' => $pagination[ 'per_page' ], |
|
83 | + 'currentPage' => $pagination[ 'current_page' ], |
|
84 | + 'totalPages' => $pagination[ 'total_pages' ], |
|
85 | 85 | ]; |
86 | 86 | |
87 | - return ['pagination' => $data]; |
|
87 | + return [ 'pagination' => $data ]; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -104,15 +104,15 @@ discard block |
||
104 | 104 | * @param array $includedData |
105 | 105 | * @return array |
106 | 106 | */ |
107 | - public function mergeIncludes($transformedData, $includedData) |
|
107 | + public function mergeIncludes( $transformedData, $includedData ) |
|
108 | 108 | { |
109 | - $keys = array_keys($includedData); |
|
109 | + $keys = array_keys( $includedData ); |
|
110 | 110 | |
111 | - foreach ($keys as $key) { |
|
112 | - $includedData[$key] = $includedData[$key]['data']; |
|
111 | + foreach ( $keys as $key ) { |
|
112 | + $includedData[ $key ] = $includedData[ $key ][ 'data' ]; |
|
113 | 113 | } |
114 | 114 | |
115 | - return array_merge($transformedData, $includedData); |
|
115 | + return array_merge( $transformedData, $includedData ); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | * |
124 | 124 | * @return array |
125 | 125 | */ |
126 | - public function includedData(ResourceInterface $resource, array $data) |
|
126 | + public function includedData( ResourceInterface $resource, array $data ) |
|
127 | 127 | { |
128 | - return []; |
|
128 | + return [ ]; |
|
129 | 129 | } |
130 | 130 | } |
131 | 131 | \ No newline at end of file |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * |
46 | 46 | * @param \Illuminate\Contracts\Routing\ResponseFactory $responseFactory |
47 | 47 | */ |
48 | - public function __construct(ResponseFactory $responseFactory) |
|
48 | + public function __construct( ResponseFactory $responseFactory ) |
|
49 | 49 | { |
50 | 50 | $this->responseFactory = $responseFactory; |
51 | 51 | } |
@@ -57,15 +57,15 @@ discard block |
||
57 | 57 | * @param array $headers |
58 | 58 | * @return \Illuminate\Http\JsonResponse |
59 | 59 | */ |
60 | - public function respond(int $statusCode = null, array $headers = []):JsonResponse |
|
60 | + public function respond( int $statusCode = null, array $headers = [ ] ):JsonResponse |
|
61 | 61 | { |
62 | - if (! is_null($statusCode)) { |
|
63 | - $this->setStatus($statusCode); |
|
62 | + if ( ! is_null( $statusCode ) ) { |
|
63 | + $this->setStatus( $statusCode ); |
|
64 | 64 | } |
65 | 65 | |
66 | - $data = $this->includeStatusCode($this->toArray()); |
|
66 | + $data = $this->includeStatusCode( $this->toArray() ); |
|
67 | 67 | |
68 | - return $this->responseFactory->json($data, $this->statusCode, $headers); |
|
68 | + return $this->responseFactory->json( $data, $this->statusCode, $headers ); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @param int $statusCode |
75 | 75 | * @return self |
76 | 76 | */ |
77 | - public function setStatus(int $statusCode):ResponseBuilder |
|
77 | + public function setStatus( int $statusCode ):ResponseBuilder |
|
78 | 78 | { |
79 | 79 | $this->statusCode = $statusCode; |
80 | 80 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @param bool $includeStatusCode |
88 | 88 | * @return self |
89 | 89 | */ |
90 | - public function setIncludeStatusCode(bool $includeStatusCode):ResponseBuilder |
|
90 | + public function setIncludeStatusCode( bool $includeStatusCode ):ResponseBuilder |
|
91 | 91 | { |
92 | 92 | $this->includeStatusCode = $includeStatusCode; |
93 | 93 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function toCollection():Collection |
103 | 103 | { |
104 | - return new Collection($this->toArray()); |
|
104 | + return new Collection( $this->toArray() ); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -110,9 +110,9 @@ discard block |
||
110 | 110 | * @param int $options |
111 | 111 | * @return string |
112 | 112 | */ |
113 | - public function toJson($options = 0) |
|
113 | + public function toJson( $options = 0 ) |
|
114 | 114 | { |
115 | - return json_encode($this->jsonSerialize(), $options); |
|
115 | + return json_encode( $this->jsonSerialize(), $options ); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -138,12 +138,12 @@ discard block |
||
138 | 138 | * @param array $data |
139 | 139 | * @return array |
140 | 140 | */ |
141 | - protected function includeStatusCode(array $data):array |
|
141 | + protected function includeStatusCode( array $data ):array |
|
142 | 142 | { |
143 | - if (! $this->includeStatusCode) { |
|
143 | + if ( ! $this->includeStatusCode ) { |
|
144 | 144 | return $data; |
145 | 145 | } |
146 | 146 | |
147 | - return array_merge(['status' => $this->statusCode], $data);; |
|
147 | + return array_merge( [ 'status' => $this->statusCode ], $data ); ; |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | \ No newline at end of file |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * |
22 | 22 | * @var array |
23 | 23 | */ |
24 | - protected $data = []; |
|
24 | + protected $data = [ ]; |
|
25 | 25 | |
26 | 26 | /** |
27 | 27 | * The error code used to identify the error. |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | * |
43 | 43 | * @var array |
44 | 44 | */ |
45 | - protected $parameters = []; |
|
45 | + protected $parameters = [ ]; |
|
46 | 46 | |
47 | 47 | /** |
48 | 48 | * The HTTP status code for the response. |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | * @param \Illuminate\Contracts\Routing\ResponseFactory $responseFactory |
65 | 65 | * @param \Symfony\Component\Translation\TranslatorInterface $translator |
66 | 66 | */ |
67 | - public function __construct(ResponseFactory $responseFactory, TranslatorInterface $translator) |
|
67 | + public function __construct( ResponseFactory $responseFactory, TranslatorInterface $translator ) |
|
68 | 68 | { |
69 | 69 | $this->translator = $translator; |
70 | 70 | |
71 | - parent::__construct($responseFactory); |
|
71 | + parent::__construct( $responseFactory ); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | * @param array $data |
78 | 78 | * @return self |
79 | 79 | */ |
80 | - public function addData(array $data):ErrorResponseBuilder |
|
80 | + public function addData( array $data ):ErrorResponseBuilder |
|
81 | 81 | { |
82 | - $this->data = array_merge($this->data, $data); |
|
82 | + $this->data = array_merge( $this->data, $data ); |
|
83 | 83 | |
84 | 84 | return $this; |
85 | 85 | } |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | * @param string|array|null $message |
92 | 92 | * @return self |
93 | 93 | */ |
94 | - public function setError(string $errorCode = null, $message = null):ErrorResponseBuilder |
|
94 | + public function setError( string $errorCode = null, $message = null ):ErrorResponseBuilder |
|
95 | 95 | { |
96 | 96 | $this->errorCode = $errorCode; |
97 | 97 | |
98 | - if (is_array($message)) { |
|
98 | + if ( is_array( $message ) ) { |
|
99 | 99 | $this->parameters = $message; |
100 | 100 | } else { |
101 | 101 | $this->message = $message; |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | * @return self |
112 | 112 | * @throws \InvalidArgumentException |
113 | 113 | */ |
114 | - public function setStatus(int $statusCode):ResponseBuilder |
|
114 | + public function setStatus( int $statusCode ):ResponseBuilder |
|
115 | 115 | { |
116 | - if ($statusCode < 400 || $statusCode >= 600) { |
|
117 | - throw new InvalidArgumentException("{$statusCode} is not a valid error HTTP status code."); |
|
116 | + if ( $statusCode < 400 || $statusCode >= 600 ) { |
|
117 | + throw new InvalidArgumentException( "{$statusCode} is not a valid error HTTP status code." ); |
|
118 | 118 | } |
119 | 119 | |
120 | - return parent::setStatus($statusCode); |
|
120 | + return parent::setStatus( $statusCode ); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | */ |
141 | 141 | protected function buildErrorData() |
142 | 142 | { |
143 | - if (is_null($this->errorCode)) { |
|
143 | + if ( is_null( $this->errorCode ) ) { |
|
144 | 144 | return null; |
145 | 145 | } |
146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | 'message' => $this->message ?: $this->resolveMessage() |
150 | 150 | ]; |
151 | 151 | |
152 | - return array_merge($data, $this->data); |
|
152 | + return array_merge( $data, $this->data ); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | */ |
160 | 160 | protected function resolveMessage() |
161 | 161 | { |
162 | - if (! $this->translator->has($code = "errors.$this->errorCode")) { |
|
162 | + if ( ! $this->translator->has( $code = "errors.$this->errorCode" ) ) { |
|
163 | 163 | return null; |
164 | 164 | } |
165 | 165 | |
166 | - return $this->translator->trans($code, $this->parameters); |
|
166 | + return $this->translator->trans( $code, $this->parameters ); |
|
167 | 167 | } |
168 | 168 | } |
169 | 169 | \ No newline at end of file |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | use Flugg\Responder\Responder; |
4 | 4 | |
5 | -if (! function_exists('responder')) { |
|
5 | +if ( ! function_exists( 'responder' ) ) { |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * A helper method to quickly resolve the responder out of the service container. |
@@ -11,6 +11,6 @@ discard block |
||
11 | 11 | */ |
12 | 12 | function responder() |
13 | 13 | { |
14 | - return app(Responder::class); |
|
14 | + return app( Responder::class ); |
|
15 | 15 | } |
16 | 16 | } |
17 | 17 | \ No newline at end of file |
@@ -46,17 +46,17 @@ discard block |
||
46 | 46 | * @param mixed|null $data |
47 | 47 | * @return \League\Fractal\Resource\ResourceInterface |
48 | 48 | */ |
49 | - public function make($data = null) |
|
49 | + public function make( $data = null ) |
|
50 | 50 | { |
51 | - if (is_null($data)) { |
|
51 | + if ( is_null( $data ) ) { |
|
52 | 52 | return new NullResource(); |
53 | - } elseif (is_array($data)) { |
|
54 | - return static::makeFromArray($data); |
|
53 | + } elseif ( is_array( $data ) ) { |
|
54 | + return static::makeFromArray( $data ); |
|
55 | 55 | } |
56 | 56 | |
57 | - $method = static::getMakeMethod($data); |
|
57 | + $method = static::getMakeMethod( $data ); |
|
58 | 58 | |
59 | - return static::$method($data); |
|
59 | + return static::$method( $data ); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -66,15 +66,15 @@ discard block |
||
66 | 66 | * @return string |
67 | 67 | * @throws \InvalidArgumentException |
68 | 68 | */ |
69 | - protected function getMakeMethod($data):string |
|
69 | + protected function getMakeMethod( $data ):string |
|
70 | 70 | { |
71 | - foreach (static::MAKE_METHODS as $class => $method) { |
|
72 | - if ($data instanceof $class) { |
|
71 | + foreach ( static::MAKE_METHODS as $class => $method ) { |
|
72 | + if ( $data instanceof $class ) { |
|
73 | 73 | return $method; |
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | - throw new InvalidArgumentException('Given data cannot be transformed.'); |
|
77 | + throw new InvalidArgumentException( 'Given data cannot be transformed.' ); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | * @param \Illuminate\Database\Eloquent\Model $model |
84 | 84 | * @return \League\Fractal\Resource\ResourceInterface |
85 | 85 | */ |
86 | - protected function makeFromModel(Model $model):ResourceInterface |
|
86 | + protected function makeFromModel( Model $model ):ResourceInterface |
|
87 | 87 | { |
88 | - return new ItemResource($model); |
|
88 | + return new ItemResource( $model ); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | * @param array $array |
95 | 95 | * @return \League\Fractal\Resource\ResourceInterface |
96 | 96 | */ |
97 | - protected function makeFromArray(array $array):ResourceInterface |
|
97 | + protected function makeFromArray( array $array ):ResourceInterface |
|
98 | 98 | { |
99 | - return empty($array) ? new NullResource() : new CollectionResource($array); |
|
99 | + return empty($array) ? new NullResource() : new CollectionResource( $array ); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | * @param \Illuminate\Support\Collection $collection |
106 | 106 | * @return \League\Fractal\Resource\ResourceInterface |
107 | 107 | */ |
108 | - protected function makeFromCollection(Collection $collection):ResourceInterface |
|
108 | + protected function makeFromCollection( Collection $collection ):ResourceInterface |
|
109 | 109 | { |
110 | - return static::makeFromArray($collection->all()); |
|
110 | + return static::makeFromArray( $collection->all() ); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -116,9 +116,9 @@ discard block |
||
116 | 116 | * @param \Illuminate\Database\Eloquent\Builder $query |
117 | 117 | * @return \League\Fractal\Resource\ResourceInterface |
118 | 118 | */ |
119 | - protected function makeFromBuilder(Builder $query):ResourceInterface |
|
119 | + protected function makeFromBuilder( Builder $query ):ResourceInterface |
|
120 | 120 | { |
121 | - return static::makeFromCollection($query->get()); |
|
121 | + return static::makeFromCollection( $query->get() ); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | * @param \Illuminate\Contracts\Pagination\LengthAwarePaginator $paginator |
128 | 128 | * @return \League\Fractal\Resource\ResourceInterface |
129 | 129 | */ |
130 | - protected function makeFromPaginator(Paginator $paginator):ResourceInterface |
|
130 | + protected function makeFromPaginator( Paginator $paginator ):ResourceInterface |
|
131 | 131 | { |
132 | - $resource = static::makeFromCollection($paginator->getCollection()); |
|
132 | + $resource = static::makeFromCollection( $paginator->getCollection() ); |
|
133 | 133 | |
134 | - if ($resource instanceof CollectionResource) { |
|
135 | - $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); |
|
134 | + if ( $resource instanceof CollectionResource ) { |
|
135 | + $resource->setPaginator( new IlluminatePaginatorAdapter( $paginator ) ); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | return $resource; |
@@ -144,9 +144,9 @@ discard block |
||
144 | 144 | * @param \Illuminate\Database\Eloquent\Relations\Pivot $pivot |
145 | 145 | * @return \League\Fractal\Resource\ResourceInterface |
146 | 146 | */ |
147 | - protected function makeFromPivot(Pivot $pivot):ResourceInterface |
|
147 | + protected function makeFromPivot( Pivot $pivot ):ResourceInterface |
|
148 | 148 | { |
149 | - return static::makeFromModel($pivot); |
|
149 | + return static::makeFromModel( $pivot ); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | /** |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @param \Illuminate\Database\Eloquent\Relations\Relation $relation |
156 | 156 | * @return \League\Fractal\Resource\ResourceInterface |
157 | 157 | */ |
158 | - protected function makeFromRelation(Relation $relation):ResourceInterface |
|
158 | + protected function makeFromRelation( Relation $relation ):ResourceInterface |
|
159 | 159 | { |
160 | - return static::makeFromCollection($relation->get()); |
|
160 | + return static::makeFromCollection( $relation->get() ); |
|
161 | 161 | } |
162 | 162 | } |
163 | 163 | \ No newline at end of file |