@@ -31,38 +31,38 @@ discard block |
||
31 | 31 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
32 | 32 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
33 | 33 | */ |
34 | - public function delete( ServerRequestInterface $request, ResponseInterface $response ) |
|
34 | + public function delete(ServerRequestInterface $request, ResponseInterface $response) |
|
35 | 35 | { |
36 | 36 | $view = $this->getView(); |
37 | 37 | |
38 | 38 | try |
39 | 39 | { |
40 | - $response = $this->deleteItems( $view, $request, $response ); |
|
40 | + $response = $this->deleteItems($view, $request, $response); |
|
41 | 41 | $status = 200; |
42 | 42 | } |
43 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
43 | + catch (\Aimeos\Admin\JsonAdm\Exception $e) |
|
44 | 44 | { |
45 | 45 | $status = $e->getCode(); |
46 | - $view->errors = array( array( |
|
47 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
|
46 | + $view->errors = array(array( |
|
47 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()), |
|
48 | 48 | 'detail' => $e->getTraceAsString(), |
49 | - ) ); |
|
49 | + )); |
|
50 | 50 | } |
51 | - catch( \Aimeos\MShop\Exception $e ) |
|
51 | + catch (\Aimeos\MShop\Exception $e) |
|
52 | 52 | { |
53 | 53 | $status = 404; |
54 | - $view->errors = array( array( |
|
55 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
54 | + $view->errors = array(array( |
|
55 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
56 | 56 | 'detail' => $e->getTraceAsString(), |
57 | - ) ); |
|
57 | + )); |
|
58 | 58 | } |
59 | - catch( \Exception $e ) |
|
59 | + catch (\Exception $e) |
|
60 | 60 | { |
61 | 61 | $status = 500; |
62 | - $view->errors = array( array( |
|
62 | + $view->errors = array(array( |
|
63 | 63 | 'title' => $e->getMessage(), |
64 | 64 | 'detail' => $e->getTraceAsString(), |
65 | - ) ); |
|
65 | + )); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** admin/jsonadm/standard/template-delete |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | $tplconf = 'admin/jsonadm/standard/template-delete'; |
94 | 94 | $default = 'delete-default.php'; |
95 | 95 | |
96 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
96 | + $body = $view->render($view->config($tplconf, $default)); |
|
97 | 97 | |
98 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
99 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
100 | - ->withStatus( $status ); |
|
98 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
99 | + ->withBody($view->response()->createStreamFromString($body)) |
|
100 | + ->withStatus($status); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | |
@@ -108,33 +108,33 @@ discard block |
||
108 | 108 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
109 | 109 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
110 | 110 | */ |
111 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
111 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
112 | 112 | { |
113 | 113 | $view = $this->getView(); |
114 | 114 | |
115 | 115 | try |
116 | 116 | { |
117 | - $response = $this->getItems( $view, $request, $response ); |
|
117 | + $response = $this->getItems($view, $request, $response); |
|
118 | 118 | $status = 200; |
119 | 119 | } |
120 | - catch( \Aimeos\MShop\Exception $e ) |
|
120 | + catch (\Aimeos\MShop\Exception $e) |
|
121 | 121 | { |
122 | 122 | $status = 404; |
123 | - $view->errors = array( array( |
|
124 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
123 | + $view->errors = array(array( |
|
124 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
125 | 125 | 'detail' => $e->getTraceAsString(), |
126 | - ) ); |
|
126 | + )); |
|
127 | 127 | } |
128 | - catch( \Exception $e ) |
|
128 | + catch (\Exception $e) |
|
129 | 129 | { |
130 | 130 | $status = 500; |
131 | - $view->errors = array( array( |
|
131 | + $view->errors = array(array( |
|
132 | 132 | 'title' => $e->getMessage(), |
133 | 133 | 'detail' => $e->getTraceAsString(), |
134 | - ) ); |
|
134 | + )); |
|
135 | 135 | } |
136 | 136 | |
137 | - if( $view->param( 'aggregate' ) !== null ) |
|
137 | + if ($view->param('aggregate') !== null) |
|
138 | 138 | { |
139 | 139 | /** admin/jsonadm/standard/template-aggregate |
140 | 140 | * Relative path to the JSON API template for GET aggregate requests |
@@ -195,11 +195,11 @@ discard block |
||
195 | 195 | $default = 'get-default.php'; |
196 | 196 | } |
197 | 197 | |
198 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
198 | + $body = $view->render($view->config($tplconf, $default)); |
|
199 | 199 | |
200 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
201 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
202 | - ->withStatus( $status ); |
|
200 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
201 | + ->withBody($view->response()->createStreamFromString($body)) |
|
202 | + ->withStatus($status); |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | |
@@ -210,38 +210,38 @@ discard block |
||
210 | 210 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
211 | 211 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
212 | 212 | */ |
213 | - public function patch( ServerRequestInterface $request, ResponseInterface $response ) |
|
213 | + public function patch(ServerRequestInterface $request, ResponseInterface $response) |
|
214 | 214 | { |
215 | 215 | $view = $this->getView(); |
216 | 216 | |
217 | 217 | try |
218 | 218 | { |
219 | - $response = $this->patchItems( $view, $request, $response ); |
|
219 | + $response = $this->patchItems($view, $request, $response); |
|
220 | 220 | $status = 200; |
221 | 221 | } |
222 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
222 | + catch (\Aimeos\Admin\JsonAdm\Exception $e) |
|
223 | 223 | { |
224 | 224 | $status = $e->getCode(); |
225 | - $view->errors = array( array( |
|
226 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
|
225 | + $view->errors = array(array( |
|
226 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()), |
|
227 | 227 | 'detail' => $e->getTraceAsString(), |
228 | - ) ); |
|
228 | + )); |
|
229 | 229 | } |
230 | - catch( \Aimeos\MShop\Exception $e ) |
|
230 | + catch (\Aimeos\MShop\Exception $e) |
|
231 | 231 | { |
232 | 232 | $status = 404; |
233 | - $view->errors = array( array( |
|
234 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
233 | + $view->errors = array(array( |
|
234 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
235 | 235 | 'detail' => $e->getTraceAsString(), |
236 | - ) ); |
|
236 | + )); |
|
237 | 237 | } |
238 | - catch( \Exception $e ) |
|
238 | + catch (\Exception $e) |
|
239 | 239 | { |
240 | 240 | $status = 500; |
241 | - $view->errors = array( array( |
|
241 | + $view->errors = array(array( |
|
242 | 242 | 'title' => $e->getMessage(), |
243 | 243 | 'detail' => $e->getTraceAsString(), |
244 | - ) ); |
|
244 | + )); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | /** admin/jsonadm/standard/template-patch |
@@ -272,11 +272,11 @@ discard block |
||
272 | 272 | $tplconf = 'admin/jsonadm/standard/template-patch'; |
273 | 273 | $default = 'patch-default.php'; |
274 | 274 | |
275 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
275 | + $body = $view->render($view->config($tplconf, $default)); |
|
276 | 276 | |
277 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
278 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
279 | - ->withStatus( $status ); |
|
277 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
278 | + ->withBody($view->response()->createStreamFromString($body)) |
|
279 | + ->withStatus($status); |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | |
@@ -287,38 +287,38 @@ discard block |
||
287 | 287 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
288 | 288 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
289 | 289 | */ |
290 | - public function post( ServerRequestInterface $request, ResponseInterface $response ) |
|
290 | + public function post(ServerRequestInterface $request, ResponseInterface $response) |
|
291 | 291 | { |
292 | 292 | $view = $this->getView(); |
293 | 293 | |
294 | 294 | try |
295 | 295 | { |
296 | - $response = $this->postItems( $view, $request, $response ); |
|
296 | + $response = $this->postItems($view, $request, $response); |
|
297 | 297 | $status = 201; |
298 | 298 | } |
299 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
299 | + catch (\Aimeos\Admin\JsonAdm\Exception $e) |
|
300 | 300 | { |
301 | 301 | $status = $e->getCode(); |
302 | - $view->errors = array( array( |
|
303 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
|
302 | + $view->errors = array(array( |
|
303 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', $e->getMessage()), |
|
304 | 304 | 'detail' => $e->getTraceAsString(), |
305 | - ) ); |
|
305 | + )); |
|
306 | 306 | } |
307 | - catch( \Aimeos\MShop\Exception $e ) |
|
307 | + catch (\Aimeos\MShop\Exception $e) |
|
308 | 308 | { |
309 | 309 | $status = 404; |
310 | - $view->errors = array( array( |
|
311 | - 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
310 | + $view->errors = array(array( |
|
311 | + 'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()), |
|
312 | 312 | 'detail' => $e->getTraceAsString(), |
313 | - ) ); |
|
313 | + )); |
|
314 | 314 | } |
315 | - catch( \Exception $e ) |
|
315 | + catch (\Exception $e) |
|
316 | 316 | { |
317 | 317 | $status = 500; |
318 | - $view->errors = array( array( |
|
318 | + $view->errors = array(array( |
|
319 | 319 | 'title' => $e->getMessage(), |
320 | 320 | 'detail' => $e->getTraceAsString(), |
321 | - ) ); |
|
321 | + )); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | /** admin/jsonadm/standard/template-post |
@@ -349,11 +349,11 @@ discard block |
||
349 | 349 | $tplconf = 'admin/jsonadm/standard/template-post'; |
350 | 350 | $default = 'post-default.php'; |
351 | 351 | |
352 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
352 | + $body = $view->render($view->config($tplconf, $default)); |
|
353 | 353 | |
354 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
355 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
356 | - ->withStatus( $status ); |
|
354 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
355 | + ->withBody($view->response()->createStreamFromString($body)) |
|
356 | + ->withStatus($status); |
|
357 | 357 | } |
358 | 358 | |
359 | 359 | |
@@ -364,14 +364,14 @@ discard block |
||
364 | 364 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
365 | 365 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
366 | 366 | */ |
367 | - public function put( ServerRequestInterface $request, ResponseInterface $response ) |
|
367 | + public function put(ServerRequestInterface $request, ResponseInterface $response) |
|
368 | 368 | { |
369 | 369 | $status = 501; |
370 | 370 | $view = $this->getView(); |
371 | 371 | |
372 | - $view->errors = array( array( |
|
373 | - 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', 'Not implemented, use PATCH instead' ), |
|
374 | - ) ); |
|
372 | + $view->errors = array(array( |
|
373 | + 'title' => $this->getContext()->getI18n()->dt('admin/jsonadm', 'Not implemented, use PATCH instead'), |
|
374 | + )); |
|
375 | 375 | |
376 | 376 | /** admin/jsonadm/standard/template-put |
377 | 377 | * Relative path to the JSON API template for PUT requests |
@@ -401,11 +401,11 @@ discard block |
||
401 | 401 | $tplconf = 'admin/jsonadm/standard/template-put'; |
402 | 402 | $default = 'put-default.php'; |
403 | 403 | |
404 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
404 | + $body = $view->render($view->config($tplconf, $default)); |
|
405 | 405 | |
406 | - return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
407 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
408 | - ->withStatus( $status ); |
|
406 | + return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
407 | + ->withBody($view->response()->createStreamFromString($body)) |
|
408 | + ->withStatus($status); |
|
409 | 409 | } |
410 | 410 | |
411 | 411 | |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | * @param string|null $prefix Form parameter prefix when nesting parameters is required |
418 | 418 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
419 | 419 | */ |
420 | - public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null ) |
|
420 | + public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null) |
|
421 | 421 | { |
422 | 422 | $context = $this->getContext(); |
423 | 423 | $view = $this->getView(); |
@@ -426,14 +426,14 @@ discard block |
||
426 | 426 | { |
427 | 427 | $resources = $attributes = []; |
428 | 428 | |
429 | - foreach( $this->getDomains( $view ) as $domain ) |
|
429 | + foreach ($this->getDomains($view) as $domain) |
|
430 | 430 | { |
431 | - $manager = \Aimeos\MShop\Factory::createManager( $context, $domain ); |
|
432 | - $resources = array_merge( $resources, $manager->getResourceType( true ) ); |
|
433 | - $attributes = array_merge( $attributes, $manager->getSearchAttributes( true ) ); |
|
431 | + $manager = \Aimeos\MShop\Factory::createManager($context, $domain); |
|
432 | + $resources = array_merge($resources, $manager->getResourceType(true)); |
|
433 | + $attributes = array_merge($attributes, $manager->getSearchAttributes(true)); |
|
434 | 434 | } |
435 | 435 | |
436 | - foreach( $this->getResources( $view ) as $resource ) { |
|
436 | + foreach ($this->getResources($view) as $resource) { |
|
437 | 437 | $resources[] = $resource; |
438 | 438 | } |
439 | 439 | |
@@ -443,21 +443,21 @@ discard block |
||
443 | 443 | |
444 | 444 | $status = 200; |
445 | 445 | } |
446 | - catch( \Aimeos\MShop\Exception $e ) |
|
446 | + catch (\Aimeos\MShop\Exception $e) |
|
447 | 447 | { |
448 | 448 | $status = 404; |
449 | - $view->errors = array( array( |
|
450 | - 'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
449 | + $view->errors = array(array( |
|
450 | + 'title' => $context->getI18n()->dt('mshop', $e->getMessage()), |
|
451 | 451 | 'detail' => $e->getTraceAsString(), |
452 | - ) ); |
|
452 | + )); |
|
453 | 453 | } |
454 | - catch( \Exception $e ) |
|
454 | + catch (\Exception $e) |
|
455 | 455 | { |
456 | 456 | $status = 500; |
457 | - $view->errors = array( array( |
|
457 | + $view->errors = array(array( |
|
458 | 458 | 'title' => $e->getMessage(), |
459 | 459 | 'detail' => $e->getTraceAsString(), |
460 | - ) ); |
|
460 | + )); |
|
461 | 461 | } |
462 | 462 | |
463 | 463 | /** admin/jsonadm/standard/template-options |
@@ -488,12 +488,12 @@ discard block |
||
488 | 488 | $tplconf = 'admin/jsonadm/standard/template-options'; |
489 | 489 | $default = 'options-default.php'; |
490 | 490 | |
491 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
491 | + $body = $view->render($view->config($tplconf, $default)); |
|
492 | 492 | |
493 | - return $response->withHeader( 'Allow', 'DELETE,GET,PATCH,POST,OPTIONS' ) |
|
494 | - ->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
495 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
496 | - ->withStatus( $status ); |
|
493 | + return $response->withHeader('Allow', 'DELETE,GET,PATCH,POST,OPTIONS') |
|
494 | + ->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
495 | + ->withBody($view->response()->createStreamFromString($body)) |
|
496 | + ->withStatus($status); |
|
497 | 497 | } |
498 | 498 | |
499 | 499 | |
@@ -506,25 +506,25 @@ discard block |
||
506 | 506 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
507 | 507 | * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid |
508 | 508 | */ |
509 | - protected function deleteItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
509 | + protected function deleteItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
510 | 510 | { |
511 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
511 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
512 | 512 | |
513 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
513 | + if (($id = $view->param('id')) == null) |
|
514 | 514 | { |
515 | 515 | $body = (string) $request->getBody(); |
516 | 516 | |
517 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) || !is_array( $payload->data ) ) { |
|
518 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
517 | + if (($payload = json_decode($body)) === null || !isset($payload->data) || !is_array($payload->data)) { |
|
518 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
519 | 519 | } |
520 | 520 | |
521 | - $ids = $this->getIds( $payload ); |
|
522 | - $manager->deleteItems( $ids ); |
|
523 | - $view->total = count( $ids ); |
|
521 | + $ids = $this->getIds($payload); |
|
522 | + $manager->deleteItems($ids); |
|
523 | + $view->total = count($ids); |
|
524 | 524 | } |
525 | 525 | else |
526 | 526 | { |
527 | - $manager->deleteItem( $id ); |
|
527 | + $manager->deleteItem($id); |
|
528 | 528 | $view->total = 1; |
529 | 529 | } |
530 | 530 | |
@@ -540,35 +540,35 @@ discard block |
||
540 | 540 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
541 | 541 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
542 | 542 | */ |
543 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
543 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
544 | 544 | { |
545 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
545 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
546 | 546 | |
547 | - if( ( $key = $view->param( 'aggregate' ) ) !== null ) |
|
547 | + if (($key = $view->param('aggregate')) !== null) |
|
548 | 548 | { |
549 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
550 | - $view->data = $manager->aggregate( $search, $key, $view->param( 'value' ), $view->param( 'type' ) ); |
|
549 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
550 | + $view->data = $manager->aggregate($search, $key, $view->param('value'), $view->param('type')); |
|
551 | 551 | return $response; |
552 | 552 | } |
553 | 553 | |
554 | 554 | $total = 1; |
555 | - $include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] ); |
|
555 | + $include = (($include = $view->param('include')) !== null ? explode(',', $include) : []); |
|
556 | 556 | |
557 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
557 | + if (($id = $view->param('id')) == null) |
|
558 | 558 | { |
559 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
560 | - $view->data = $manager->searchItems( $search, [], $total ); |
|
561 | - $view->childItems = $this->getChildItems( $view->data, $include ); |
|
562 | - $view->listItems = $this->getListItems( $view->data, $include ); |
|
559 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
560 | + $view->data = $manager->searchItems($search, [], $total); |
|
561 | + $view->childItems = $this->getChildItems($view->data, $include); |
|
562 | + $view->listItems = $this->getListItems($view->data, $include); |
|
563 | 563 | } |
564 | 564 | else |
565 | 565 | { |
566 | - $view->data = $manager->getItem( $id, [] ); |
|
567 | - $view->childItems = $this->getChildItems( array( $id => $view->data ), $include ); |
|
568 | - $view->listItems = $this->getListItems( array( $id => $view->data ), $include ); |
|
566 | + $view->data = $manager->getItem($id, []); |
|
567 | + $view->childItems = $this->getChildItems(array($id => $view->data), $include); |
|
568 | + $view->listItems = $this->getListItems(array($id => $view->data), $include); |
|
569 | 569 | } |
570 | 570 | |
571 | - $view->refItems = $this->getRefItems( $view->listItems ); |
|
571 | + $view->refItems = $this->getRefItems($view->listItems); |
|
572 | 572 | $view->total = $total; |
573 | 573 | |
574 | 574 | return $response; |
@@ -584,35 +584,35 @@ discard block |
||
584 | 584 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
585 | 585 | * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid |
586 | 586 | */ |
587 | - protected function patchItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
587 | + protected function patchItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
588 | 588 | { |
589 | 589 | $body = (string) $request->getBody(); |
590 | 590 | |
591 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) { |
|
592 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
591 | + if (($payload = json_decode($body)) === null || !isset($payload->data)) { |
|
592 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
593 | 593 | } |
594 | 594 | |
595 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
595 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
596 | 596 | |
597 | - if( is_array( $payload->data ) ) |
|
597 | + if (is_array($payload->data)) |
|
598 | 598 | { |
599 | - $data = $this->saveData( $manager, $payload ); |
|
599 | + $data = $this->saveData($manager, $payload); |
|
600 | 600 | |
601 | 601 | $view->data = $data; |
602 | - $view->total = count( $data ); |
|
603 | - $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
|
602 | + $view->total = count($data); |
|
603 | + $response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"'); |
|
604 | 604 | } |
605 | - elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
605 | + elseif (($id = $view->param('id')) != null) |
|
606 | 606 | { |
607 | 607 | $payload->data->id = $id; |
608 | - $data = $this->saveEntry( $manager, $payload->data ); |
|
608 | + $data = $this->saveEntry($manager, $payload->data); |
|
609 | 609 | |
610 | 610 | $view->data = $data; |
611 | 611 | $view->total = 1; |
612 | 612 | } |
613 | 613 | else |
614 | 614 | { |
615 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
615 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
616 | 616 | } |
617 | 617 | |
618 | 618 | return $response; |
@@ -627,33 +627,33 @@ discard block |
||
627 | 627 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
628 | 628 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
629 | 629 | */ |
630 | - protected function postItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
630 | + protected function postItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
631 | 631 | { |
632 | 632 | $body = (string) $request->getBody(); |
633 | 633 | |
634 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) { |
|
635 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
634 | + if (($payload = json_decode($body)) === null || !isset($payload->data)) { |
|
635 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
636 | 636 | } |
637 | 637 | |
638 | - if( isset( $payload->data->id ) || $view->param( 'id' ) != null ) { |
|
639 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 ); |
|
638 | + if (isset($payload->data->id) || $view->param('id') != null) { |
|
639 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403); |
|
640 | 640 | } |
641 | 641 | |
642 | 642 | |
643 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
643 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
644 | 644 | |
645 | - if( is_array( $payload->data ) ) |
|
645 | + if (is_array($payload->data)) |
|
646 | 646 | { |
647 | - $data = $this->saveData( $manager, $payload ); |
|
647 | + $data = $this->saveData($manager, $payload); |
|
648 | 648 | |
649 | 649 | $view->data = $data; |
650 | - $view->total = count( $data ); |
|
651 | - $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
|
650 | + $view->total = count($data); |
|
651 | + $response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"'); |
|
652 | 652 | } |
653 | 653 | else |
654 | 654 | { |
655 | 655 | $payload->data->id = null; |
656 | - $data = $this->saveEntry( $manager, $payload->data ); |
|
656 | + $data = $this->saveEntry($manager, $payload->data); |
|
657 | 657 | |
658 | 658 | $view->data = $data; |
659 | 659 | $view->total = 1; |