@@ -59,7 +59,7 @@ |
||
59 | 59 | /** |
60 | 60 | * Constructor. |
61 | 61 | * |
62 | - * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory |
|
62 | + * @param \Illuminate\Contracts\Routing\ResponseFactory $responseFactory |
|
63 | 63 | * @param \Symfony\Component\Translation\TranslatorInterface|Illuminate\Contracts\Translation\Translator $translator |
64 | 64 | */ |
65 | 65 | public function __construct($responseFactory, $translator) |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * |
20 | 20 | * @var array |
21 | 21 | */ |
22 | - protected $data = []; |
|
22 | + protected $data = [ ]; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * The error code used to identify the error. |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $parameters = []; |
|
43 | + protected $parameters = [ ]; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * The HTTP status code for the response. |
@@ -62,11 +62,11 @@ discard block |
||
62 | 62 | * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory |
63 | 63 | * @param \Symfony\Component\Translation\TranslatorInterface|Illuminate\Contracts\Translation\Translator $translator |
64 | 64 | */ |
65 | - public function __construct($responseFactory, $translator) |
|
65 | + public function __construct( $responseFactory, $translator ) |
|
66 | 66 | { |
67 | 67 | $this->translator = $translator; |
68 | 68 | |
69 | - parent::__construct($responseFactory); |
|
69 | + parent::__construct( $responseFactory ); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | * @param array $data |
76 | 76 | * @return self |
77 | 77 | */ |
78 | - public function addData(array $data):ErrorResponseBuilder |
|
78 | + public function addData( array $data ):ErrorResponseBuilder |
|
79 | 79 | { |
80 | - $this->data = array_merge($this->data, $data); |
|
80 | + $this->data = array_merge( $this->data, $data ); |
|
81 | 81 | |
82 | 82 | return $this; |
83 | 83 | } |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | * @param string|array|null $message |
90 | 90 | * @return self |
91 | 91 | */ |
92 | - public function setError($errorCode = null, $message = null):ErrorResponseBuilder |
|
92 | + public function setError( $errorCode = null, $message = null ):ErrorResponseBuilder |
|
93 | 93 | { |
94 | 94 | $this->errorCode = $errorCode; |
95 | 95 | |
96 | - if (is_array($message)) { |
|
96 | + if ( is_array( $message ) ) { |
|
97 | 97 | $this->parameters = $message; |
98 | 98 | } else { |
99 | 99 | $this->message = $message; |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | * @return self |
110 | 110 | * @throws \InvalidArgumentException |
111 | 111 | */ |
112 | - public function setStatus(int $statusCode):ResponseBuilder |
|
112 | + public function setStatus( int $statusCode ):ResponseBuilder |
|
113 | 113 | { |
114 | - if ($statusCode < 400 || $statusCode >= 600) { |
|
115 | - throw new InvalidArgumentException("{$statusCode} is not a valid error HTTP status code."); |
|
114 | + if ( $statusCode < 400 || $statusCode >= 600 ) { |
|
115 | + throw new InvalidArgumentException( "{$statusCode} is not a valid error HTTP status code." ); |
|
116 | 116 | } |
117 | - return parent::setStatus($statusCode); |
|
117 | + return parent::setStatus( $statusCode ); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | */ |
137 | 137 | protected function buildErrorData() |
138 | 138 | { |
139 | - if (is_null($this->errorCode)) { |
|
139 | + if ( is_null( $this->errorCode ) ) { |
|
140 | 140 | return null; |
141 | 141 | } |
142 | 142 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | 'message' => $this->message ?: $this->resolveMessage() |
146 | 146 | ]; |
147 | 147 | |
148 | - return array_merge($data, $this->data); |
|
148 | + return array_merge( $data, $this->data ); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -155,10 +155,10 @@ discard block |
||
155 | 155 | */ |
156 | 156 | protected function resolveMessage() |
157 | 157 | { |
158 | - if (! $this->translator->has($code = "errors.$this->errorCode")) { |
|
158 | + if ( ! $this->translator->has( $code = "errors.$this->errorCode" ) ) { |
|
159 | 159 | return null; |
160 | 160 | } |
161 | 161 | |
162 | - return $this->translator->trans($code, $this->parameters); |
|
162 | + return $this->translator->trans( $code, $this->parameters ); |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | \ No newline at end of file |
@@ -6,8 +6,6 @@ |
||
6 | 6 | use Flugg\Responder\Exceptions\InvalidSerializerException; |
7 | 7 | use Flugg\Responder\Exceptions\InvalidTransformerException; |
8 | 8 | use Flugg\Responder\ResourceFactory; |
9 | -use Flugg\Responder\ResourceResolver; |
|
10 | -use Flugg\Responder\Transformation; |
|
11 | 9 | use Flugg\Responder\Transformer; |
12 | 10 | use Illuminate\Database\Eloquent\Model; |
13 | 11 | use InvalidArgumentException; |
@@ -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\Foundation\Application as Laravel; |
@@ -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 | } |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | $this->registerFractal(); |
70 | 70 | $this->registerResponseBuilders(); |
71 | 71 | |
72 | - $this->app->bind(Responder::class, function ($app) { |
|
73 | - return new Responder($app[SuccessResponseBuilder::class], $app[ErrorResponseBuilder::class]); |
|
72 | + $this->app->bind( Responder::class, function ( $app ) { |
|
73 | + return new Responder( $app[ SuccessResponseBuilder::class ], $app[ ErrorResponseBuilder::class ] ); |
|
74 | 74 | }); |
75 | 75 | |
76 | 76 | $this->registerAliases(); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function provides() |
85 | 85 | { |
86 | - return ['responder', 'responder.success', 'responder.error', 'responder.manager', 'responder.serializer']; |
|
86 | + return [ 'responder', 'responder.success', 'responder.error', 'responder.manager', 'responder.serializer' ]; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
@@ -94,17 +94,17 @@ discard block |
||
94 | 94 | */ |
95 | 95 | protected function registerFractal() |
96 | 96 | { |
97 | - $this->app->bind(SerializerAbstract::class, function ($app) { |
|
98 | - $serializer = $app->config->get('responder.serializer'); |
|
97 | + $this->app->bind( SerializerAbstract::class, function ( $app ) { |
|
98 | + $serializer = $app->config->get( 'responder.serializer' ); |
|
99 | 99 | |
100 | 100 | return new $serializer; |
101 | 101 | }); |
102 | 102 | |
103 | - $this->app->bind(Manager::class, function ($app) { |
|
104 | - return (new Manager())->setSerializer($app[SerializerAbstract::class]); |
|
103 | + $this->app->bind( Manager::class, function ( $app ) { |
|
104 | + return (new Manager())->setSerializer( $app[ SerializerAbstract::class ] ); |
|
105 | 105 | }); |
106 | 106 | |
107 | - $this->app->bind(ResourceFactory::class, function () { |
|
107 | + $this->app->bind( ResourceFactory::class, function () { |
|
108 | 108 | return new ResourceFactory(); |
109 | 109 | }); |
110 | 110 | } |
@@ -116,22 +116,22 @@ discard block |
||
116 | 116 | */ |
117 | 117 | protected function registerResponseBuilders() |
118 | 118 | { |
119 | - $this->app->bind(SuccessResponseBuilder::class, function ($app) { |
|
120 | - $builder = new SuccessResponseBuilder(response(), $app[ResourceFactory::class], $app[Manager::class]); |
|
119 | + $this->app->bind( SuccessResponseBuilder::class, function ( $app ) { |
|
120 | + $builder = new SuccessResponseBuilder( response(), $app[ ResourceFactory::class ], $app[ Manager::class ] ); |
|
121 | 121 | |
122 | - if ($parameter = $app->config->get('responder.load_relations_from_parameter')) { |
|
123 | - $builder->include($this->app[Request::class]->input($parameter, [])); |
|
122 | + if ( $parameter = $app->config->get( 'responder.load_relations_from_parameter' ) ) { |
|
123 | + $builder->include( $this->app[ Request::class ]->input( $parameter, [ ] ) ); |
|
124 | 124 | } |
125 | 125 | |
126 | - return $builder->setIncludeSuccessFlag($app->config->get('responder.include_success_flag')); |
|
127 | - return $builder->setIncludeStatusCode($app->config->get('responder.include_status_code')); |
|
126 | + return $builder->setIncludeSuccessFlag( $app->config->get( 'responder.include_success_flag' ) ); |
|
127 | + return $builder->setIncludeStatusCode( $app->config->get( 'responder.include_status_code' ) ); |
|
128 | 128 | }); |
129 | 129 | |
130 | - $this->app->bind(ErrorResponseBuilder::class, function ($app) { |
|
131 | - $builder = new ErrorResponseBuilder(response(), $app['translator']); |
|
130 | + $this->app->bind( ErrorResponseBuilder::class, function ( $app ) { |
|
131 | + $builder = new ErrorResponseBuilder( response(), $app[ 'translator' ] ); |
|
132 | 132 | |
133 | - return $builder->setIncludeSuccessFlag($app->config->get('responder.include_success_flag')); |
|
134 | - return $builder->setIncludeStatusCode($app->config->get('responder.include_status_code')); |
|
133 | + return $builder->setIncludeSuccessFlag( $app->config->get( 'responder.include_success_flag' ) ); |
|
134 | + return $builder->setIncludeStatusCode( $app->config->get( 'responder.include_status_code' ) ); |
|
135 | 135 | }); |
136 | 136 | } |
137 | 137 | |
@@ -142,11 +142,11 @@ discard block |
||
142 | 142 | */ |
143 | 143 | protected function registerAliases() |
144 | 144 | { |
145 | - $this->app->alias(Responder::class, 'responder'); |
|
146 | - $this->app->alias(SuccessResponseBuilder::class, 'responder.success'); |
|
147 | - $this->app->alias(ErrorResponseBuilder::class, 'responder.error'); |
|
148 | - $this->app->alias(Manager::class, 'responder.manager'); |
|
149 | - $this->app->alias(Manager::class, 'responder.serializer'); |
|
145 | + $this->app->alias( Responder::class, 'responder' ); |
|
146 | + $this->app->alias( SuccessResponseBuilder::class, 'responder.success' ); |
|
147 | + $this->app->alias( ErrorResponseBuilder::class, 'responder.error' ); |
|
148 | + $this->app->alias( Manager::class, 'responder.manager' ); |
|
149 | + $this->app->alias( Manager::class, 'responder.serializer' ); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | /** |
@@ -156,13 +156,13 @@ discard block |
||
156 | 156 | */ |
157 | 157 | protected function bootLaravelApplication() |
158 | 158 | { |
159 | - $this->publishes([ |
|
160 | - __DIR__ . '/../resources/config/responder.php' => config_path('responder.php') |
|
161 | - ], 'config'); |
|
159 | + $this->publishes( [ |
|
160 | + __DIR__ . '/../resources/config/responder.php' => config_path( 'responder.php' ) |
|
161 | + ], 'config' ); |
|
162 | 162 | |
163 | - $this->publishes([ |
|
164 | - __DIR__ . '/../resources/lang/en/errors.php' => base_path('resources/lang/en/errors.php') |
|
165 | - ], 'lang'); |
|
163 | + $this->publishes( [ |
|
164 | + __DIR__ . '/../resources/lang/en/errors.php' => base_path( 'resources/lang/en/errors.php' ) |
|
165 | + ], 'lang' ); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
@@ -172,6 +172,6 @@ discard block |
||
172 | 172 | */ |
173 | 173 | protected function bootLumenApplication() |
174 | 174 | { |
175 | - $this->app->configure('responder'); |
|
175 | + $this->app->configure( 'responder' ); |
|
176 | 176 | } |
177 | 177 | } |
@@ -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,15 +51,15 @@ discard block |
||
51 | 51 | * @param mixed $message |
52 | 52 | * @return \Illuminate\Http\JsonResponse |
53 | 53 | */ |
54 | - public function error($errorCode = null, int $statusCode = null, $message = null):JsonResponse |
|
54 | + public function error( $errorCode = null, int $statusCode = null, $message = null ):JsonResponse |
|
55 | 55 | { |
56 | - if ($exception = config("responder.exceptions.$errorCode")) { |
|
57 | - if (class_exists($exception)) { |
|
56 | + if ( $exception = config( "responder.exceptions.$errorCode" ) ) { |
|
57 | + if ( class_exists( $exception ) ) { |
|
58 | 58 | throw new $exception(); |
59 | 59 | } |
60 | 60 | } |
61 | 61 | |
62 | - return $this->errorResponse->setError($errorCode, $message)->respond($statusCode); |
|
62 | + return $this->errorResponse->setError( $errorCode, $message )->respond( $statusCode ); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -70,17 +70,17 @@ discard block |
||
70 | 70 | * @param array $meta |
71 | 71 | * @return \Illuminate\Http\JsonResponse |
72 | 72 | */ |
73 | - public function success($data = null, $statusCode = null, array $meta = []):JsonResponse |
|
73 | + public function success( $data = null, $statusCode = null, array $meta = [ ] ):JsonResponse |
|
74 | 74 | { |
75 | - if (is_integer($data)) { |
|
76 | - list($data, $statusCode, $meta) = [null, $data, is_array($statusCode) ? $statusCode : []]; |
|
75 | + if ( is_integer( $data ) ) { |
|
76 | + list($data, $statusCode, $meta) = [ null, $data, is_array( $statusCode ) ? $statusCode : [ ] ]; |
|
77 | 77 | } |
78 | 78 | |
79 | - if (is_array($statusCode)) { |
|
80 | - list($statusCode, $meta) = [200, $statusCode]; |
|
79 | + if ( is_array( $statusCode ) ) { |
|
80 | + list($statusCode, $meta) = [ 200, $statusCode ]; |
|
81 | 81 | } |
82 | 82 | |
83 | - return $this->successResponse->transform($data)->addMeta($meta)->respond($statusCode); |
|
83 | + return $this->successResponse->transform( $data )->addMeta( $meta )->respond( $statusCode ); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | * @param callable|string|null $transformer |
91 | 91 | * @return \Flugg\Responder\Http\SuccessResponseBuilder |
92 | 92 | */ |
93 | - public function transform($data = null, $transformer = null):SuccessResponseBuilder |
|
93 | + public function transform( $data = null, $transformer = null ):SuccessResponseBuilder |
|
94 | 94 | { |
95 | - return $this->successResponse->transform($data, $transformer); |
|
95 | + return $this->successResponse->transform( $data, $transformer ); |
|
96 | 96 | } |
97 | 97 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * |
60 | 60 | * @param \Illuminate\Contracts\Routing\ResponseFactory|\Laravel\Lumen\Http\ResponseFactory $responseFactory |
61 | 61 | */ |
62 | - public function __construct($responseFactory) |
|
62 | + public function __construct( $responseFactory ) |
|
63 | 63 | { |
64 | 64 | $this->responseFactory = $responseFactory; |
65 | 65 | } |
@@ -71,17 +71,17 @@ discard block |
||
71 | 71 | * @param array $headers |
72 | 72 | * @return \Illuminate\Http\JsonResponse |
73 | 73 | */ |
74 | - public function respond(int $statusCode = null, array $headers = []):JsonResponse |
|
74 | + public function respond( int $statusCode = null, array $headers = [ ] ):JsonResponse |
|
75 | 75 | { |
76 | - if (! is_null($statusCode)) { |
|
77 | - $this->setStatus($statusCode); |
|
76 | + if ( ! is_null( $statusCode ) ) { |
|
77 | + $this->setStatus( $statusCode ); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | $data = $this->toArray(); |
81 | - $data = $this->includeStatusCode($data); |
|
82 | - $data = $this->includeSuccessFlag($data); |
|
81 | + $data = $this->includeStatusCode( $data ); |
|
82 | + $data = $this->includeSuccessFlag( $data ); |
|
83 | 83 | |
84 | - return $this->responseFactory->json($data, $this->statusCode, $headers); |
|
84 | + return $this->responseFactory->json( $data, $this->statusCode, $headers ); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | * @param int $statusCode |
91 | 91 | * @return self |
92 | 92 | */ |
93 | - public function setStatus(int $statusCode):ResponseBuilder |
|
93 | + public function setStatus( int $statusCode ):ResponseBuilder |
|
94 | 94 | { |
95 | 95 | $this->statusCode = $statusCode; |
96 | 96 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | * @param bool $includeSuccessFlag |
111 | 111 | * @return self |
112 | 112 | */ |
113 | - public function setIncludeSuccessFlag(bool $includeSuccessFlag):ResponseBuilder |
|
113 | + public function setIncludeSuccessFlag( bool $includeSuccessFlag ):ResponseBuilder |
|
114 | 114 | { |
115 | 115 | $this->includeSuccessFlag = $includeSuccessFlag; |
116 | 116 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * @param bool $includeStatusCode |
124 | 124 | * @return self |
125 | 125 | */ |
126 | - public function setIncludeStatusCode(bool $includeStatusCode):ResponseBuilder |
|
126 | + public function setIncludeStatusCode( bool $includeStatusCode ):ResponseBuilder |
|
127 | 127 | { |
128 | 128 | $this->includeStatusCode = $includeStatusCode; |
129 | 129 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public function toCollection():Collection |
139 | 139 | { |
140 | - return new Collection($this->toArray()); |
|
140 | + return new Collection( $this->toArray() ); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -146,9 +146,9 @@ discard block |
||
146 | 146 | * @param int $options |
147 | 147 | * @return string |
148 | 148 | */ |
149 | - public function toJson($options = 0) |
|
149 | + public function toJson( $options = 0 ) |
|
150 | 150 | { |
151 | - return json_encode($this->jsonSerialize(), $options); |
|
151 | + return json_encode( $this->jsonSerialize(), $options ); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -174,13 +174,13 @@ discard block |
||
174 | 174 | * @param array $data |
175 | 175 | * @return array |
176 | 176 | */ |
177 | - protected function includeSuccessFlag(array $data):array |
|
177 | + protected function includeSuccessFlag( array $data ):array |
|
178 | 178 | { |
179 | - if (! $this->includeSuccessFlag) { |
|
179 | + if ( ! $this->includeSuccessFlag ) { |
|
180 | 180 | return $data; |
181 | 181 | } |
182 | 182 | |
183 | - return array_merge(['success' => $this->isSuccessResponse()], $data); |
|
183 | + return array_merge( [ 'success' => $this->isSuccessResponse() ], $data ); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | /** |
@@ -189,12 +189,12 @@ discard block |
||
189 | 189 | * @param array $data |
190 | 190 | * @return array |
191 | 191 | */ |
192 | - protected function includeStatusCode(array $data):array |
|
192 | + protected function includeStatusCode( array $data ):array |
|
193 | 193 | { |
194 | - if (! $this->includeStatusCode) { |
|
194 | + if ( ! $this->includeStatusCode ) { |
|
195 | 195 | return $data; |
196 | 196 | } |
197 | 197 | |
198 | - return array_merge(['status' => $this->statusCode], $data); |
|
198 | + return array_merge( [ 'status' => $this->statusCode ], $data ); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | \ No newline at end of file |