@@ -12,100 +12,100 @@ discard block |
||
12 | 12 | */ |
13 | 13 | |
14 | 14 | return [ |
15 | - /* |
|
15 | + /* |
|
16 | 16 | |----------------------------------------------------------------------------------------------------------- |
17 | 17 | | Code range settings |
18 | 18 | |----------------------------------------------------------------------------------------------------------- |
19 | 19 | */ |
20 | - 'min_code' => 100, |
|
21 | - 'max_code' => 1024, |
|
20 | + 'min_code' => 100, |
|
21 | + 'max_code' => 1024, |
|
22 | 22 | |
23 | - /* |
|
23 | + /* |
|
24 | 24 | |----------------------------------------------------------------------------------------------------------- |
25 | 25 | | Error code to message mapping |
26 | 26 | |----------------------------------------------------------------------------------------------------------- |
27 | 27 | | |
28 | 28 | */ |
29 | - 'map' => [ |
|
30 | - // YOUR_API_CODE => '<MESSAGE_KEY>', |
|
31 | - ], |
|
29 | + 'map' => [ |
|
30 | + // YOUR_API_CODE => '<MESSAGE_KEY>', |
|
31 | + ], |
|
32 | 32 | |
33 | - /* |
|
33 | + /* |
|
34 | 34 | |----------------------------------------------------------------------------------------------------------- |
35 | 35 | | Response Builder data converter |
36 | 36 | |----------------------------------------------------------------------------------------------------------- |
37 | 37 | | |
38 | 38 | */ |
39 | - 'converter' => [ |
|
40 | - 'primitives' => [ |
|
41 | - /* Configuration for primitives used when such data is passed directly as payload (i.e. `success(15)`;) */ |
|
42 | - 'array' => [ |
|
43 | - 'key' => 'values', |
|
44 | - ], |
|
45 | - 'boolean' => [ |
|
46 | - 'key' => 'value', |
|
47 | - ], |
|
48 | - 'double' => [ |
|
49 | - 'key' => 'value', |
|
50 | - ], |
|
51 | - 'integer' => [ |
|
52 | - 'key' => 'value', |
|
53 | - ], |
|
54 | - 'string' => [ |
|
55 | - 'key' => 'value', |
|
56 | - ], |
|
57 | - ], |
|
39 | + 'converter' => [ |
|
40 | + 'primitives' => [ |
|
41 | + /* Configuration for primitives used when such data is passed directly as payload (i.e. `success(15)`;) */ |
|
42 | + 'array' => [ |
|
43 | + 'key' => 'values', |
|
44 | + ], |
|
45 | + 'boolean' => [ |
|
46 | + 'key' => 'value', |
|
47 | + ], |
|
48 | + 'double' => [ |
|
49 | + 'key' => 'value', |
|
50 | + ], |
|
51 | + 'integer' => [ |
|
52 | + 'key' => 'value', |
|
53 | + ], |
|
54 | + 'string' => [ |
|
55 | + 'key' => 'value', |
|
56 | + ], |
|
57 | + ], |
|
58 | 58 | |
59 | - /* Object converters configuration for supported classes */ |
|
60 | - 'classes' => [ |
|
61 | - \Illuminate\Database\Eloquent\Model::class => [ |
|
62 | - 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
63 | - 'key' => 'item', |
|
64 | - 'pri' => 0, |
|
65 | - ], |
|
66 | - \Illuminate\Support\Collection::class => [ |
|
67 | - 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
68 | - 'key' => 'items', |
|
69 | - 'pri' => 0, |
|
70 | - ], |
|
71 | - \Illuminate\Database\Eloquent\Collection::class => [ |
|
72 | - 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
73 | - 'key' => 'items', |
|
74 | - 'pri' => 0, |
|
75 | - ], |
|
76 | - \Illuminate\Http\Resources\Json\JsonResource::class => [ |
|
77 | - 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
78 | - 'key' => 'item', |
|
79 | - 'pri' => 0, |
|
80 | - ], |
|
59 | + /* Object converters configuration for supported classes */ |
|
60 | + 'classes' => [ |
|
61 | + \Illuminate\Database\Eloquent\Model::class => [ |
|
62 | + 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
63 | + 'key' => 'item', |
|
64 | + 'pri' => 0, |
|
65 | + ], |
|
66 | + \Illuminate\Support\Collection::class => [ |
|
67 | + 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
68 | + 'key' => 'items', |
|
69 | + 'pri' => 0, |
|
70 | + ], |
|
71 | + \Illuminate\Database\Eloquent\Collection::class => [ |
|
72 | + 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
73 | + 'key' => 'items', |
|
74 | + 'pri' => 0, |
|
75 | + ], |
|
76 | + \Illuminate\Http\Resources\Json\JsonResource::class => [ |
|
77 | + 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ToArrayConverter::class, |
|
78 | + 'key' => 'item', |
|
79 | + 'pri' => 0, |
|
80 | + ], |
|
81 | 81 | |
82 | - /* |
|
82 | + /* |
|
83 | 83 | |----------------------------------------------------------------------------------------------------------- |
84 | 84 | | Generic converters should have lower pri to allow dedicated ones to kick in first when class matches |
85 | 85 | |----------------------------------------------------------------------------------------------------------- |
86 | 86 | */ |
87 | - \JsonSerializable::class => [ |
|
88 | - 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\JsonSerializableConverter::class, |
|
89 | - 'key' => 'item', |
|
90 | - 'pri' => -10, |
|
91 | - ], |
|
92 | - \Illuminate\Contracts\Support\Arrayable::class => [ |
|
93 | - 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ArrayableConverter::class, |
|
94 | - 'key' => 'items', |
|
95 | - 'pri' => -10, |
|
96 | - ], |
|
97 | - ], |
|
87 | + \JsonSerializable::class => [ |
|
88 | + 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\JsonSerializableConverter::class, |
|
89 | + 'key' => 'item', |
|
90 | + 'pri' => -10, |
|
91 | + ], |
|
92 | + \Illuminate\Contracts\Support\Arrayable::class => [ |
|
93 | + 'handler' => \MarcinOrlowski\ResponseBuilder\Converters\ArrayableConverter::class, |
|
94 | + 'key' => 'items', |
|
95 | + 'pri' => -10, |
|
96 | + ], |
|
97 | + ], |
|
98 | 98 | |
99 | - ], |
|
99 | + ], |
|
100 | 100 | |
101 | - /* |
|
101 | + /* |
|
102 | 102 | |----------------------------------------------------------------------------------------------------------- |
103 | 103 | | Exception handler error codes |
104 | 104 | |----------------------------------------------------------------------------------------------------------- |
105 | 105 | | |
106 | 106 | */ |
107 | - 'exception_handler' => [ |
|
108 | - /* |
|
107 | + 'exception_handler' => [ |
|
108 | + /* |
|
109 | 109 | * The following keys are supported for each handler specified. |
110 | 110 | * `handler` |
111 | 111 | * `pri` |
@@ -125,19 +125,19 @@ discard block |
||
125 | 125 | * message ($ex->getMessage()). |
126 | 126 | */ |
127 | 127 | |
128 | - \Illuminate\Validation\ValidationException::class => [ |
|
129 | - 'handler' => \MarcinOrlowski\ResponseBuilder\ExceptionHandlers\ValidationExceptionHandler::class, |
|
130 | - 'pri' => -100, |
|
131 | - 'config' => [ |
|
128 | + \Illuminate\Validation\ValidationException::class => [ |
|
129 | + 'handler' => \MarcinOrlowski\ResponseBuilder\ExceptionHandlers\ValidationExceptionHandler::class, |
|
130 | + 'pri' => -100, |
|
131 | + 'config' => [ |
|
132 | 132 | // 'api_code' => ApiCodes::YOUR_API_CODE_FOR_VALIDATION_EXCEPTION, |
133 | 133 | // 'http_code' => HttpResponse::HTTP_UNPROCESSABLE_ENTITY, |
134 | - ], |
|
135 | - ], |
|
134 | + ], |
|
135 | + ], |
|
136 | 136 | |
137 | 137 | \Symfony\Component\HttpKernel\Exception\HttpException::class => [ |
138 | - 'handler' => \MarcinOrlowski\ResponseBuilder\ExceptionHandlers\HttpExceptionHandler::class, |
|
139 | - 'pri' => -100, |
|
140 | - 'config' => [ |
|
138 | + 'handler' => \MarcinOrlowski\ResponseBuilder\ExceptionHandlers\HttpExceptionHandler::class, |
|
139 | + 'pri' => -100, |
|
140 | + 'config' => [ |
|
141 | 141 | // HttpException::class => [ |
142 | 142 | // // used by unauthenticated() to obtain api and http code for the exception |
143 | 143 | // HttpResponse::HTTP_UNAUTHORIZED => [ |
@@ -153,47 +153,47 @@ discard block |
||
153 | 153 | // 'http_code' => HttpResponse::HTTP_BAD_REQUEST, |
154 | 154 | // ], |
155 | 155 | // ], |
156 | - ], |
|
156 | + ], |
|
157 | 157 | // // This is final exception handler. If ex is not dealt with yet this is its last stop. |
158 | - // default handler is mandatory and MUST have both `api_code` and `http_code` set. |
|
158 | + // default handler is mandatory and MUST have both `api_code` and `http_code` set. |
|
159 | 159 | |
160 | - 'default' => [ |
|
161 | - 'handler' => \MarcinOrlowski\ResponseBuilder\ExceptionHandlers\HttpExceptionHandler::class, |
|
162 | - 'pri' => -127, |
|
163 | - 'config' => [ |
|
160 | + 'default' => [ |
|
161 | + 'handler' => \MarcinOrlowski\ResponseBuilder\ExceptionHandlers\HttpExceptionHandler::class, |
|
162 | + 'pri' => -127, |
|
163 | + 'config' => [ |
|
164 | 164 | // 'api_code' => ApiCodes::YOUR_API_CODE_FOR_UNHANDLED_EXCEPTION, |
165 | 165 | // 'http_code' => HttpResponse::HTTP_INTERNAL_SERVER_ERROR, |
166 | - ], |
|
167 | - ], |
|
168 | - ], |
|
169 | - ], |
|
166 | + ], |
|
167 | + ], |
|
168 | + ], |
|
169 | + ], |
|
170 | 170 | |
171 | - /* |
|
171 | + /* |
|
172 | 172 | |----------------------------------------------------------------------------------------------------------- |
173 | 173 | | data-to-json encoding options |
174 | 174 | |----------------------------------------------------------------------------------------------------------- |
175 | 175 | | |
176 | 176 | */ |
177 | - 'encoding_options' => JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE, |
|
177 | + 'encoding_options' => JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_UNICODE, |
|
178 | 178 | |
179 | - /* |
|
179 | + /* |
|
180 | 180 | |----------------------------------------------------------------------------------------------------------- |
181 | 181 | | Debug config |
182 | 182 | |----------------------------------------------------------------------------------------------------------- |
183 | 183 | | |
184 | 184 | */ |
185 | - 'debug' => [ |
|
186 | - 'debug_key' => 'debug', |
|
187 | - 'exception_handler' => [ |
|
188 | - 'trace_key' => 'trace', |
|
189 | - 'trace_enabled' => env('APP_DEBUG', false), |
|
190 | - ], |
|
185 | + 'debug' => [ |
|
186 | + 'debug_key' => 'debug', |
|
187 | + 'exception_handler' => [ |
|
188 | + 'trace_key' => 'trace', |
|
189 | + 'trace_enabled' => env('APP_DEBUG', false), |
|
190 | + ], |
|
191 | 191 | |
192 | - // Controls debugging features of payload converter class. |
|
193 | - 'converter' => [ |
|
194 | - // Set to true to figure out what converter is used for given data payload and why. |
|
195 | - 'debug_enabled' => env('RB_CONVERTER_DEBUG', false), |
|
196 | - ], |
|
197 | - ], |
|
192 | + // Controls debugging features of payload converter class. |
|
193 | + 'converter' => [ |
|
194 | + // Set to true to figure out what converter is used for given data payload and why. |
|
195 | + 'debug_enabled' => env('RB_CONVERTER_DEBUG', false), |
|
196 | + ], |
|
197 | + ], |
|
198 | 198 | |
199 | 199 | ]; |
@@ -25,56 +25,56 @@ |
||
25 | 25 | |
26 | 26 | class ResponseBuilderServiceProvider extends ServiceProvider |
27 | 27 | { |
28 | - protected $config_files = [ |
|
29 | - 'response_builder.php', |
|
30 | - ]; |
|
28 | + protected $config_files = [ |
|
29 | + 'response_builder.php', |
|
30 | + ]; |
|
31 | 31 | |
32 | - /** |
|
33 | - * Register bindings in the container. |
|
34 | - * |
|
35 | - * @return void |
|
36 | - */ |
|
37 | - public function register() |
|
38 | - { |
|
39 | - foreach ($this->config_files as $file) { |
|
40 | - $this->mergeConfigFrom(__DIR__ . "/../config/{$file}", RB::CONF_CONFIG); |
|
41 | - } |
|
42 | - } |
|
32 | + /** |
|
33 | + * Register bindings in the container. |
|
34 | + * |
|
35 | + * @return void |
|
36 | + */ |
|
37 | + public function register() |
|
38 | + { |
|
39 | + foreach ($this->config_files as $file) { |
|
40 | + $this->mergeConfigFrom(__DIR__ . "/../config/{$file}", RB::CONF_CONFIG); |
|
41 | + } |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * Sets up package resources |
|
46 | - * |
|
47 | - * @return void |
|
48 | - */ |
|
49 | - public function boot() |
|
50 | - { |
|
51 | - $this->loadTranslationsFrom(__DIR__ . '/lang', 'response-builder'); |
|
44 | + /** |
|
45 | + * Sets up package resources |
|
46 | + * |
|
47 | + * @return void |
|
48 | + */ |
|
49 | + public function boot() |
|
50 | + { |
|
51 | + $this->loadTranslationsFrom(__DIR__ . '/lang', 'response-builder'); |
|
52 | 52 | |
53 | - foreach ($this->config_files as $file) { |
|
54 | - $this->publishes([__DIR__ . "/../config/{$file}" => config_path($file)]); |
|
55 | - } |
|
56 | - } |
|
53 | + foreach ($this->config_files as $file) { |
|
54 | + $this->publishes([__DIR__ . "/../config/{$file}" => config_path($file)]); |
|
55 | + } |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * Merge the given configuration with the existing configuration. |
|
60 | - * |
|
61 | - * @param string $path |
|
62 | - * @param string $key |
|
63 | - * |
|
64 | - * @return void |
|
65 | - */ |
|
66 | - protected function mergeConfigFrom($path, $key) |
|
67 | - { |
|
68 | - $defaults = require $path; |
|
69 | - $config = $this->app['config']->get($key, []); |
|
58 | + /** |
|
59 | + * Merge the given configuration with the existing configuration. |
|
60 | + * |
|
61 | + * @param string $path |
|
62 | + * @param string $key |
|
63 | + * |
|
64 | + * @return void |
|
65 | + */ |
|
66 | + protected function mergeConfigFrom($path, $key) |
|
67 | + { |
|
68 | + $defaults = require $path; |
|
69 | + $config = $this->app['config']->get($key, []); |
|
70 | 70 | |
71 | - $merged_config = Util::mergeConfig($defaults, $config); |
|
71 | + $merged_config = Util::mergeConfig($defaults, $config); |
|
72 | 72 | |
73 | - if (\array_key_exists('converter', $merged_config)) { |
|
74 | - Util::sortArrayByPri($merged_config['converter']); |
|
75 | - } |
|
73 | + if (\array_key_exists('converter', $merged_config)) { |
|
74 | + Util::sortArrayByPri($merged_config['converter']); |
|
75 | + } |
|
76 | 76 | |
77 | - $this->app['config']->set($key, $merged_config); |
|
78 | - } |
|
77 | + $this->app['config']->set($key, $merged_config); |
|
78 | + } |
|
79 | 79 | |
80 | 80 | } |
@@ -15,14 +15,14 @@ |
||
15 | 15 | */ |
16 | 16 | interface ConverterContract |
17 | 17 | { |
18 | - /** |
|
19 | - * Returns array representation of the object. |
|
20 | - * |
|
21 | - * @param object $obj Object to be converted |
|
22 | - * @param array $config Converter config array to be used for this object (based on exact class |
|
23 | - * name match or inheritance). |
|
24 | - * |
|
25 | - * @return array |
|
26 | - */ |
|
27 | - public function convert(object $obj, array $config): array; |
|
18 | + /** |
|
19 | + * Returns array representation of the object. |
|
20 | + * |
|
21 | + * @param object $obj Object to be converted |
|
22 | + * @param array $config Converter config array to be used for this object (based on exact class |
|
23 | + * name match or inheritance). |
|
24 | + * |
|
25 | + * @return array |
|
26 | + */ |
|
27 | + public function convert(object $obj, array $config): array; |
|
28 | 28 | } |
@@ -19,19 +19,19 @@ |
||
19 | 19 | |
20 | 20 | final class ToArrayConverter implements ConverterContract |
21 | 21 | { |
22 | - /** |
|
23 | - * Returns array representation of the object. |
|
24 | - * |
|
25 | - * @param object $obj Object to be converted |
|
26 | - * @param array $config Converter config array to be used for this object (based on exact class |
|
27 | - * name match or inheritance). |
|
28 | - * |
|
29 | - * @return array |
|
30 | - */ |
|
31 | - public function convert(object $obj, /** @scrutinizer ignore-unused */ array $config): array |
|
32 | - { |
|
33 | - Validator::assertIsObject('obj', $obj); |
|
22 | + /** |
|
23 | + * Returns array representation of the object. |
|
24 | + * |
|
25 | + * @param object $obj Object to be converted |
|
26 | + * @param array $config Converter config array to be used for this object (based on exact class |
|
27 | + * name match or inheritance). |
|
28 | + * |
|
29 | + * @return array |
|
30 | + */ |
|
31 | + public function convert(object $obj, /** @scrutinizer ignore-unused */ array $config): array |
|
32 | + { |
|
33 | + Validator::assertIsObject('obj', $obj); |
|
34 | 34 | |
35 | - return $obj->toArray(); |
|
36 | - } |
|
35 | + return $obj->toArray(); |
|
36 | + } |
|
37 | 37 | } |
@@ -19,19 +19,19 @@ |
||
19 | 19 | |
20 | 20 | final class ArrayableConverter implements ConverterContract |
21 | 21 | { |
22 | - /** |
|
23 | - * Returns array representation of the object implementing Arrayable interface |
|
24 | - * |
|
25 | - * @param Arrayable $obj Object to be converted |
|
26 | - * @param array $config Converter config array to be used for this object (based on exact class |
|
27 | - * name match or inheritance). |
|
28 | - * |
|
29 | - * @return array |
|
30 | - */ |
|
31 | - public function convert(object $obj, /** @scrutinizer ignore-unused */ array $config): array |
|
32 | - { |
|
33 | - Validator::assertInstanceOf('obj', $obj, Arrayable::class); |
|
22 | + /** |
|
23 | + * Returns array representation of the object implementing Arrayable interface |
|
24 | + * |
|
25 | + * @param Arrayable $obj Object to be converted |
|
26 | + * @param array $config Converter config array to be used for this object (based on exact class |
|
27 | + * name match or inheritance). |
|
28 | + * |
|
29 | + * @return array |
|
30 | + */ |
|
31 | + public function convert(object $obj, /** @scrutinizer ignore-unused */ array $config): array |
|
32 | + { |
|
33 | + Validator::assertInstanceOf('obj', $obj, Arrayable::class); |
|
34 | 34 | |
35 | - return $obj->toArray(); |
|
36 | - } |
|
35 | + return $obj->toArray(); |
|
36 | + } |
|
37 | 37 | } |
@@ -18,60 +18,60 @@ |
||
18 | 18 | */ |
19 | 19 | final class Util |
20 | 20 | { |
21 | - /** |
|
22 | - * Merges the configs together and takes multi-dimensional arrays into account. |
|
23 | - * Support for multi-dimensional config array. Built-in config merge only supports flat arrays. |
|
24 | - * Throws \RuntimeException if arrays stucture causes type conflics (i.e. you want to merge |
|
25 | - * array with int). |
|
26 | - * |
|
27 | - * @param array $original Array to merge other array into. Usually default values to overwrite. |
|
28 | - * @param array $merging Array with items to be merged into $original, overriding (primitives) or merging |
|
29 | - * (arrays) entries in destination array. |
|
30 | - * |
|
31 | - * @return array |
|
32 | - * |
|
33 | - * @throws \RuntimeException |
|
34 | - */ |
|
35 | - public static function mergeConfig(array $original, array $merging): array |
|
36 | - { |
|
37 | - $array = $original; |
|
38 | - foreach ($merging as $m_key => $m_val) { |
|
39 | - if (\array_key_exists($m_key, $original)) { |
|
40 | - $orig_type = \gettype($original[ $m_key ]); |
|
41 | - $m_type = \gettype($m_val); |
|
42 | - if ($orig_type !== $m_type) { |
|
43 | - throw new Ex\IncompatibleTypeException( |
|
44 | - "Incompatible types. Cannot merge {$m_type} into {$orig_type} (key '{$m_key}')."); |
|
45 | - } |
|
21 | + /** |
|
22 | + * Merges the configs together and takes multi-dimensional arrays into account. |
|
23 | + * Support for multi-dimensional config array. Built-in config merge only supports flat arrays. |
|
24 | + * Throws \RuntimeException if arrays stucture causes type conflics (i.e. you want to merge |
|
25 | + * array with int). |
|
26 | + * |
|
27 | + * @param array $original Array to merge other array into. Usually default values to overwrite. |
|
28 | + * @param array $merging Array with items to be merged into $original, overriding (primitives) or merging |
|
29 | + * (arrays) entries in destination array. |
|
30 | + * |
|
31 | + * @return array |
|
32 | + * |
|
33 | + * @throws \RuntimeException |
|
34 | + */ |
|
35 | + public static function mergeConfig(array $original, array $merging): array |
|
36 | + { |
|
37 | + $array = $original; |
|
38 | + foreach ($merging as $m_key => $m_val) { |
|
39 | + if (\array_key_exists($m_key, $original)) { |
|
40 | + $orig_type = \gettype($original[ $m_key ]); |
|
41 | + $m_type = \gettype($m_val); |
|
42 | + if ($orig_type !== $m_type) { |
|
43 | + throw new Ex\IncompatibleTypeException( |
|
44 | + "Incompatible types. Cannot merge {$m_type} into {$orig_type} (key '{$m_key}')."); |
|
45 | + } |
|
46 | 46 | |
47 | - if (\is_array($merging[ $m_key ])) { |
|
48 | - $array[ $m_key ] = static::mergeConfig($original[ $m_key ], $m_val); |
|
49 | - } else { |
|
50 | - $array[ $m_key ] = $m_val; |
|
51 | - } |
|
52 | - } else { |
|
53 | - $array[ $m_key ] = $m_val; |
|
54 | - } |
|
55 | - } |
|
47 | + if (\is_array($merging[ $m_key ])) { |
|
48 | + $array[ $m_key ] = static::mergeConfig($original[ $m_key ], $m_val); |
|
49 | + } else { |
|
50 | + $array[ $m_key ] = $m_val; |
|
51 | + } |
|
52 | + } else { |
|
53 | + $array[ $m_key ] = $m_val; |
|
54 | + } |
|
55 | + } |
|
56 | 56 | |
57 | - return $array; |
|
58 | - } |
|
57 | + return $array; |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Sorts array (in place) by value, assuming value is an array and contains `pri` key with integer |
|
62 | - * (positive/negative) value which is used for sorting higher -> lower priority. |
|
63 | - * |
|
64 | - * @param array &$array |
|
65 | - */ |
|
66 | - public static function sortArrayByPri(array &$array): void |
|
67 | - { |
|
68 | - uasort($array, static function(array $array_a, array $array_b) { |
|
69 | - $pri_a = $array_a['pri'] ?? 0; |
|
70 | - $pri_b = $array_b['pri'] ?? 0; |
|
60 | + /** |
|
61 | + * Sorts array (in place) by value, assuming value is an array and contains `pri` key with integer |
|
62 | + * (positive/negative) value which is used for sorting higher -> lower priority. |
|
63 | + * |
|
64 | + * @param array &$array |
|
65 | + */ |
|
66 | + public static function sortArrayByPri(array &$array): void |
|
67 | + { |
|
68 | + uasort($array, static function(array $array_a, array $array_b) { |
|
69 | + $pri_a = $array_a['pri'] ?? 0; |
|
70 | + $pri_b = $array_b['pri'] ?? 0; |
|
71 | 71 | |
72 | - return $pri_b <=> $pri_a; |
|
73 | - }); |
|
74 | - } |
|
72 | + return $pri_b <=> $pri_a; |
|
73 | + }); |
|
74 | + } |
|
75 | 75 | |
76 | 76 | /** |
77 | 77 | * Checks if given array uses custom (non numeric) keys. |
@@ -132,7 +132,7 @@ |
||
132 | 132 | * @throws \InvalidArgumentException |
133 | 133 | */ |
134 | 134 | public static function assertIsType(string $var_name, $value, array $allowed_types, |
135 | - string $ex_class = Ex\InvalidTypeException::class): void |
|
135 | + string $ex_class = Ex\InvalidTypeException::class): void |
|
136 | 136 | { |
137 | 137 | $type = \gettype($value); |
138 | 138 | if (!\in_array($type, $allowed_types, true)) { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return HttpResponse |
86 | 86 | */ |
87 | 87 | public static function success($data = null, $api_code = null, array $placeholders = null, |
88 | - int $http_code = null, int $json_opts = null): HttpResponse |
|
88 | + int $http_code = null, int $json_opts = null): HttpResponse |
|
89 | 89 | { |
90 | 90 | return static::asSuccess($api_code) |
91 | 91 | ->withData($data) |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | * @return HttpResponse |
114 | 114 | */ |
115 | 115 | public static function error(int $api_code, array $placeholders = null, $data = null, int $http_code = null, |
116 | - int $json_opts = null): HttpResponse |
|
116 | + int $json_opts = null): HttpResponse |
|
117 | 117 | { |
118 | 118 | return static::asError($api_code) |
119 | 119 | ->withPlaceholders($placeholders) |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | public function withJsonOptions(int $json_opts = null): self |
198 | 198 | { |
199 | 199 | Validator::assertIsType('json_opts', $json_opts, [Type::INTEGER, |
200 | - Type::NULL]); |
|
200 | + Type::NULL]); |
|
201 | 201 | $this->json_opts = $json_opts; |
202 | 202 | |
203 | 203 | return $this; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | public function withDebugData(array $debug_data = null): self |
212 | 212 | { |
213 | 213 | Validator::assertIsType('$debug_data', $debug_data, [Type::ARRAY, |
214 | - Type::NULL]); |
|
214 | + Type::NULL]); |
|
215 | 215 | $this->debug_data = $debug_data; |
216 | 216 | |
217 | 217 | return $this; |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | public function withMessage(string $msg = null): self |
226 | 226 | { |
227 | 227 | Validator::assertIsType('message', $msg, [Type::STRING, |
228 | - Type::NULL]); |
|
228 | + Type::NULL]); |
|
229 | 229 | $this->message = $msg; |
230 | 230 | |
231 | 231 | return $this; |
@@ -312,8 +312,8 @@ discard block |
||
312 | 312 | * @noinspection PhpTooManyParametersInspection |
313 | 313 | */ |
314 | 314 | protected function make(bool $success, int $api_code, $msg_or_api_code, $data = null, |
315 | - int $http_code = null, array $placeholders = null, array $http_headers = null, |
|
316 | - int $json_opts = null, array $debug_data = null): HttpResponse |
|
315 | + int $http_code = null, array $placeholders = null, array $http_headers = null, |
|
316 | + int $json_opts = null, array $debug_data = null): HttpResponse |
|
317 | 317 | { |
318 | 318 | $http_headers = $http_headers ?? []; |
319 | 319 | $http_code = $http_code ?? ($success ? RB::DEFAULT_HTTP_CODE_OK : RB::DEFAULT_HTTP_CODE_ERROR); |
@@ -352,8 +352,8 @@ discard block |
||
352 | 352 | * @noinspection PhpTooManyParametersInspection |
353 | 353 | */ |
354 | 354 | protected function buildResponse(bool $success, int $api_code, |
355 | - $msg_or_api_code, array $placeholders = null, |
|
356 | - $data = null, array $debug_data = null): array |
|
355 | + $msg_or_api_code, array $placeholders = null, |
|
356 | + $data = null, array $debug_data = null): array |
|
357 | 357 | { |
358 | 358 | // ensure $data is either @null, array or object of class with configured mapping. |
359 | 359 | $data = (new Converter())->convert($data); |