@@ -64,7 +64,7 @@ |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | - * @param string|DateTime $value |
|
67 | + * @param string $value |
|
68 | 68 | * @param string $fromFormat |
69 | 69 | * @param string $toFormat |
70 | 70 | * |
@@ -42,5 +42,5 @@ |
||
42 | 42 | * |
43 | 43 | * @return array [$offset, $limit] |
44 | 44 | */ |
45 | - public function parseParameters(?array $parameters): array; |
|
45 | + public function parseParameters(? array $parameters) : array; |
|
46 | 46 | } |
@@ -99,7 +99,7 @@ |
||
99 | 99 | $details = null; |
100 | 100 | if ($this->isDebug === true) { |
101 | 101 | $message = $throwable->getMessage(); |
102 | - $details = (string)$throwable; |
|
102 | + $details = (string) $throwable; |
|
103 | 103 | } |
104 | 104 | $errors->add(new Error(null, null, $httpCode, null, $message, $details)); |
105 | 105 | } |
@@ -53,11 +53,11 @@ discard block |
||
53 | 53 | assert(array_key_exists(SchemaInterface::class, class_implements($schemeClass)) === true); |
54 | 54 | $type = $schemeClass::TYPE; |
55 | 55 | |
56 | - $indexSlug = '/{' . CI::ROUTE_KEY_INDEX . '}'; |
|
57 | - $params = function ($method) use ($type) { |
|
58 | - return [RouteInterface::PARAM_NAME => $type . '_' . $method]; |
|
56 | + $indexSlug = '/{'.CI::ROUTE_KEY_INDEX.'}'; |
|
57 | + $params = function($method) use ($type) { |
|
58 | + return [RouteInterface::PARAM_NAME => $type.'_'.$method]; |
|
59 | 59 | }; |
60 | - $handler = function ($method) use ($controllerClass) { |
|
60 | + $handler = function($method) use ($controllerClass) { |
|
61 | 61 | return [$controllerClass, $method]; |
62 | 62 | }; |
63 | 63 | |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | $group->post($type, $handler(CI::METHOD_CREATE), $params(CI::METHOD_CREATE)); |
71 | 71 | } |
72 | 72 | if (in_array(ControllerReadInterface::class, $classInterfaces) === true) { |
73 | - $group->get($type . $indexSlug, $handler(CI::METHOD_READ), $params(CI::METHOD_READ)); |
|
73 | + $group->get($type.$indexSlug, $handler(CI::METHOD_READ), $params(CI::METHOD_READ)); |
|
74 | 74 | } |
75 | 75 | if (in_array(ControllerUpdateInterface::class, $classInterfaces) === true) { |
76 | - $group->patch($type . $indexSlug, $handler(CI::METHOD_UPDATE), $params(CI::METHOD_UPDATE)); |
|
76 | + $group->patch($type.$indexSlug, $handler(CI::METHOD_UPDATE), $params(CI::METHOD_UPDATE)); |
|
77 | 77 | } |
78 | 78 | if (in_array(ControllerDeleteInterface::class, $classInterfaces) === true) { |
79 | - $group->delete($type . $indexSlug, $handler(CI::METHOD_DELETE), $params(CI::METHOD_DELETE)); |
|
79 | + $group->delete($type.$indexSlug, $handler(CI::METHOD_DELETE), $params(CI::METHOD_DELETE)); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | return $group; |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | */ |
92 | 92 | protected static function controller(GroupInterface $group, string $subUri, string $controllerClass): GroupInterface |
93 | 93 | { |
94 | - $slugged = $subUri . '/{' . CI::ROUTE_KEY_INDEX . '}'; |
|
95 | - $params = function ($method) use ($subUri) { |
|
96 | - return [RouteInterface::PARAM_NAME => $subUri . '_' . $method]; |
|
94 | + $slugged = $subUri.'/{'.CI::ROUTE_KEY_INDEX.'}'; |
|
95 | + $params = function($method) use ($subUri) { |
|
96 | + return [RouteInterface::PARAM_NAME => $subUri.'_'.$method]; |
|
97 | 97 | }; |
98 | - $handler = function ($method) use ($controllerClass) { |
|
98 | + $handler = function($method) use ($controllerClass) { |
|
99 | 99 | return [$controllerClass, $method]; |
100 | 100 | }; |
101 | 101 | |
@@ -112,11 +112,11 @@ discard block |
||
112 | 112 | $group->get($slugged, $handler(CI::METHOD_READ), $params(CI::METHOD_READ)); |
113 | 113 | } |
114 | 114 | if (in_array(ControllerUpdateInterface::class, $classInterfaces) === true) { |
115 | - $updateUri = $slugged . '/' . CI::METHOD_UPDATE; |
|
115 | + $updateUri = $slugged.'/'.CI::METHOD_UPDATE; |
|
116 | 116 | $group->post($updateUri, $handler(CI::METHOD_UPDATE), $params(CI::METHOD_UPDATE)); |
117 | 117 | } |
118 | 118 | if (in_array(ControllerDeleteInterface::class, $classInterfaces) === true) { |
119 | - $deleteUri = $slugged . '/' . CI::METHOD_DELETE; |
|
119 | + $deleteUri = $slugged.'/'.CI::METHOD_DELETE; |
|
120 | 120 | $group->post($deleteUri, $handler(CI::METHOD_DELETE), $params(CI::METHOD_DELETE)); |
121 | 121 | } |
122 | 122 | |
@@ -148,13 +148,13 @@ discard block |
||
148 | 148 | /** @var string $controllerClass */ |
149 | 149 | /** @var string $schemaClass */ |
150 | 150 | |
151 | - $resourceIdUri = $subUri . '/{' . CI::ROUTE_KEY_INDEX . '}/'; |
|
152 | - $selfUri = $resourceIdUri . DocumentInterface::KEYWORD_RELATIONSHIPS . '/' . $relationshipName; |
|
151 | + $resourceIdUri = $subUri.'/{'.CI::ROUTE_KEY_INDEX.'}/'; |
|
152 | + $selfUri = $resourceIdUri.DocumentInterface::KEYWORD_RELATIONSHIPS.'/'.$relationshipName; |
|
153 | 153 | |
154 | 154 | return $group |
155 | 155 | // `self` |
156 | 156 | ->get($selfUri, [$controllerClass, $selfGetMethod]) |
157 | 157 | // `related` |
158 | - ->get($resourceIdUri . $relationshipName, [$controllerClass, $selfGetMethod]); |
|
158 | + ->get($resourceIdUri.$relationshipName, [$controllerClass, $selfGetMethod]); |
|
159 | 159 | } |
160 | 160 | } |
@@ -52,17 +52,17 @@ |
||
52 | 52 | public function withIncludes(iterable $includes): self; |
53 | 53 | |
54 | 54 | /** |
55 | - * @return iterable |
|
55 | + * @return \Generator |
|
56 | 56 | */ |
57 | 57 | public function getMappedFilters(): iterable; |
58 | 58 | |
59 | 59 | /** |
60 | - * @return iterable |
|
60 | + * @return \Generator |
|
61 | 61 | */ |
62 | 62 | public function getMappedSorts(): iterable; |
63 | 63 | |
64 | 64 | /** |
65 | - * @return iterable |
|
65 | + * @return \Generator |
|
66 | 66 | */ |
67 | 67 | public function getMappedIncludes(): iterable; |
68 | 68 |
@@ -42,7 +42,7 @@ |
||
42 | 42 | public function areFiltersWithAnd(): bool; |
43 | 43 | |
44 | 44 | /** |
45 | - * @return iterable |
|
45 | + * @return \Generator |
|
46 | 46 | */ |
47 | 47 | public function getFilters(): iterable; |
48 | 48 |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @param string|mixed $shouldBeString |
133 | 133 | * @param string $separator |
134 | 134 | * |
135 | - * @return iterable |
|
135 | + * @return \Generator |
|
136 | 136 | */ |
137 | 137 | protected function splitString(string $paramName, $shouldBeString, string $separator): iterable |
138 | 138 | { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * @param string|mixed $shouldBeString |
151 | 151 | * @param string $separator |
152 | 152 | * |
153 | - * @return iterable |
|
153 | + * @return \Generator |
|
154 | 154 | */ |
155 | 155 | protected function splitStringAndCheckNoEmpties(string $paramName, $shouldBeString, string $separator): iterable |
156 | 156 | { |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * @param string $paramName |
169 | 169 | * @param string|mixed $shouldBeString |
170 | 170 | * |
171 | - * @return iterable |
|
171 | + * @return \Generator |
|
172 | 172 | */ |
173 | 173 | protected function splitCommaSeparatedStringAndCheckNoEmpties(string $paramName, $shouldBeString): iterable |
174 | 174 | { |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | public function __construct(array $parameters = [], array $messages = null) |
49 | 49 | { |
50 | 50 | $this->setParameters($parameters); |
51 | - $this->messages = $messages; |
|
51 | + $this->messages = $messages; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -69,13 +69,13 @@ discard block |
||
69 | 69 | public function getIncludes(): iterable |
70 | 70 | { |
71 | 71 | if (array_key_exists(static::PARAM_INCLUDE, $this->getParameters()) === true) { |
72 | - $splitByDot = function (string $path): iterable { |
|
72 | + $splitByDot = function(string $path): iterable { |
|
73 | 73 | foreach ($this->splitStringAndCheckNoEmpties(static::PARAM_INCLUDE, $path, '.') as $link) { |
74 | 74 | yield $link; |
75 | 75 | } |
76 | 76 | }; |
77 | 77 | |
78 | - $includes = $this->getParameters()[static::PARAM_INCLUDE]; |
|
78 | + $includes = $this->getParameters()[static::PARAM_INCLUDE]; |
|
79 | 79 | foreach ($this->splitCommaSeparatedStringAndCheckNoEmpties(static::PARAM_INCLUDE, $includes) as $path) { |
80 | 80 | yield $path => $splitByDot($path); |
81 | 81 | } |
@@ -408,7 +408,7 @@ |
||
408 | 408 | * @param string $parameterName |
409 | 409 | * @param iterable $value |
410 | 410 | * |
411 | - * @return iterable |
|
411 | + * @return Generator |
|
412 | 412 | */ |
413 | 413 | private function parseOperationsAndArguments(string $parameterName, iterable $value): iterable |
414 | 414 | { |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | public function getMappedIncludes(): iterable |
246 | 246 | { |
247 | 247 | $fromScheme = $this->getRootScheme(); |
248 | - $getMappedRelLinks = function (iterable $links) use ($fromScheme) : iterable { |
|
248 | + $getMappedRelLinks = function(iterable $links) use ($fromScheme) : iterable { |
|
249 | 249 | foreach ($links as $link) { |
250 | 250 | assert(is_string($link)); |
251 | 251 | $fromSchemaClass = get_class($fromScheme); |
@@ -289,14 +289,14 @@ discard block |
||
289 | 289 | // ['rel2_name1', ], |
290 | 290 | // ['rel3_name1', 'rel3_name2', 'rel3_name3', ], |
291 | 291 | // ] |
292 | - $includeAsModelNames = function (iterable $relationships): iterable { |
|
292 | + $includeAsModelNames = function(iterable $relationships): iterable { |
|
293 | 293 | foreach ($relationships as $relationship) { |
294 | 294 | assert($relationship instanceof RelationshipInterface); |
295 | 295 | yield $relationship->getNameInModel(); |
296 | 296 | } |
297 | 297 | }; |
298 | 298 | $mappedIncludes = $this->getMappedIncludes(); |
299 | - $getIncludes = function () use ($mappedIncludes, $includeAsModelNames) : iterable { |
|
299 | + $getIncludes = function() use ($mappedIncludes, $includeAsModelNames) : iterable { |
|
300 | 300 | foreach ($mappedIncludes as $relationships) { |
301 | 301 | yield $includeAsModelNames($relationships); |
302 | 302 | } |
@@ -264,7 +264,7 @@ |
||
264 | 264 | * @param string $parameterName |
265 | 265 | * @param array $value |
266 | 266 | * |
267 | - * @return iterable |
|
267 | + * @return Generator |
|
268 | 268 | */ |
269 | 269 | private function parseOperationsAndArguments(string $parameterName, array $value): iterable |
270 | 270 | { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | { |
93 | 93 | // debug check all fields are strings |
94 | 94 | assert( |
95 | - (function () use ($fields) { |
|
95 | + (function() use ($fields) { |
|
96 | 96 | $allAreStrings = !empty($fields); |
97 | 97 | foreach ($fields as $field) { |
98 | 98 | $allAreStrings = $allAreStrings === true && is_string($field) === true && empty($field) === false; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | { |
135 | 135 | // debug check all fields are strings |
136 | 136 | assert( |
137 | - (function () use ($fields) { |
|
137 | + (function() use ($fields) { |
|
138 | 138 | $allAreStrings = !empty($fields); |
139 | 139 | foreach ($fields as $field) { |
140 | 140 | $allAreStrings = $allAreStrings === true && is_string($field) === true && empty($field) === false; |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | { |
177 | 177 | // debug check all fields are strings |
178 | 178 | assert( |
179 | - (function () use ($paths) { |
|
179 | + (function() use ($paths) { |
|
180 | 180 | $allAreStrings = !empty($paths); |
181 | 181 | foreach ($paths as $path) { |
182 | 182 | $allAreStrings = $allAreStrings === true && is_string($path) === true && empty($path) === false; |