@@ -101,7 +101,7 @@ |
||
101 | 101 | protected function buildModelReplacements(array $replace) |
102 | 102 | { |
103 | 103 | if (! class_exists($modelClass = $this->parseModel($this->option('model')))) { |
104 | - if ($this->confirm("A {$modelClass} model does not exist. Do you want to generate it?", true)) { |
|
104 | + if ($this->confirm("a {$modelClass} model does not exist. Do you want to generate it?", true)) { |
|
105 | 105 | $this->call('make:model', ['name' => $modelClass]); |
106 | 106 | } |
107 | 107 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | protected function getStub() |
45 | 45 | { |
46 | - if ($this->option('plain')) { |
|
46 | + if ( $this->option( 'plain' ) ) { |
|
47 | 47 | return __DIR__ . '/../../resources/stubs/transformer.plain.stub'; |
48 | 48 | } |
49 | 49 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param string $rootNamespace |
57 | 57 | * @return string |
58 | 58 | */ |
59 | - protected function getDefaultNamespace($rootNamespace) |
|
59 | + protected function getDefaultNamespace( $rootNamespace ) |
|
60 | 60 | { |
61 | 61 | return $rootNamespace . '\Transformers'; |
62 | 62 | } |
@@ -67,19 +67,19 @@ discard block |
||
67 | 67 | * @param string $name |
68 | 68 | * @return string |
69 | 69 | */ |
70 | - protected function buildClass($name) |
|
70 | + protected function buildClass( $name ) |
|
71 | 71 | { |
72 | - $replace = []; |
|
72 | + $replace = [ ]; |
|
73 | 73 | |
74 | - if (! $this->option('model') && ! $this->option('plain')) { |
|
75 | - $this->input->setOption('model', $this->resolveModelFromClassName()); |
|
74 | + if ( ! $this->option( 'model' ) && ! $this->option( 'plain' ) ) { |
|
75 | + $this->input->setOption( 'model', $this->resolveModelFromClassName() ); |
|
76 | 76 | } |
77 | 77 | |
78 | - if ($this->option('model')) { |
|
79 | - $replace = $this->buildModelReplacements($replace); |
|
78 | + if ( $this->option( 'model' ) ) { |
|
79 | + $replace = $this->buildModelReplacements( $replace ); |
|
80 | 80 | } |
81 | 81 | |
82 | - return str_replace(array_keys($replace), array_values($replace), parent::buildClass($name)); |
|
82 | + return str_replace( array_keys( $replace ), array_values( $replace ), parent::buildClass( $name ) ); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | protected function resolveModelFromClassName() |
91 | 91 | { |
92 | - return 'App\\' . str_replace('Transformer', '', array_last(explode('/', $this->getNameInput()))); |
|
92 | + return 'App\\' . str_replace( 'Transformer', '', array_last( explode( '/', $this->getNameInput() ) ) ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -98,19 +98,19 @@ discard block |
||
98 | 98 | * @param array $replace |
99 | 99 | * @return array |
100 | 100 | */ |
101 | - protected function buildModelReplacements(array $replace) |
|
101 | + protected function buildModelReplacements( array $replace ) |
|
102 | 102 | { |
103 | - if (! class_exists($modelClass = $this->parseModel($this->option('model')))) { |
|
104 | - if ($this->confirm("A {$modelClass} model does not exist. Do you want to generate it?", true)) { |
|
105 | - $this->call('make:model', ['name' => $modelClass]); |
|
103 | + if ( ! class_exists( $modelClass = $this->parseModel( $this->option( 'model' ) ) ) ) { |
|
104 | + if ( $this->confirm( "A {$modelClass} model does not exist. Do you want to generate it?", true ) ) { |
|
105 | + $this->call( 'make:model', [ 'name' => $modelClass ] ); |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
109 | - return array_merge($replace, [ |
|
109 | + return array_merge( $replace, [ |
|
110 | 110 | 'DummyFullModelClass' => $modelClass, |
111 | - 'DummyModelClass' => class_basename($modelClass), |
|
112 | - 'DummyModelVariable' => lcfirst(class_basename($modelClass)), |
|
113 | - ]); |
|
111 | + 'DummyModelClass' => class_basename( $modelClass ), |
|
112 | + 'DummyModelVariable' => lcfirst( class_basename( $modelClass ) ), |
|
113 | + ] ); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -119,15 +119,15 @@ discard block |
||
119 | 119 | * @param string $model |
120 | 120 | * @return string |
121 | 121 | */ |
122 | - protected function parseModel($model) |
|
122 | + protected function parseModel( $model ) |
|
123 | 123 | { |
124 | - if (preg_match('([^A-Za-z0-9_/\\\\])', $model)) { |
|
125 | - throw new InvalidArgumentException('Model name contains invalid characters.'); |
|
124 | + if ( preg_match( '([^A-Za-z0-9_/\\\\])', $model ) ) { |
|
125 | + throw new InvalidArgumentException( 'Model name contains invalid characters.' ); |
|
126 | 126 | } |
127 | 127 | |
128 | - $model = trim(str_replace('/', '\\', $model), '\\'); |
|
128 | + $model = trim( str_replace( '/', '\\', $model ), '\\' ); |
|
129 | 129 | |
130 | - if (! Str::startsWith($model, $rootNamespace = $this->laravel->getNamespace())) { |
|
130 | + if ( ! Str::startsWith( $model, $rootNamespace = $this->laravel->getNamespace() ) ) { |
|
131 | 131 | $model = $rootNamespace . $model; |
132 | 132 | } |
133 | 133 | |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | protected function getOptions() |
143 | 143 | { |
144 | 144 | return [ |
145 | - ['model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a model transformer.'], |
|
146 | - ['plain', 'p', InputOption::VALUE_NONE, 'Generate a plain transformer.'], |
|
145 | + [ 'model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a model transformer.' ], |
|
146 | + [ 'plain', 'p', InputOption::VALUE_NONE, 'Generate a plain transformer.' ], |
|
147 | 147 | ]; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | \ No newline at end of file |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $dontConvert = []; |
|
35 | + protected $dontConvert = [ ]; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * Convert an exception to another exception |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | * @param array $convert |
42 | 42 | * @return void |
43 | 43 | */ |
44 | - protected function convert(Exception $exception, array $convert) |
|
44 | + protected function convert( Exception $exception, array $convert ) |
|
45 | 45 | { |
46 | - foreach ($convert as $source => $target) { |
|
47 | - if ($exception instanceof $source) { |
|
48 | - if (is_callable($target)) { |
|
49 | - $target($exception); |
|
46 | + foreach ( $convert as $source => $target ) { |
|
47 | + if ( $exception instanceof $source ) { |
|
48 | + if ( is_callable( $target ) ) { |
|
49 | + $target( $exception ); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | throw new $target; |
@@ -60,18 +60,18 @@ discard block |
||
60 | 60 | * @param \Exception $exception |
61 | 61 | * @return void |
62 | 62 | */ |
63 | - protected function convertDefaultException(Exception $exception) |
|
63 | + protected function convertDefaultException( Exception $exception ) |
|
64 | 64 | { |
65 | - $this->convert($exception, array_diff_key([ |
|
65 | + $this->convert( $exception, array_diff_key( [ |
|
66 | 66 | AuthenticationException::class => UnauthenticatedException::class, |
67 | 67 | AuthorizationException::class => UnauthorizedException::class, |
68 | 68 | NotFoundHttpException::class => PageNotFoundException::class, |
69 | 69 | ModelNotFoundException::class => PageNotFoundException::class, |
70 | 70 | BaseRelationNotFoundException::class => RelationNotFoundException::class, |
71 | - ValidationException::class => function ($exception) { |
|
72 | - throw new ValidationFailedException($exception->validator); |
|
71 | + ValidationException::class => function ( $exception ) { |
|
72 | + throw new ValidationFailedException( $exception->validator ); |
|
73 | 73 | }, |
74 | - ], array_flip($this->dontConvert))); |
|
74 | + ], array_flip( $this->dontConvert ) ) ); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -80,11 +80,11 @@ discard block |
||
80 | 80 | * @param \Flugg\Responder\Exceptions\Http\HttpException $exception |
81 | 81 | * @return \Illuminate\Http\JsonResponse |
82 | 82 | */ |
83 | - protected function renderResponse(HttpException $exception): JsonResponse |
|
83 | + protected function renderResponse( HttpException $exception ): JsonResponse |
|
84 | 84 | { |
85 | - return $this->container->make(Responder::class) |
|
86 | - ->error($exception->errorCode(), $exception->message()) |
|
87 | - ->data($exception->data()) |
|
88 | - ->respond($exception->statusCode()); |
|
85 | + return $this->container->make( Responder::class ) |
|
86 | + ->error( $exception->errorCode(), $exception->message() ) |
|
87 | + ->data( $exception->data() ) |
|
88 | + ->respond( $exception->statusCode() ); |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | \ No newline at end of file |
@@ -24,14 +24,14 @@ |
||
24 | 24 | * @param \Exception $exception |
25 | 25 | * @return \Symfony\Component\HttpFoundation\Response |
26 | 26 | */ |
27 | - public function render($request, Exception $exception) |
|
27 | + public function render( $request, Exception $exception ) |
|
28 | 28 | { |
29 | - $this->convertDefaultException($exception); |
|
29 | + $this->convertDefaultException( $exception ); |
|
30 | 30 | |
31 | - if ($exception instanceof HttpException) { |
|
32 | - return $this->renderResponse($exception); |
|
31 | + if ( $exception instanceof HttpException ) { |
|
32 | + return $this->renderResponse( $exception ); |
|
33 | 33 | } |
34 | 34 | |
35 | - return parent::render($request, $exception); |
|
35 | + return parent::render( $request, $exception ); |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | \ No newline at end of file |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * |
47 | 47 | * @var array |
48 | 48 | */ |
49 | - protected $headers = []; |
|
49 | + protected $headers = [ ]; |
|
50 | 50 | |
51 | 51 | /** |
52 | 52 | * Construct the exception class. |
@@ -54,9 +54,9 @@ discard block |
||
54 | 54 | * @param string|null $message |
55 | 55 | * @param array|null $headers |
56 | 56 | */ |
57 | - public function __construct(string $message = null, array $headers = null) |
|
57 | + public function __construct( string $message = null, array $headers = null ) |
|
58 | 58 | { |
59 | - parent::__construct($this->status, $message ?? $this->message, null, $headers ?? $this->headers); |
|
59 | + parent::__construct( $this->status, $message ?? $this->message, null, $headers ?? $this->headers ); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -23,9 +23,9 @@ discard block |
||
23 | 23 | * @param string|null $resourceKey |
24 | 24 | * @return \Flugg\Responder\Http\Responses\SuccessResponseBuilder |
25 | 25 | */ |
26 | - public function success($data = null, $transformer = null, string $resourceKey = null): SuccessResponseBuilder |
|
26 | + public function success( $data = null, $transformer = null, string $resourceKey = null ): SuccessResponseBuilder |
|
27 | 27 | { |
28 | - return app(Responder::class)->success(...func_get_args()); |
|
28 | + return app( Responder::class )->success( ...func_get_args() ); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | * @param string|null $message |
36 | 36 | * @return \Flugg\Responder\Http\Responses\ErrorResponseBuilder |
37 | 37 | */ |
38 | - public function error(string $errorCode = null, string $message = null): ErrorResponseBuilder |
|
38 | + public function error( string $errorCode = null, string $message = null ): ErrorResponseBuilder |
|
39 | 39 | { |
40 | - return app(Responder::class)->error(...func_get_args()); |
|
40 | + return app( Responder::class )->error( ...func_get_args() ); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | \ No newline at end of file |
@@ -10,9 +10,9 @@ |
||
10 | 10 | use Flugg\Responder\Contracts\Resources\ResourceFactory as ResourceFactoryContract; |
11 | 11 | use Flugg\Responder\Contracts\Responder as ResponderContract; |
12 | 12 | use Flugg\Responder\Contracts\ResponseFactory as ResponseFactoryContract; |
13 | +use Flugg\Responder\Contracts\TransformFactory as TransformFactoryContract; |
|
13 | 14 | use Flugg\Responder\Contracts\Transformer as TransformerContract; |
14 | 15 | use Flugg\Responder\Contracts\Transformers\TransformerResolver as TransformerResolverContract; |
15 | -use Flugg\Responder\Contracts\TransformFactory as TransformFactoryContract; |
|
16 | 16 | use Flugg\Responder\Http\Responses\Factories\LaravelResponseFactory; |
17 | 17 | use Flugg\Responder\Http\Responses\Factories\LumenResponseFactory; |
18 | 18 | use Flugg\Responder\Pagination\PaginatorFactory; |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function register() |
52 | 52 | { |
53 | - if ($this->app instanceof Laravel) { |
|
53 | + if ( $this->app instanceof Laravel ) { |
|
54 | 54 | $this->registerLaravelBindings(); |
55 | - } elseif ($this->app instanceof Lumen) { |
|
55 | + } elseif ( $this->app instanceof Lumen ) { |
|
56 | 56 | $this->registerLumenBindings(); |
57 | 57 | } |
58 | 58 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | */ |
74 | 74 | protected function registerLaravelBindings() |
75 | 75 | { |
76 | - $this->app->singleton(ResponseFactoryContract::class, function ($app) { |
|
77 | - return $this->decorateResponseFactory($app->make(LaravelResponseFactory::class)); |
|
76 | + $this->app->singleton( ResponseFactoryContract::class, function ( $app ) { |
|
77 | + return $this->decorateResponseFactory( $app->make( LaravelResponseFactory::class ) ); |
|
78 | 78 | }); |
79 | 79 | } |
80 | 80 | |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | */ |
86 | 86 | protected function registerLumenBindings() |
87 | 87 | { |
88 | - $this->app->singleton(ResponseFactoryContract::class, function ($app) { |
|
89 | - return $this->decorateResponseFactory($app->make(LumenResponseFactory::class)); |
|
88 | + $this->app->singleton( ResponseFactoryContract::class, function ( $app ) { |
|
89 | + return $this->decorateResponseFactory( $app->make( LumenResponseFactory::class ) ); |
|
90 | 90 | }); |
91 | 91 | } |
92 | 92 | |
@@ -96,10 +96,10 @@ discard block |
||
96 | 96 | * @param \Flugg\Responder\Contracts\ResponseFactory $factory |
97 | 97 | * @return void |
98 | 98 | */ |
99 | - protected function decorateResponseFactory(ResponseFactoryContract $factory) |
|
99 | + protected function decorateResponseFactory( ResponseFactoryContract $factory ) |
|
100 | 100 | { |
101 | - foreach ($this->app->config['responder.decorators'] as $decorator) { |
|
102 | - $factory = new $decorator($factory); |
|
101 | + foreach ( $this->app->config[ 'responder.decorators' ] as $decorator ) { |
|
102 | + $factory = new $decorator( $factory ); |
|
103 | 103 | }; |
104 | 104 | |
105 | 105 | return $factory; |
@@ -112,12 +112,12 @@ discard block |
||
112 | 112 | */ |
113 | 113 | protected function registerSerializerBindings() |
114 | 114 | { |
115 | - $this->app->bind(ErrorSerializerContract::class, function ($app) { |
|
116 | - return $app->make($app->config['responder.serializers.error']); |
|
115 | + $this->app->bind( ErrorSerializerContract::class, function ( $app ) { |
|
116 | + return $app->make( $app->config[ 'responder.serializers.error' ] ); |
|
117 | 117 | }); |
118 | 118 | |
119 | - $this->app->bind(SerializerAbstract::class, function ($app) { |
|
120 | - return $app->make($app->config['responder.serializers.success']); |
|
119 | + $this->app->bind( SerializerAbstract::class, function ( $app ) { |
|
120 | + return $app->make( $app->config[ 'responder.serializers.success' ] ); |
|
121 | 121 | }); |
122 | 122 | } |
123 | 123 | |
@@ -128,12 +128,12 @@ discard block |
||
128 | 128 | */ |
129 | 129 | protected function registerErrorBindings() |
130 | 130 | { |
131 | - $this->app->singleton(ErrorMessageResolverContract::class, function ($app) { |
|
132 | - return $app->make(ErrorMessageResolver::class); |
|
131 | + $this->app->singleton( ErrorMessageResolverContract::class, function ( $app ) { |
|
132 | + return $app->make( ErrorMessageResolver::class ); |
|
133 | 133 | }); |
134 | 134 | |
135 | - $this->app->singleton(ErrorFactoryContract::class, function ($app) { |
|
136 | - return $app->make(ErrorFactory::class); |
|
135 | + $this->app->singleton( ErrorFactoryContract::class, function ( $app ) { |
|
136 | + return $app->make( ErrorFactory::class ); |
|
137 | 137 | }); |
138 | 138 | } |
139 | 139 | |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | */ |
145 | 145 | protected function registerFractalBindings() |
146 | 146 | { |
147 | - $this->app->bind(Manager::class, function ($app) { |
|
148 | - return (new Manager)->setRecursionLimit($app->config['responder.recursion_limit']); |
|
147 | + $this->app->bind( Manager::class, function ( $app ) { |
|
148 | + return (new Manager)->setRecursionLimit( $app->config[ 'responder.recursion_limit' ] ); |
|
149 | 149 | }); |
150 | 150 | } |
151 | 151 | |
@@ -156,8 +156,8 @@ discard block |
||
156 | 156 | */ |
157 | 157 | protected function registerResourceBindings() |
158 | 158 | { |
159 | - $this->app->singleton(ResourceFactoryContract::class, function ($app) { |
|
160 | - return $app->make(ResourceFactory::class); |
|
159 | + $this->app->singleton( ResourceFactoryContract::class, function ( $app ) { |
|
160 | + return $app->make( ResourceFactory::class ); |
|
161 | 161 | }); |
162 | 162 | } |
163 | 163 | |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | */ |
169 | 169 | protected function registerPaginationBindings() |
170 | 170 | { |
171 | - $this->app->singleton(PaginatorFactoryContract::class, function ($app) { |
|
172 | - return new PaginatorFactory($app->make(Request::class)->query()); |
|
171 | + $this->app->singleton( PaginatorFactoryContract::class, function ( $app ) { |
|
172 | + return new PaginatorFactory( $app->make( Request::class )->query() ); |
|
173 | 173 | }); |
174 | 174 | } |
175 | 175 | |
@@ -180,18 +180,18 @@ discard block |
||
180 | 180 | */ |
181 | 181 | protected function registerTransformationBindings() |
182 | 182 | { |
183 | - $this->app->singleton(TransformFactoryContract::class, function ($app) { |
|
184 | - return $app->make(FractalTransformFactory::class); |
|
183 | + $this->app->singleton( TransformFactoryContract::class, function ( $app ) { |
|
184 | + return $app->make( FractalTransformFactory::class ); |
|
185 | 185 | }); |
186 | 186 | |
187 | - $this->app->bind(TransformBuilder::class, function ($app) { |
|
188 | - return (new TransformBuilder($app->make(ResourceFactoryContract::class), $app->make(TransformFactoryContract::class), $app->make(PaginatorFactoryContract::class)))->serializer($app->make(SerializerAbstract::class)) |
|
189 | - ->with($app->make(Request::class)->input($app->config['responder.load_relations_parameter'], [])) |
|
190 | - ->only($app->make(Request::class)->input($app->config['responder.filter_fields_parameter'], [])); |
|
187 | + $this->app->bind( TransformBuilder::class, function ( $app ) { |
|
188 | + return (new TransformBuilder( $app->make( ResourceFactoryContract::class ), $app->make( TransformFactoryContract::class ), $app->make( PaginatorFactoryContract::class ) ))->serializer( $app->make( SerializerAbstract::class ) ) |
|
189 | + ->with( $app->make( Request::class )->input( $app->config[ 'responder.load_relations_parameter' ], [ ] ) ) |
|
190 | + ->only( $app->make( Request::class )->input( $app->config[ 'responder.filter_fields_parameter' ], [ ] ) ); |
|
191 | 191 | }); |
192 | 192 | |
193 | - $this->app->singleton(TransformerResolverContract::class, function ($app) { |
|
194 | - return $app->make(TransformerResolver::class); |
|
193 | + $this->app->singleton( TransformerResolverContract::class, function ( $app ) { |
|
194 | + return $app->make( TransformerResolver::class ); |
|
195 | 195 | }); |
196 | 196 | } |
197 | 197 | |
@@ -202,12 +202,12 @@ discard block |
||
202 | 202 | */ |
203 | 203 | protected function registerTransformerBindings() |
204 | 204 | { |
205 | - $this->app->singleton(TransformerResolverContract::class, function ($app) { |
|
206 | - return $app->make(TransformerResolver::class); |
|
205 | + $this->app->singleton( TransformerResolverContract::class, function ( $app ) { |
|
206 | + return $app->make( TransformerResolver::class ); |
|
207 | 207 | }); |
208 | 208 | |
209 | - Transformer::containerResolver(function () { |
|
210 | - return $this->app->make(Container::class); |
|
209 | + Transformer::containerResolver( function () { |
|
210 | + return $this->app->make( Container::class ); |
|
211 | 211 | }); |
212 | 212 | } |
213 | 213 | |
@@ -218,12 +218,12 @@ discard block |
||
218 | 218 | */ |
219 | 219 | protected function registerServiceBindings() |
220 | 220 | { |
221 | - $this->app->singleton(ResponderContract::class, function ($app) { |
|
222 | - return $app->make(Responder::class); |
|
221 | + $this->app->singleton( ResponderContract::class, function ( $app ) { |
|
222 | + return $app->make( Responder::class ); |
|
223 | 223 | }); |
224 | 224 | |
225 | - $this->app->singleton(TransformerContract::class, function ($app) { |
|
226 | - return $app->make(Transformer::class); |
|
225 | + $this->app->singleton( TransformerContract::class, function ( $app ) { |
|
226 | + return $app->make( Transformer::class ); |
|
227 | 227 | }); |
228 | 228 | } |
229 | 229 | |
@@ -234,14 +234,14 @@ discard block |
||
234 | 234 | */ |
235 | 235 | public function boot() |
236 | 236 | { |
237 | - if ($this->app instanceof Laravel) { |
|
237 | + if ( $this->app instanceof Laravel ) { |
|
238 | 238 | $this->bootLaravelApplication(); |
239 | - } elseif ($this->app instanceof Lumen) { |
|
239 | + } elseif ( $this->app instanceof Lumen ) { |
|
240 | 240 | $this->bootLumenApplication(); |
241 | 241 | } |
242 | 242 | |
243 | - $this->mergeConfigFrom(__DIR__ . '/../config/responder.php', 'responder'); |
|
244 | - $this->commands(MakeTransformer::class); |
|
243 | + $this->mergeConfigFrom( __DIR__ . '/../config/responder.php', 'responder' ); |
|
244 | + $this->commands( MakeTransformer::class ); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | /** |
@@ -251,13 +251,13 @@ discard block |
||
251 | 251 | */ |
252 | 252 | protected function bootLaravelApplication() |
253 | 253 | { |
254 | - if ($this->app->runningInConsole()) { |
|
255 | - $this->publishes([ |
|
256 | - __DIR__ . '/../config/responder.php' => config_path('responder.php'), |
|
257 | - ], 'config'); |
|
258 | - $this->publishes([ |
|
259 | - __DIR__ . '/../resources/lang/en/errors.php' => base_path('resources/lang/en/errors.php'), |
|
260 | - ], 'lang'); |
|
254 | + if ( $this->app->runningInConsole() ) { |
|
255 | + $this->publishes( [ |
|
256 | + __DIR__ . '/../config/responder.php' => config_path( 'responder.php' ), |
|
257 | + ], 'config' ); |
|
258 | + $this->publishes( [ |
|
259 | + __DIR__ . '/../resources/lang/en/errors.php' => base_path( 'resources/lang/en/errors.php' ), |
|
260 | + ], 'lang' ); |
|
261 | 261 | } |
262 | 262 | } |
263 | 263 | |
@@ -268,6 +268,6 @@ discard block |
||
268 | 268 | */ |
269 | 269 | protected function bootLumenApplication() |
270 | 270 | { |
271 | - $this->app->configure('responder'); |
|
271 | + $this->app->configure( 'responder' ); |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 | \ No newline at end of file |
@@ -171,7 +171,7 @@ |
||
171 | 171 | /** |
172 | 172 | * Exclude relations from the transform. |
173 | 173 | * |
174 | - * @param string[]|string $relations |
|
174 | + * @param string[] $relations |
|
175 | 175 | * @return $this |
176 | 176 | */ |
177 | 177 | public function without($relations) |
@@ -65,21 +65,21 @@ discard block |
||
65 | 65 | * |
66 | 66 | * @var array |
67 | 67 | */ |
68 | - protected $with = []; |
|
68 | + protected $with = [ ]; |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * A list of excluded relations. |
72 | 72 | * |
73 | 73 | * @var array |
74 | 74 | */ |
75 | - protected $without = []; |
|
75 | + protected $without = [ ]; |
|
76 | 76 | |
77 | 77 | /** |
78 | 78 | * A list of sparse fieldsets. |
79 | 79 | * |
80 | 80 | * @var array |
81 | 81 | */ |
82 | - protected $only = []; |
|
82 | + protected $only = [ ]; |
|
83 | 83 | |
84 | 84 | /** |
85 | 85 | * Construct the builder class. |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | * @param \Flugg\Responder\Contracts\TransformFactory $transformFactory |
89 | 89 | * @param \Flugg\Responder\Contracts\Pagination\PaginatorFactory $paginatorFactory |
90 | 90 | */ |
91 | - public function __construct(ResourceFactory $resourceFactory, TransformFactory $transformFactory, PaginatorFactory $paginatorFactory) |
|
91 | + public function __construct( ResourceFactory $resourceFactory, TransformFactory $transformFactory, PaginatorFactory $paginatorFactory ) |
|
92 | 92 | { |
93 | 93 | $this->resourceFactory = $resourceFactory; |
94 | 94 | $this->transformFactory = $transformFactory; |
@@ -103,14 +103,14 @@ discard block |
||
103 | 103 | * @param string|null $resourceKey |
104 | 104 | * @return $this |
105 | 105 | */ |
106 | - public function resource($data = null, $transformer = null, string $resourceKey = null) |
|
106 | + public function resource( $data = null, $transformer = null, string $resourceKey = null ) |
|
107 | 107 | { |
108 | - $this->resource = $this->resourceFactory->make($data, $transformer, $resourceKey); |
|
108 | + $this->resource = $this->resourceFactory->make( $data, $transformer, $resourceKey ); |
|
109 | 109 | |
110 | - if ($data instanceof CursorPaginator) { |
|
111 | - $this->cursor($this->paginatorFactory->makeCursor($data)); |
|
112 | - } elseif ($data instanceof LengthAwarePaginator) { |
|
113 | - $this->paginator($this->paginatorFactory->make($data)); |
|
110 | + if ( $data instanceof CursorPaginator ) { |
|
111 | + $this->cursor( $this->paginatorFactory->makeCursor( $data ) ); |
|
112 | + } elseif ( $data instanceof LengthAwarePaginator ) { |
|
113 | + $this->paginator( $this->paginatorFactory->make( $data ) ); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | return $this; |
@@ -122,9 +122,9 @@ discard block |
||
122 | 122 | * @param \League\Fractal\Pagination\Cursor $cursor |
123 | 123 | * @return $this |
124 | 124 | */ |
125 | - public function cursor(Cursor $cursor) |
|
125 | + public function cursor( Cursor $cursor ) |
|
126 | 126 | { |
127 | - $this->resource->setCursor($cursor); |
|
127 | + $this->resource->setCursor( $cursor ); |
|
128 | 128 | |
129 | 129 | return $this; |
130 | 130 | } |
@@ -135,9 +135,9 @@ discard block |
||
135 | 135 | * @param \League\Fractal\Pagination\IlluminatePaginatorAdapter $paginator |
136 | 136 | * @return $this |
137 | 137 | */ |
138 | - public function paginator(IlluminatePaginatorAdapter $paginator) |
|
138 | + public function paginator( IlluminatePaginatorAdapter $paginator ) |
|
139 | 139 | { |
140 | - $this->resource->setPaginator($paginator); |
|
140 | + $this->resource->setPaginator( $paginator ); |
|
141 | 141 | |
142 | 142 | return $this; |
143 | 143 | } |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | * @param array $data |
149 | 149 | * @return $this |
150 | 150 | */ |
151 | - public function meta(array $data) |
|
151 | + public function meta( array $data ) |
|
152 | 152 | { |
153 | - $this->resource->setMeta($data); |
|
153 | + $this->resource->setMeta( $data ); |
|
154 | 154 | |
155 | 155 | return $this; |
156 | 156 | } |
@@ -161,9 +161,9 @@ discard block |
||
161 | 161 | * @param string[]|string $relations |
162 | 162 | * @return $this |
163 | 163 | */ |
164 | - public function with($relations) |
|
164 | + public function with( $relations ) |
|
165 | 165 | { |
166 | - $this->with = array_merge($this->with, is_array($relations) ? $relations : func_get_args()); |
|
166 | + $this->with = array_merge( $this->with, is_array( $relations ) ? $relations : func_get_args() ); |
|
167 | 167 | |
168 | 168 | return $this; |
169 | 169 | } |
@@ -174,9 +174,9 @@ discard block |
||
174 | 174 | * @param string[]|string $relations |
175 | 175 | * @return $this |
176 | 176 | */ |
177 | - public function without($relations) |
|
177 | + public function without( $relations ) |
|
178 | 178 | { |
179 | - $this->without = array_merge($this->without, is_array($relations) ? $relations : func_get_args()); |
|
179 | + $this->without = array_merge( $this->without, is_array( $relations ) ? $relations : func_get_args() ); |
|
180 | 180 | |
181 | 181 | return $this; |
182 | 182 | } |
@@ -187,9 +187,9 @@ discard block |
||
187 | 187 | * @param string[]|string $fields |
188 | 188 | * @return $this |
189 | 189 | */ |
190 | - public function only($fields) |
|
190 | + public function only( $fields ) |
|
191 | 191 | { |
192 | - $this->only = array_merge($this->only, is_array($fields) ? $fields : func_get_args()); |
|
192 | + $this->only = array_merge( $this->only, is_array( $fields ) ? $fields : func_get_args() ); |
|
193 | 193 | |
194 | 194 | return $this; |
195 | 195 | } |
@@ -201,13 +201,13 @@ discard block |
||
201 | 201 | * @return $this |
202 | 202 | * @throws \Flugg\Responder\Exceptions\InvalidSerializerException |
203 | 203 | */ |
204 | - public function serializer($serializer) |
|
204 | + public function serializer( $serializer ) |
|
205 | 205 | { |
206 | - if (is_string($serializer)) { |
|
206 | + if ( is_string( $serializer ) ) { |
|
207 | 207 | $serializer = new $serializer; |
208 | 208 | } |
209 | 209 | |
210 | - if (! $serializer instanceof SerializerAbstract) { |
|
210 | + if ( ! $serializer instanceof SerializerAbstract ) { |
|
211 | 211 | throw new InvalidSerializerException; |
212 | 212 | } |
213 | 213 | |
@@ -223,13 +223,13 @@ discard block |
||
223 | 223 | */ |
224 | 224 | public function transform(): array |
225 | 225 | { |
226 | - $this->prepareRelations($this->resource->getData(), $this->resource->getTransformer()); |
|
226 | + $this->prepareRelations( $this->resource->getData(), $this->resource->getTransformer() ); |
|
227 | 227 | |
228 | - return $this->transformFactory->make($this->resource ?: new NullResource, $this->serializer, [ |
|
228 | + return $this->transformFactory->make( $this->resource ?: new NullResource, $this->serializer, [ |
|
229 | 229 | 'includes' => $this->with, |
230 | 230 | 'excludes' => $this->without, |
231 | 231 | 'fieldsets' => $this->only, |
232 | - ]); |
|
232 | + ] ); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | /** |
@@ -239,18 +239,18 @@ discard block |
||
239 | 239 | * @param \Flugg\Responder\Transformers\Transformer|callable|string|null $transformer |
240 | 240 | * @return void |
241 | 241 | */ |
242 | - protected function prepareRelations($data, $transformer) |
|
242 | + protected function prepareRelations( $data, $transformer ) |
|
243 | 243 | { |
244 | - if ($transformer instanceof Transformer) { |
|
245 | - $this->with($transformer->extractDefaultRelations()); |
|
244 | + if ( $transformer instanceof Transformer ) { |
|
245 | + $this->with( $transformer->extractDefaultRelations() ); |
|
246 | 246 | } |
247 | 247 | |
248 | - if ($data instanceof Model || $data instanceof Collection) { |
|
249 | - $data->load($this->with); |
|
248 | + if ( $data instanceof Model || $data instanceof Collection ) { |
|
249 | + $data->load( $this->with ); |
|
250 | 250 | } |
251 | 251 | |
252 | - $this->with = collect($this->with)->map(function ($value, $key) { |
|
253 | - return is_numeric($key) ? $value : $key; |
|
252 | + $this->with = collect( $this->with )->map( function ( $value, $key ) { |
|
253 | + return is_numeric( $key ) ? $value : $key; |
|
254 | 254 | })->values()->all(); |
255 | 255 | } |
256 | 256 | } |
257 | 257 | \ No newline at end of file |
@@ -23,9 +23,9 @@ discard block |
||
23 | 23 | * @param array $data |
24 | 24 | * @return array |
25 | 25 | */ |
26 | - public function collection($resourceKey, array $data) |
|
26 | + public function collection( $resourceKey, array $data ) |
|
27 | 27 | { |
28 | - return ['data' => $data]; |
|
28 | + return [ 'data' => $data ]; |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | * @param array $data |
36 | 36 | * @return array |
37 | 37 | */ |
38 | - public function item($resourceKey, array $data) |
|
38 | + public function item( $resourceKey, array $data ) |
|
39 | 39 | { |
40 | - return ['data' => $data]; |
|
40 | + return [ 'data' => $data ]; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function null() |
49 | 49 | { |
50 | - return ['data' => null]; |
|
50 | + return [ 'data' => null ]; |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param array $meta |
57 | 57 | * @return array |
58 | 58 | */ |
59 | - public function meta(array $meta) |
|
59 | + public function meta( array $meta ) |
|
60 | 60 | { |
61 | 61 | return $meta; |
62 | 62 | } |
@@ -67,18 +67,18 @@ discard block |
||
67 | 67 | * @param \League\Fractal\Pagination\PaginatorInterface $paginator |
68 | 68 | * @return array |
69 | 69 | */ |
70 | - public function paginator(PaginatorInterface $paginator) |
|
70 | + public function paginator( PaginatorInterface $paginator ) |
|
71 | 71 | { |
72 | - $pagination = parent::paginator($paginator)['pagination']; |
|
72 | + $pagination = parent::paginator( $paginator )[ 'pagination' ]; |
|
73 | 73 | |
74 | 74 | return [ |
75 | 75 | 'pagination' => [ |
76 | - 'count' => $pagination['count'], |
|
77 | - 'total' => $pagination['total'], |
|
78 | - 'perPage' => $pagination['per_page'], |
|
79 | - 'currentPage' => $pagination['current_page'], |
|
80 | - 'totalPages' => $pagination['total_pages'], |
|
81 | - 'links' => $pagination['links'], |
|
76 | + 'count' => $pagination[ 'count' ], |
|
77 | + 'total' => $pagination[ 'total' ], |
|
78 | + 'perPage' => $pagination[ 'per_page' ], |
|
79 | + 'currentPage' => $pagination[ 'current_page' ], |
|
80 | + 'totalPages' => $pagination[ 'total_pages' ], |
|
81 | + 'links' => $pagination[ 'links' ], |
|
82 | 82 | ], |
83 | 83 | ]; |
84 | 84 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * @param \League\Fractal\Pagination\CursorInterface $cursor |
90 | 90 | * @return array |
91 | 91 | */ |
92 | - public function cursor(CursorInterface $cursor) |
|
92 | + public function cursor( CursorInterface $cursor ) |
|
93 | 93 | { |
94 | 94 | return [ |
95 | 95 | 'cursor' => [ |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | * @param array $includedData |
119 | 119 | * @return array |
120 | 120 | */ |
121 | - public function mergeIncludes($transformedData, $includedData) |
|
121 | + public function mergeIncludes( $transformedData, $includedData ) |
|
122 | 122 | { |
123 | - foreach (array_keys($includedData) as $key) { |
|
124 | - $includedData[$key] = $includedData[$key]['data']; |
|
123 | + foreach ( array_keys( $includedData ) as $key ) { |
|
124 | + $includedData[ $key ] = $includedData[ $key ][ 'data' ]; |
|
125 | 125 | } |
126 | 126 | |
127 | - return array_merge($transformedData, $includedData); |
|
127 | + return array_merge( $transformedData, $includedData ); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | * @param array $data |
135 | 135 | * @return array |
136 | 136 | */ |
137 | - public function includedData(ResourceInterface $resource, array $data) |
|
137 | + public function includedData( ResourceInterface $resource, array $data ) |
|
138 | 138 | { |
139 | - return []; |
|
139 | + return [ ]; |
|
140 | 140 | } |
141 | 141 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @param \Closure $resolver |
36 | 36 | * @return void |
37 | 37 | */ |
38 | - public static function containerResolver(Closure $resolver) |
|
38 | + public static function containerResolver( Closure $resolver ) |
|
39 | 39 | { |
40 | 40 | static::$containerResolver = $resolver; |
41 | 41 | } |
@@ -47,6 +47,6 @@ discard block |
||
47 | 47 | */ |
48 | 48 | protected function resolveContainer(): Container |
49 | 49 | { |
50 | - return call_user_func(static::$containerResolver); |
|
50 | + return call_user_func( static::$containerResolver ); |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | \ No newline at end of file |