@@ -47,9 +47,9 @@ |
||
47 | 47 | * |
48 | 48 | * @param string|null $message |
49 | 49 | */ |
50 | - public function __construct(string $message = null) |
|
50 | + public function __construct( string $message = null ) |
|
51 | 51 | { |
52 | - parent::__construct($this->status, $this->message ?? $message); |
|
52 | + parent::__construct( $this->status, $this->message ?? $message ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function register() |
50 | 50 | { |
51 | - if ($this->app instanceof Laravel) { |
|
51 | + if ( $this->app instanceof Laravel ) { |
|
52 | 52 | $this->registerLaravelBindings(); |
53 | - } elseif ($this->app instanceof Lumen) { |
|
53 | + } elseif ( $this->app instanceof Lumen ) { |
|
54 | 54 | $this->registerLumenBindings(); |
55 | 55 | } |
56 | 56 | |
@@ -70,8 +70,8 @@ discard block |
||
70 | 70 | */ |
71 | 71 | protected function registerLaravelBindings() |
72 | 72 | { |
73 | - $this->app->singleton(ResponseFactoryContract::class, function ($app) { |
|
74 | - return $this->decorateResponseFactory($app->make(LaravelResponseFactory::class)); |
|
73 | + $this->app->singleton( ResponseFactoryContract::class, function ( $app ) { |
|
74 | + return $this->decorateResponseFactory( $app->make( LaravelResponseFactory::class ) ); |
|
75 | 75 | }); |
76 | 76 | } |
77 | 77 | |
@@ -82,8 +82,8 @@ discard block |
||
82 | 82 | */ |
83 | 83 | protected function registerLumenBindings() |
84 | 84 | { |
85 | - $this->app->singleton(ResponseFactoryContract::class, function ($app) { |
|
86 | - return $this->decorateResponseFactory($app->make(LumenResponseFactory::class)); |
|
85 | + $this->app->singleton( ResponseFactoryContract::class, function ( $app ) { |
|
86 | + return $this->decorateResponseFactory( $app->make( LumenResponseFactory::class ) ); |
|
87 | 87 | }); |
88 | 88 | } |
89 | 89 | |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | * @param \Flugg\Responder\Contracts\ResponseFactory $factory |
94 | 94 | * @return void |
95 | 95 | */ |
96 | - protected function decorateResponseFactory(ResponseFactoryContract $factory) |
|
96 | + protected function decorateResponseFactory( ResponseFactoryContract $factory ) |
|
97 | 97 | { |
98 | - foreach ($this->app->config['responder.decorators'] as $decorator) { |
|
99 | - $factory = new $decorator($factory); |
|
98 | + foreach ( $this->app->config[ 'responder.decorators' ] as $decorator ) { |
|
99 | + $factory = new $decorator( $factory ); |
|
100 | 100 | }; |
101 | 101 | |
102 | 102 | return $factory; |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | */ |
110 | 110 | protected function registerSerializerBindings() |
111 | 111 | { |
112 | - $this->app->bind(ErrorSerializerContract::class, function ($app) { |
|
113 | - return $app->make($app->config['responder.serializers.error']); |
|
112 | + $this->app->bind( ErrorSerializerContract::class, function ( $app ) { |
|
113 | + return $app->make( $app->config[ 'responder.serializers.error' ] ); |
|
114 | 114 | }); |
115 | 115 | |
116 | - $this->app->bind(SerializerAbstract::class, function ($app) { |
|
117 | - return $app->make($app->config['responder.serializers.success']); |
|
116 | + $this->app->bind( SerializerAbstract::class, function ( $app ) { |
|
117 | + return $app->make( $app->config[ 'responder.serializers.success' ] ); |
|
118 | 118 | }); |
119 | 119 | } |
120 | 120 | |
@@ -125,12 +125,12 @@ discard block |
||
125 | 125 | */ |
126 | 126 | protected function registerErrorBindings() |
127 | 127 | { |
128 | - $this->app->singleton(ErrorMessageResolverContract::class, function () { |
|
129 | - return $app->make(ErrorMessageResolver::class); |
|
128 | + $this->app->singleton( ErrorMessageResolverContract::class, function () { |
|
129 | + return $app->make( ErrorMessageResolver::class ); |
|
130 | 130 | }); |
131 | 131 | |
132 | - $this->app->singleton(ErrorFactoryContract::class, function ($app) { |
|
133 | - return $app->make(ErrorFactory::class); |
|
132 | + $this->app->singleton( ErrorFactoryContract::class, function ( $app ) { |
|
133 | + return $app->make( ErrorFactory::class ); |
|
134 | 134 | }); |
135 | 135 | } |
136 | 136 | |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | */ |
142 | 142 | protected function registerFractalBindings() |
143 | 143 | { |
144 | - $this->app->bind(Manager::class, function ($app) { |
|
145 | - return $app->make(Manager::class)->setRecursionLimit($app->config['responder.recursion_limit']); |
|
144 | + $this->app->bind( Manager::class, function ( $app ) { |
|
145 | + return $app->make( Manager::class )->setRecursionLimit( $app->config[ 'responder.recursion_limit' ] ); |
|
146 | 146 | }); |
147 | 147 | } |
148 | 148 | |
@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | */ |
154 | 154 | protected function registerResourceBindings() |
155 | 155 | { |
156 | - $this->app->singleton(ResourceFactoryContract::class, function ($app) { |
|
157 | - return $app->make(ResourceFactory::class); |
|
156 | + $this->app->singleton( ResourceFactoryContract::class, function ( $app ) { |
|
157 | + return $app->make( ResourceFactory::class ); |
|
158 | 158 | }); |
159 | 159 | } |
160 | 160 | |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | */ |
166 | 166 | protected function registerPaginationBindings() |
167 | 167 | { |
168 | - $this->app->bind(PaginatorFactoryContract::class, function ($app) { |
|
169 | - return new PaginatorFactory($app->make(Request::class)->query()); |
|
168 | + $this->app->bind( PaginatorFactoryContract::class, function ( $app ) { |
|
169 | + return new PaginatorFactory( $app->make( Request::class )->query() ); |
|
170 | 170 | }); |
171 | 171 | } |
172 | 172 | |
@@ -177,19 +177,19 @@ discard block |
||
177 | 177 | */ |
178 | 178 | protected function registerTransformationBindings() |
179 | 179 | { |
180 | - $this->app->bind(TransformFactoryContract::class, function () { |
|
181 | - return $app->make(FractalTransformFactory::class); |
|
180 | + $this->app->bind( TransformFactoryContract::class, function () { |
|
181 | + return $app->make( FractalTransformFactory::class ); |
|
182 | 182 | }); |
183 | 183 | |
184 | - $this->app->bind(TransformBuilder::class, function ($app) { |
|
185 | - return $app->make(TransformBuilder::class) |
|
186 | - ->serializer($app->make(SerializerAbstract::class)) |
|
187 | - ->with($app->make(Request::class)->input($app->config['responder.load_relations_parameter'], [])) |
|
188 | - ->only($app->make(Request::class)->input($app->config['responder.filter_fields_parameter'], [])); |
|
184 | + $this->app->bind( TransformBuilder::class, function ( $app ) { |
|
185 | + return $app->make( TransformBuilder::class ) |
|
186 | + ->serializer( $app->make( SerializerAbstract::class ) ) |
|
187 | + ->with( $app->make( Request::class )->input( $app->config[ 'responder.load_relations_parameter' ], [ ] ) ) |
|
188 | + ->only( $app->make( Request::class )->input( $app->config[ 'responder.filter_fields_parameter' ], [ ] ) ); |
|
189 | 189 | }); |
190 | 190 | |
191 | - $this->app->singleton(TransformerResolverContract::class, function ($app) { |
|
192 | - return $app->make(TransformerResolver::class); |
|
191 | + $this->app->singleton( TransformerResolverContract::class, function ( $app ) { |
|
192 | + return $app->make( TransformerResolver::class ); |
|
193 | 193 | }); |
194 | 194 | } |
195 | 195 | |
@@ -200,12 +200,12 @@ discard block |
||
200 | 200 | */ |
201 | 201 | protected function registerServiceBindings() |
202 | 202 | { |
203 | - $this->app->singleton(ResponderContract::class, function ($app) { |
|
204 | - return $app->make(Responder::class); |
|
203 | + $this->app->singleton( ResponderContract::class, function ( $app ) { |
|
204 | + return $app->make( Responder::class ); |
|
205 | 205 | }); |
206 | 206 | |
207 | - $this->app->singleton(TransformerContract::class, function ($app) { |
|
208 | - return $app->make(Transformer::class); |
|
207 | + $this->app->singleton( TransformerContract::class, function ( $app ) { |
|
208 | + return $app->make( Transformer::class ); |
|
209 | 209 | }); |
210 | 210 | } |
211 | 211 | |
@@ -216,14 +216,14 @@ discard block |
||
216 | 216 | */ |
217 | 217 | public function boot() |
218 | 218 | { |
219 | - if ($this->app instanceof Laravel) { |
|
219 | + if ( $this->app instanceof Laravel ) { |
|
220 | 220 | $this->bootLaravelApplication(); |
221 | - } elseif ($this->app instanceof Lumen) { |
|
221 | + } elseif ( $this->app instanceof Lumen ) { |
|
222 | 222 | $this->bootLumenApplication(); |
223 | 223 | } |
224 | 224 | |
225 | - $this->mergeConfigFrom(__DIR__ . '/../config/responder.php', 'responder'); |
|
226 | - $this->commands(MakeTransformer::class); |
|
225 | + $this->mergeConfigFrom( __DIR__ . '/../config/responder.php', 'responder' ); |
|
226 | + $this->commands( MakeTransformer::class ); |
|
227 | 227 | } |
228 | 228 | |
229 | 229 | /** |
@@ -233,14 +233,14 @@ discard block |
||
233 | 233 | */ |
234 | 234 | protected function bootLaravelApplication() |
235 | 235 | { |
236 | - if ($this->app->runningInConsole()) { |
|
237 | - $this->publishes([ |
|
238 | - __DIR__ . '/../resources/config/responder.php' => config_path('responder.php'), |
|
239 | - ], 'config'); |
|
236 | + if ( $this->app->runningInConsole() ) { |
|
237 | + $this->publishes( [ |
|
238 | + __DIR__ . '/../resources/config/responder.php' => config_path( 'responder.php' ), |
|
239 | + ], 'config' ); |
|
240 | 240 | |
241 | - $this->publishes([ |
|
242 | - __DIR__ . '/../resources/lang/en/errors.php' => base_path('resources/lang/en/errors.php'), |
|
243 | - ], 'lang'); |
|
241 | + $this->publishes( [ |
|
242 | + __DIR__ . '/../resources/lang/en/errors.php' => base_path( 'resources/lang/en/errors.php' ), |
|
243 | + ], 'lang' ); |
|
244 | 244 | } |
245 | 245 | } |
246 | 246 | |
@@ -251,6 +251,6 @@ discard block |
||
251 | 251 | */ |
252 | 252 | protected function bootLumenApplication() |
253 | 253 | { |
254 | - $this->app->configure('responder'); |
|
254 | + $this->app->configure( 'responder' ); |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | \ No newline at end of file |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | use Flugg\Responder\Contracts\Responder; |
4 | 4 | use Flugg\Responder\Contracts\Transformer; |
5 | 5 | |
6 | -if (! function_exists('is_iterable')) { |
|
6 | +if ( ! function_exists( 'is_iterable' ) ) { |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * A helper to mimic php 7.1 is_iterable |
@@ -11,13 +11,13 @@ discard block |
||
11 | 11 | * @param mixed $var |
12 | 12 | * @return boolean |
13 | 13 | */ |
14 | - function is_iterable($var): bool |
|
14 | + function is_iterable( $var ): bool |
|
15 | 15 | { |
16 | - return is_array($var) || $var instanceof Traversable; |
|
16 | + return is_array( $var ) || $var instanceof Traversable; |
|
17 | 17 | } |
18 | 18 | } |
19 | 19 | |
20 | -if (! function_exists('responder')) { |
|
20 | +if ( ! function_exists( 'responder' ) ) { |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * A helper method to resolve the responder service out of the service container. |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | */ |
27 | 27 | function responder(): Responder |
28 | 28 | { |
29 | - return app(Responder::class); |
|
29 | + return app( Responder::class ); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
33 | -if (! function_exists('transform')) { |
|
33 | +if ( ! function_exists( 'transform' ) ) { |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * A helper method to transform data without serializing. |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | * @param string[] $without |
42 | 42 | * @return array |
43 | 43 | */ |
44 | - function transform($data = null, $transformer = null, array $with = [], array $without = []): array |
|
44 | + function transform( $data = null, $transformer = null, array $with = [ ], array $without = [ ] ): array |
|
45 | 45 | { |
46 | - return app(Transformer::class)->transform($data, $transformer, $with, $without); |
|
46 | + return app( Transformer::class )->transform( $data, $transformer, $with, $without ); |
|
47 | 47 | } |
48 | 48 | } |
@@ -56,11 +56,11 @@ discard block |
||
56 | 56 | * @param \Flugg\Responder\Contracts\ResponseFactory $responseFactory |
57 | 57 | * @param \Flugg\Responder\Contracts\ErrorFactory $errorFactory |
58 | 58 | */ |
59 | - public function __construct(ResponseFactory $responseFactory, ErrorFactory $errorFactory) |
|
59 | + public function __construct( ResponseFactory $responseFactory, ErrorFactory $errorFactory ) |
|
60 | 60 | { |
61 | 61 | $this->errorFactory = $errorFactory; |
62 | 62 | |
63 | - parent::__construct($responseFactory); |
|
63 | + parent::__construct( $responseFactory ); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @param string|null $message |
71 | 71 | * @return self |
72 | 72 | */ |
73 | - public function error(string $errorCode = null, string $message = null): ErrorResponseBuilder |
|
73 | + public function error( string $errorCode = null, string $message = null ): ErrorResponseBuilder |
|
74 | 74 | { |
75 | 75 | $this->errorCode = $errorCode; |
76 | 76 | $this->message = $message; |
@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | * @param array $data |
85 | 85 | * @return self |
86 | 86 | */ |
87 | - public function data(array $data): ErrorResponseBuilder |
|
87 | + public function data( array $data ): ErrorResponseBuilder |
|
88 | 88 | { |
89 | - $this->data = array_merge((array) $this->data, $data); |
|
89 | + $this->data = array_merge( (array) $this->data, $data ); |
|
90 | 90 | |
91 | 91 | return $this; |
92 | 92 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | */ |
99 | 99 | protected function getOutput(): array |
100 | 100 | { |
101 | - return $this->errorFactory->make($this->errorCode, $this->message, $this->data); |
|
101 | + return $this->errorFactory->make( $this->errorCode, $this->message, $this->data ); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -108,10 +108,10 @@ discard block |
||
108 | 108 | * @return void |
109 | 109 | * @throws \InvalidArgumentException |
110 | 110 | */ |
111 | - protected function validateStatusCode(int $status) |
|
111 | + protected function validateStatusCode( int $status ) |
|
112 | 112 | { |
113 | - if ($status < 400 || $status >= 600) { |
|
114 | - throw new InvalidArgumentException("{$status} is not a valid error HTTP status code."); |
|
113 | + if ( $status < 400 || $status >= 600 ) { |
|
114 | + throw new InvalidArgumentException( "{$status} is not a valid error HTTP status code." ); |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | } |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | * @param \Flugg\Responder\Contracts\ResponseFactory $responseFactory |
47 | 47 | * @param \Flugg\Responder\TransformBuilder $transformBuilder |
48 | 48 | */ |
49 | - public function __construct(ResponseFactory $responseFactory, TransformBuilder $transformBuilder) |
|
49 | + public function __construct( ResponseFactory $responseFactory, TransformBuilder $transformBuilder ) |
|
50 | 50 | { |
51 | 51 | $this->transformBuilder = $transformBuilder; |
52 | 52 | |
53 | - parent::__construct($responseFactory); |
|
53 | + parent::__construct( $responseFactory ); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | /** |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | * @param string|null $resourceKey |
62 | 62 | * @return self |
63 | 63 | */ |
64 | - public function transform($data = null, $transformer = null, string $resourceKey = null): SuccessResponseBuilder |
|
64 | + public function transform( $data = null, $transformer = null, string $resourceKey = null ): SuccessResponseBuilder |
|
65 | 65 | { |
66 | - $this->transformBuilder->resource($data, $transformer, $resourceKey); |
|
66 | + $this->transformBuilder->resource( $data, $transformer, $resourceKey ); |
|
67 | 67 | |
68 | 68 | return $this; |
69 | 69 | } |
@@ -75,10 +75,10 @@ discard block |
||
75 | 75 | * @param array $arguments |
76 | 76 | * @return self|void |
77 | 77 | */ |
78 | - public function __call($name, $arguments) |
|
78 | + public function __call( $name, $arguments ) |
|
79 | 79 | { |
80 | - if (in_array($name, ['meta', 'with', 'without', 'serializer', 'paginator', 'cursor'])) { |
|
81 | - $this->transformBuilder->$name(...$arguments); |
|
80 | + if ( in_array( $name, [ 'meta', 'with', 'without', 'serializer', 'paginator', 'cursor' ] ) ) { |
|
81 | + $this->transformBuilder->$name( ...$arguments ); |
|
82 | 82 | |
83 | 83 | return $this; |
84 | 84 | } |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | * @return void |
104 | 104 | * @throws \InvalidArgumentException |
105 | 105 | */ |
106 | - protected function validateStatusCode(int $status) |
|
106 | + protected function validateStatusCode( int $status ) |
|
107 | 107 | { |
108 | - if ($status < 100 || $status >= 400) { |
|
109 | - throw new InvalidArgumentException("{$status} is not a valid success HTTP status code."); |
|
108 | + if ( $status < 100 || $status >= 400 ) { |
|
109 | + throw new InvalidArgumentException( "{$status} is not a valid success HTTP status code." ); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * |
37 | 37 | * @param \Flugg\Responder\Contracts\ResponseFactory $responseFactory |
38 | 38 | */ |
39 | - public function __construct(ResponseFactory $responseFactory) |
|
39 | + public function __construct( ResponseFactory $responseFactory ) |
|
40 | 40 | { |
41 | 41 | $this->responseFactory = $responseFactory; |
42 | 42 | } |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | * @param array $headers |
49 | 49 | * @return \Illuminate\Http\JsonResponse |
50 | 50 | */ |
51 | - public function respond(int $status = null, array $headers = []): JsonResponse |
|
51 | + public function respond( int $status = null, array $headers = [ ] ): JsonResponse |
|
52 | 52 | { |
53 | - if (! is_null($status)) { |
|
54 | - $this->setStatusCode($status); |
|
53 | + if ( ! is_null( $status ) ) { |
|
54 | + $this->setStatusCode( $status ); |
|
55 | 55 | } |
56 | 56 | |
57 | - return $this->responseFactory->make($this->toArray(), $this->status, $headers); |
|
57 | + return $this->responseFactory->make( $this->toArray(), $this->status, $headers ); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function toCollection(): Collection |
76 | 76 | { |
77 | - return new Collection($this->toArray()); |
|
77 | + return new Collection( $this->toArray() ); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | * @param int $options |
84 | 84 | * @return string |
85 | 85 | */ |
86 | - public function toJson($options = 0): string |
|
86 | + public function toJson( $options = 0 ): string |
|
87 | 87 | { |
88 | - return json_encode($this->toArray(), $options); |
|
88 | + return json_encode( $this->toArray(), $options ); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | * @param int $status |
95 | 95 | * @return void |
96 | 96 | */ |
97 | - protected function setStatusCode(int $status) |
|
97 | + protected function setStatusCode( int $status ) |
|
98 | 98 | { |
99 | - $this->validateStatusCode($this->status = $status); |
|
99 | + $this->validateStatusCode( $this->status = $status ); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -112,5 +112,5 @@ discard block |
||
112 | 112 | * @param int $status |
113 | 113 | * @return void |
114 | 114 | */ |
115 | - abstract protected function validateStatusCode(int $status); |
|
115 | + abstract protected function validateStatusCode( int $status ); |
|
116 | 116 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @param \Flugg\Responder\Contracts\ErrorMessageResolver $messageResolver |
36 | 36 | * @param \Flugg\Responder\Contracts\ErrorSerializer $serializer |
37 | 37 | */ |
38 | - public function __construct(ErrorMessageResolverContract $messageResolver, ErrorSerializerContract $serializer) |
|
38 | + public function __construct( ErrorMessageResolverContract $messageResolver, ErrorSerializerContract $serializer ) |
|
39 | 39 | { |
40 | 40 | $this->messageResolver = $messageResolver; |
41 | 41 | $this->serializer = $serializer; |
@@ -49,12 +49,12 @@ discard block |
||
49 | 49 | * @param array|null $data |
50 | 50 | * @return array |
51 | 51 | */ |
52 | - public function make(string $errorCode = null, string $message = null, array $data = null): array |
|
52 | + public function make( string $errorCode = null, string $message = null, array $data = null ): array |
|
53 | 53 | { |
54 | - if (isset($errorCode) && ! isset($message)) { |
|
55 | - $message = $this->messageResolver->resolve($errorCode); |
|
54 | + if ( isset($errorCode) && ! isset($message) ) { |
|
55 | + $message = $this->messageResolver->resolve( $errorCode ); |
|
56 | 56 | } |
57 | 57 | |
58 | - return $this->serializer->format($errorCode, $message, $data); |
|
58 | + return $this->serializer->format( $errorCode, $message, $data ); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |