@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
30 | 30 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
31 | 31 | */ |
32 | - public function delete( ServerRequestInterface $request, ResponseInterface $response ); |
|
32 | + public function delete(ServerRequestInterface $request, ResponseInterface $response); |
|
33 | 33 | |
34 | 34 | |
35 | 35 | /** |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
40 | 40 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
41 | 41 | */ |
42 | - public function get( ServerRequestInterface $request, ResponseInterface $response ); |
|
42 | + public function get(ServerRequestInterface $request, ResponseInterface $response); |
|
43 | 43 | |
44 | 44 | |
45 | 45 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
50 | 50 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
51 | 51 | */ |
52 | - public function patch( ServerRequestInterface $request, ResponseInterface $response ); |
|
52 | + public function patch(ServerRequestInterface $request, ResponseInterface $response); |
|
53 | 53 | |
54 | 54 | |
55 | 55 | /** |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
60 | 60 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
61 | 61 | */ |
62 | - public function post( ServerRequestInterface $request, ResponseInterface $response ); |
|
62 | + public function post(ServerRequestInterface $request, ResponseInterface $response); |
|
63 | 63 | |
64 | 64 | |
65 | 65 | /** |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
70 | 70 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
71 | 71 | */ |
72 | - public function put( ServerRequestInterface $request, ResponseInterface $response ); |
|
72 | + public function put(ServerRequestInterface $request, ResponseInterface $response); |
|
73 | 73 | |
74 | 74 | |
75 | 75 | /** |
@@ -80,5 +80,5 @@ discard block |
||
80 | 80 | * @param string|null $prefix Form parameter prefix when nesting parameters is required |
81 | 81 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
82 | 82 | */ |
83 | - public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null ); |
|
83 | + public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null); |
|
84 | 84 | } |
@@ -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,11 +426,11 @@ discard block |
||
426 | 426 | { |
427 | 427 | $resources = $attributes = array(); |
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 | 436 | $view->prefix = $prefix; |
@@ -439,21 +439,21 @@ discard block |
||
439 | 439 | |
440 | 440 | $status = 200; |
441 | 441 | } |
442 | - catch( \Aimeos\MShop\Exception $e ) |
|
442 | + catch (\Aimeos\MShop\Exception $e) |
|
443 | 443 | { |
444 | 444 | $status = 404; |
445 | - $view->errors = array( array( |
|
446 | - 'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ), |
|
445 | + $view->errors = array(array( |
|
446 | + 'title' => $context->getI18n()->dt('mshop', $e->getMessage()), |
|
447 | 447 | 'detail' => $e->getTraceAsString(), |
448 | - ) ); |
|
448 | + )); |
|
449 | 449 | } |
450 | - catch( \Exception $e ) |
|
450 | + catch (\Exception $e) |
|
451 | 451 | { |
452 | 452 | $status = 500; |
453 | - $view->errors = array( array( |
|
453 | + $view->errors = array(array( |
|
454 | 454 | 'title' => $e->getMessage(), |
455 | 455 | 'detail' => $e->getTraceAsString(), |
456 | - ) ); |
|
456 | + )); |
|
457 | 457 | } |
458 | 458 | |
459 | 459 | /** admin/jsonadm/standard/template-options |
@@ -484,12 +484,12 @@ discard block |
||
484 | 484 | $tplconf = 'admin/jsonadm/standard/template-options'; |
485 | 485 | $default = 'options-default.php'; |
486 | 486 | |
487 | - $body = $view->render( $view->config( $tplconf, $default ) ); |
|
487 | + $body = $view->render($view->config($tplconf, $default)); |
|
488 | 488 | |
489 | - return $response->withHeader( 'Allow', 'DELETE,GET,PATCH,POST,OPTIONS' ) |
|
490 | - ->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' ) |
|
491 | - ->withBody( $view->response()->createStreamFromString( $body ) ) |
|
492 | - ->withStatus( $status ); |
|
489 | + return $response->withHeader('Allow', 'DELETE,GET,PATCH,POST,OPTIONS') |
|
490 | + ->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"') |
|
491 | + ->withBody($view->response()->createStreamFromString($body)) |
|
492 | + ->withStatus($status); |
|
493 | 493 | } |
494 | 494 | |
495 | 495 | |
@@ -502,25 +502,25 @@ discard block |
||
502 | 502 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
503 | 503 | * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid |
504 | 504 | */ |
505 | - protected function deleteItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
505 | + protected function deleteItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
506 | 506 | { |
507 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
507 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
508 | 508 | |
509 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
509 | + if (($id = $view->param('id')) == null) |
|
510 | 510 | { |
511 | 511 | $body = (string) $request->getBody(); |
512 | 512 | |
513 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) || !is_array( $payload->data ) ) { |
|
514 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
513 | + if (($payload = json_decode($body)) === null || !isset($payload->data) || !is_array($payload->data)) { |
|
514 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
515 | 515 | } |
516 | 516 | |
517 | - $ids = $this->getIds( $payload ); |
|
518 | - $manager->deleteItems( $ids ); |
|
519 | - $view->total = count( $ids ); |
|
517 | + $ids = $this->getIds($payload); |
|
518 | + $manager->deleteItems($ids); |
|
519 | + $view->total = count($ids); |
|
520 | 520 | } |
521 | 521 | else |
522 | 522 | { |
523 | - $manager->deleteItem( $id ); |
|
523 | + $manager->deleteItem($id); |
|
524 | 524 | $view->total = 1; |
525 | 525 | } |
526 | 526 | |
@@ -536,35 +536,35 @@ discard block |
||
536 | 536 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
537 | 537 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
538 | 538 | */ |
539 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
539 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
540 | 540 | { |
541 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
541 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
542 | 542 | |
543 | - if( ( $key = $view->param( 'aggregate' ) ) !== null ) |
|
543 | + if (($key = $view->param('aggregate')) !== null) |
|
544 | 544 | { |
545 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
546 | - $view->data = $manager->aggregate( $search, $key ); |
|
545 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
546 | + $view->data = $manager->aggregate($search, $key); |
|
547 | 547 | return $response; |
548 | 548 | } |
549 | 549 | |
550 | 550 | $total = 1; |
551 | - $include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : array() ); |
|
551 | + $include = (($include = $view->param('include')) !== null ? explode(',', $include) : array()); |
|
552 | 552 | |
553 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
553 | + if (($id = $view->param('id')) == null) |
|
554 | 554 | { |
555 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
556 | - $view->data = $manager->searchItems( $search, array(), $total ); |
|
557 | - $view->childItems = $this->getChildItems( $view->data, $include ); |
|
558 | - $view->listItems = $this->getListItems( $view->data, $include ); |
|
555 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
556 | + $view->data = $manager->searchItems($search, array(), $total); |
|
557 | + $view->childItems = $this->getChildItems($view->data, $include); |
|
558 | + $view->listItems = $this->getListItems($view->data, $include); |
|
559 | 559 | } |
560 | 560 | else |
561 | 561 | { |
562 | - $view->data = $manager->getItem( $id, array() ); |
|
563 | - $view->childItems = $this->getChildItems( array( $id => $view->data ), $include ); |
|
564 | - $view->listItems = $this->getListItems( array( $id => $view->data ), $include ); |
|
562 | + $view->data = $manager->getItem($id, array()); |
|
563 | + $view->childItems = $this->getChildItems(array($id => $view->data), $include); |
|
564 | + $view->listItems = $this->getListItems(array($id => $view->data), $include); |
|
565 | 565 | } |
566 | 566 | |
567 | - $view->refItems = $this->getRefItems( $view->listItems ); |
|
567 | + $view->refItems = $this->getRefItems($view->listItems); |
|
568 | 568 | $view->total = $total; |
569 | 569 | |
570 | 570 | return $response; |
@@ -580,35 +580,35 @@ discard block |
||
580 | 580 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
581 | 581 | * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid |
582 | 582 | */ |
583 | - protected function patchItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
583 | + protected function patchItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
584 | 584 | { |
585 | 585 | $body = (string) $request->getBody(); |
586 | 586 | |
587 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) { |
|
588 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
587 | + if (($payload = json_decode($body)) === null || !isset($payload->data)) { |
|
588 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
589 | 589 | } |
590 | 590 | |
591 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
591 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
592 | 592 | |
593 | - if( is_array( $payload->data ) ) |
|
593 | + if (is_array($payload->data)) |
|
594 | 594 | { |
595 | - $data = $this->saveData( $manager, $payload ); |
|
595 | + $data = $this->saveData($manager, $payload); |
|
596 | 596 | |
597 | 597 | $view->data = $data; |
598 | - $view->total = count( $data ); |
|
599 | - $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
|
598 | + $view->total = count($data); |
|
599 | + $response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"'); |
|
600 | 600 | } |
601 | - elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
601 | + elseif (($id = $view->param('id')) != null) |
|
602 | 602 | { |
603 | 603 | $payload->data->id = $id; |
604 | - $data = $this->saveEntry( $manager, $payload->data ); |
|
604 | + $data = $this->saveEntry($manager, $payload->data); |
|
605 | 605 | |
606 | 606 | $view->data = $data; |
607 | 607 | $view->total = 1; |
608 | 608 | } |
609 | 609 | else |
610 | 610 | { |
611 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
|
611 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400); |
|
612 | 612 | } |
613 | 613 | |
614 | 614 | return $response; |
@@ -623,33 +623,33 @@ discard block |
||
623 | 623 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
624 | 624 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
625 | 625 | */ |
626 | - protected function postItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
626 | + protected function postItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
627 | 627 | { |
628 | 628 | $body = (string) $request->getBody(); |
629 | 629 | |
630 | - if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) { |
|
631 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 ); |
|
630 | + if (($payload = json_decode($body)) === null || !isset($payload->data)) { |
|
631 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400); |
|
632 | 632 | } |
633 | 633 | |
634 | - if( isset( $payload->data->id ) || $view->param( 'id' ) != null ) { |
|
635 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 ); |
|
634 | + if (isset($payload->data->id) || $view->param('id') != null) { |
|
635 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403); |
|
636 | 636 | } |
637 | 637 | |
638 | 638 | |
639 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() ); |
|
639 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath()); |
|
640 | 640 | |
641 | - if( is_array( $payload->data ) ) |
|
641 | + if (is_array($payload->data)) |
|
642 | 642 | { |
643 | - $data = $this->saveData( $manager, $payload ); |
|
643 | + $data = $this->saveData($manager, $payload); |
|
644 | 644 | |
645 | 645 | $view->data = $data; |
646 | - $view->total = count( $data ); |
|
647 | - $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
|
646 | + $view->total = count($data); |
|
647 | + $response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"'); |
|
648 | 648 | } |
649 | 649 | else |
650 | 650 | { |
651 | 651 | $payload->data->id = null; |
652 | - $data = $this->saveEntry( $manager, $payload->data ); |
|
652 | + $data = $this->saveEntry($manager, $payload->data); |
|
653 | 653 | |
654 | 654 | $view->data = $data; |
655 | 655 | $view->total = 1; |
@@ -39,24 +39,21 @@ discard block |
||
39 | 39 | { |
40 | 40 | $response = $this->deleteItems( $view, $request, $response ); |
41 | 41 | $status = 200; |
42 | - } |
|
43 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
42 | + } catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
44 | 43 | { |
45 | 44 | $status = $e->getCode(); |
46 | 45 | $view->errors = array( array( |
47 | 46 | 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
48 | 47 | 'detail' => $e->getTraceAsString(), |
49 | 48 | ) ); |
50 | - } |
|
51 | - catch( \Aimeos\MShop\Exception $e ) |
|
49 | + } catch( \Aimeos\MShop\Exception $e ) |
|
52 | 50 | { |
53 | 51 | $status = 404; |
54 | 52 | $view->errors = array( array( |
55 | 53 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
56 | 54 | 'detail' => $e->getTraceAsString(), |
57 | 55 | ) ); |
58 | - } |
|
59 | - catch( \Exception $e ) |
|
56 | + } catch( \Exception $e ) |
|
60 | 57 | { |
61 | 58 | $status = 500; |
62 | 59 | $view->errors = array( array( |
@@ -116,16 +113,14 @@ discard block |
||
116 | 113 | { |
117 | 114 | $response = $this->getItems( $view, $request, $response ); |
118 | 115 | $status = 200; |
119 | - } |
|
120 | - catch( \Aimeos\MShop\Exception $e ) |
|
116 | + } catch( \Aimeos\MShop\Exception $e ) |
|
121 | 117 | { |
122 | 118 | $status = 404; |
123 | 119 | $view->errors = array( array( |
124 | 120 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
125 | 121 | 'detail' => $e->getTraceAsString(), |
126 | 122 | ) ); |
127 | - } |
|
128 | - catch( \Exception $e ) |
|
123 | + } catch( \Exception $e ) |
|
129 | 124 | { |
130 | 125 | $status = 500; |
131 | 126 | $view->errors = array( array( |
@@ -163,8 +158,7 @@ discard block |
||
163 | 158 | */ |
164 | 159 | $tplconf = 'admin/jsonadm/standard/template-aggregate'; |
165 | 160 | $default = 'aggregate-default.php'; |
166 | - } |
|
167 | - else |
|
161 | + } else |
|
168 | 162 | { |
169 | 163 | /** admin/jsonadm/standard/template-get |
170 | 164 | * Relative path to the JSON API template for GET requests |
@@ -218,24 +212,21 @@ discard block |
||
218 | 212 | { |
219 | 213 | $response = $this->patchItems( $view, $request, $response ); |
220 | 214 | $status = 200; |
221 | - } |
|
222 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
215 | + } catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
223 | 216 | { |
224 | 217 | $status = $e->getCode(); |
225 | 218 | $view->errors = array( array( |
226 | 219 | 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
227 | 220 | 'detail' => $e->getTraceAsString(), |
228 | 221 | ) ); |
229 | - } |
|
230 | - catch( \Aimeos\MShop\Exception $e ) |
|
222 | + } catch( \Aimeos\MShop\Exception $e ) |
|
231 | 223 | { |
232 | 224 | $status = 404; |
233 | 225 | $view->errors = array( array( |
234 | 226 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
235 | 227 | 'detail' => $e->getTraceAsString(), |
236 | 228 | ) ); |
237 | - } |
|
238 | - catch( \Exception $e ) |
|
229 | + } catch( \Exception $e ) |
|
239 | 230 | { |
240 | 231 | $status = 500; |
241 | 232 | $view->errors = array( array( |
@@ -295,24 +286,21 @@ discard block |
||
295 | 286 | { |
296 | 287 | $response = $this->postItems( $view, $request, $response ); |
297 | 288 | $status = 201; |
298 | - } |
|
299 | - catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
289 | + } catch( \Aimeos\Admin\JsonAdm\Exception $e ) |
|
300 | 290 | { |
301 | 291 | $status = $e->getCode(); |
302 | 292 | $view->errors = array( array( |
303 | 293 | 'title' => $this->getContext()->getI18n()->dt( 'admin/jsonadm', $e->getMessage() ), |
304 | 294 | 'detail' => $e->getTraceAsString(), |
305 | 295 | ) ); |
306 | - } |
|
307 | - catch( \Aimeos\MShop\Exception $e ) |
|
296 | + } catch( \Aimeos\MShop\Exception $e ) |
|
308 | 297 | { |
309 | 298 | $status = 404; |
310 | 299 | $view->errors = array( array( |
311 | 300 | 'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ), |
312 | 301 | 'detail' => $e->getTraceAsString(), |
313 | 302 | ) ); |
314 | - } |
|
315 | - catch( \Exception $e ) |
|
303 | + } catch( \Exception $e ) |
|
316 | 304 | { |
317 | 305 | $status = 500; |
318 | 306 | $view->errors = array( array( |
@@ -438,16 +426,14 @@ discard block |
||
438 | 426 | $view->attributes = $attributes; |
439 | 427 | |
440 | 428 | $status = 200; |
441 | - } |
|
442 | - catch( \Aimeos\MShop\Exception $e ) |
|
429 | + } catch( \Aimeos\MShop\Exception $e ) |
|
443 | 430 | { |
444 | 431 | $status = 404; |
445 | 432 | $view->errors = array( array( |
446 | 433 | 'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ), |
447 | 434 | 'detail' => $e->getTraceAsString(), |
448 | 435 | ) ); |
449 | - } |
|
450 | - catch( \Exception $e ) |
|
436 | + } catch( \Exception $e ) |
|
451 | 437 | { |
452 | 438 | $status = 500; |
453 | 439 | $view->errors = array( array( |
@@ -517,8 +503,7 @@ discard block |
||
517 | 503 | $ids = $this->getIds( $payload ); |
518 | 504 | $manager->deleteItems( $ids ); |
519 | 505 | $view->total = count( $ids ); |
520 | - } |
|
521 | - else |
|
506 | + } else |
|
522 | 507 | { |
523 | 508 | $manager->deleteItem( $id ); |
524 | 509 | $view->total = 1; |
@@ -556,8 +541,7 @@ discard block |
||
556 | 541 | $view->data = $manager->searchItems( $search, array(), $total ); |
557 | 542 | $view->childItems = $this->getChildItems( $view->data, $include ); |
558 | 543 | $view->listItems = $this->getListItems( $view->data, $include ); |
559 | - } |
|
560 | - else |
|
544 | + } else |
|
561 | 545 | { |
562 | 546 | $view->data = $manager->getItem( $id, array() ); |
563 | 547 | $view->childItems = $this->getChildItems( array( $id => $view->data ), $include ); |
@@ -597,16 +581,14 @@ discard block |
||
597 | 581 | $view->data = $data; |
598 | 582 | $view->total = count( $data ); |
599 | 583 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
600 | - } |
|
601 | - elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
584 | + } elseif( ( $id = $view->param( 'id' ) ) != null ) |
|
602 | 585 | { |
603 | 586 | $payload->data->id = $id; |
604 | 587 | $data = $this->saveEntry( $manager, $payload->data ); |
605 | 588 | |
606 | 589 | $view->data = $data; |
607 | 590 | $view->total = 1; |
608 | - } |
|
609 | - else |
|
591 | + } else |
|
610 | 592 | { |
611 | 593 | throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 ); |
612 | 594 | } |
@@ -645,8 +627,7 @@ discard block |
||
645 | 627 | $view->data = $data; |
646 | 628 | $view->total = count( $data ); |
647 | 629 | $response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' ); |
648 | - } |
|
649 | - else |
|
630 | + } else |
|
650 | 631 | { |
651 | 632 | $payload->data->id = null; |
652 | 633 | $data = $this->saveEntry( $manager, $payload->data ); |
@@ -21,89 +21,89 @@ |
||
21 | 21 | $context = \TestHelperJadm::getContext(); |
22 | 22 | $this->view = $context->getView(); |
23 | 23 | |
24 | - $this->stub = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Standard' ) |
|
25 | - ->setConstructorArgs( array( $context, $this->view, array(), 'attribute' ) ) |
|
24 | + $this->stub = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Standard') |
|
25 | + ->setConstructorArgs(array($context, $this->view, array(), 'attribute')) |
|
26 | 26 | ->getMock(); |
27 | 27 | |
28 | - $this->object = new TestBase( $this->stub, $context, $this->view, array(), 'attribute' ); |
|
28 | + $this->object = new TestBase($this->stub, $context, $this->view, array(), 'attribute'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | protected function tearDown() |
33 | 33 | { |
34 | - unset( $this->object, $this->stub ); |
|
34 | + unset($this->object, $this->stub); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testDelete() |
39 | 39 | { |
40 | - $this->stub->expects( $this->once() )->method( 'delete' )->will( $this->returnArgument( 1 ) ); |
|
40 | + $this->stub->expects($this->once())->method('delete')->will($this->returnArgument(1)); |
|
41 | 41 | $response = $this->view->response(); |
42 | 42 | |
43 | - $this->assertSame( $response, $this->object->delete( $this->view->request(), $response ) ); |
|
43 | + $this->assertSame($response, $this->object->delete($this->view->request(), $response)); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | 47 | public function testGet() |
48 | 48 | { |
49 | - $this->stub->expects( $this->once() )->method( 'get' )->will( $this->returnArgument( 1 ) ); |
|
49 | + $this->stub->expects($this->once())->method('get')->will($this->returnArgument(1)); |
|
50 | 50 | $response = $this->view->response(); |
51 | 51 | |
52 | - $this->assertSame( $response, $this->object->get( $this->view->request(), $response ) ); |
|
52 | + $this->assertSame($response, $this->object->get($this->view->request(), $response)); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | 56 | public function testPatch() |
57 | 57 | { |
58 | - $this->stub->expects( $this->once() )->method( 'patch' )->will( $this->returnArgument( 1 ) ); |
|
58 | + $this->stub->expects($this->once())->method('patch')->will($this->returnArgument(1)); |
|
59 | 59 | $response = $this->view->response(); |
60 | 60 | |
61 | - $this->assertSame( $response, $this->object->patch( $this->view->request(), $response ) ); |
|
61 | + $this->assertSame($response, $this->object->patch($this->view->request(), $response)); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | |
65 | 65 | public function testPost() |
66 | 66 | { |
67 | - $this->stub->expects( $this->once() )->method( 'post' )->will( $this->returnArgument( 1 ) ); |
|
67 | + $this->stub->expects($this->once())->method('post')->will($this->returnArgument(1)); |
|
68 | 68 | $response = $this->view->response(); |
69 | 69 | |
70 | - $this->assertSame( $response, $this->object->post( $this->view->request(), $response ) ); |
|
70 | + $this->assertSame($response, $this->object->post($this->view->request(), $response)); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | |
74 | 74 | public function testPut() |
75 | 75 | { |
76 | - $this->stub->expects( $this->once() )->method( 'put' )->will( $this->returnArgument( 1 ) ); |
|
76 | + $this->stub->expects($this->once())->method('put')->will($this->returnArgument(1)); |
|
77 | 77 | $response = $this->view->response(); |
78 | 78 | |
79 | - $this->assertSame( $response, $this->object->put( $this->view->request(), $response ) ); |
|
79 | + $this->assertSame($response, $this->object->put($this->view->request(), $response)); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
83 | 83 | public function testOptions() |
84 | 84 | { |
85 | - $this->stub->expects( $this->once() )->method( 'options' )->will( $this->returnArgument( 1 ) ); |
|
85 | + $this->stub->expects($this->once())->method('options')->will($this->returnArgument(1)); |
|
86 | 86 | $response = $this->view->response(); |
87 | 87 | |
88 | - $this->assertSame( $response, $this->object->options( $this->view->request(), $response ) ); |
|
88 | + $this->assertSame($response, $this->object->options($this->view->request(), $response)); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | |
92 | 92 | public function testGetContext() |
93 | 93 | { |
94 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Context\\Item\\Iface', $this->object->getContextPublic() ); |
|
94 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Context\\Item\\Iface', $this->object->getContextPublic()); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | |
98 | 98 | public function testGetTemplatePaths() |
99 | 99 | { |
100 | - $this->assertEquals( array(), $this->object->getTemplatePathsPublic() ); |
|
100 | + $this->assertEquals(array(), $this->object->getTemplatePathsPublic()); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | |
104 | 104 | public function testGetPath() |
105 | 105 | { |
106 | - $this->assertEquals( 'attribute', $this->object->getPathPublic() ); |
|
106 | + $this->assertEquals('attribute', $this->object->getPathPublic()); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 |
@@ -36,10 +36,10 @@ discard block |
||
36 | 36 | * @param array $templatePaths List of file system paths where the templates are stored |
37 | 37 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
38 | 38 | */ |
39 | - public function __construct( \Aimeos\Admin\JsonAdm\Iface $client, |
|
40 | - \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path ) |
|
39 | + public function __construct(\Aimeos\Admin\JsonAdm\Iface $client, |
|
40 | + \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path) |
|
41 | 41 | { |
42 | - parent::__construct( $context, $view, $templatePaths, $path ); |
|
42 | + parent::__construct($context, $view, $templatePaths, $path); |
|
43 | 43 | |
44 | 44 | $this->client = $client; |
45 | 45 | } |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | * @return mixed Returns the value of the called method |
54 | 54 | * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed |
55 | 55 | */ |
56 | - public function __call( $name, array $param ) |
|
56 | + public function __call($name, array $param) |
|
57 | 57 | { |
58 | - return @call_user_func_array( array( $this->client, $name ), $param ); |
|
58 | + return @call_user_func_array(array($this->client, $name), $param); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
67 | 67 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
68 | 68 | */ |
69 | - public function delete( ServerRequestInterface $request, ResponseInterface $response ) |
|
69 | + public function delete(ServerRequestInterface $request, ResponseInterface $response) |
|
70 | 70 | { |
71 | - return $this->client->delete( $request, $response ); |
|
71 | + return $this->client->delete($request, $response); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | |
@@ -79,9 +79,9 @@ discard block |
||
79 | 79 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
80 | 80 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
81 | 81 | */ |
82 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
82 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
83 | 83 | { |
84 | - return $this->client->get( $request, $response ); |
|
84 | + return $this->client->get($request, $response); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
94 | 94 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
95 | 95 | */ |
96 | - public function patch( ServerRequestInterface $request, ResponseInterface $response ) |
|
96 | + public function patch(ServerRequestInterface $request, ResponseInterface $response) |
|
97 | 97 | { |
98 | - return $this->client->patch( $request, $response ); |
|
98 | + return $this->client->patch($request, $response); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | |
@@ -107,9 +107,9 @@ discard block |
||
107 | 107 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
108 | 108 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
109 | 109 | */ |
110 | - public function post( ServerRequestInterface $request, ResponseInterface $response ) |
|
110 | + public function post(ServerRequestInterface $request, ResponseInterface $response) |
|
111 | 111 | { |
112 | - return $this->client->post( $request, $response ); |
|
112 | + return $this->client->post($request, $response); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | |
@@ -121,9 +121,9 @@ discard block |
||
121 | 121 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
122 | 122 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
123 | 123 | */ |
124 | - public function put( ServerRequestInterface $request, ResponseInterface $response ) |
|
124 | + public function put(ServerRequestInterface $request, ResponseInterface $response) |
|
125 | 125 | { |
126 | - return $this->client->put( $request, $response ); |
|
126 | + return $this->client->put($request, $response); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | * @param string|null $prefix Form parameter prefix when nesting parameters is required |
137 | 137 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
138 | 138 | */ |
139 | - public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null ) |
|
139 | + public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null) |
|
140 | 140 | { |
141 | - return $this->client->options( $request, $response, $prefix ); |
|
141 | + return $this->client->options($request, $response, $prefix); |
|
142 | 142 | } |
143 | 143 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param array $templatePaths List of file system paths where the templates are stored |
34 | 34 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
35 | 35 | */ |
36 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path ) |
|
36 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path) |
|
37 | 37 | { |
38 | 38 | $this->view = $view; |
39 | 39 | $this->context = $context; |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | * @param array $param List of method parameter |
50 | 50 | * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed |
51 | 51 | */ |
52 | - public function __call( $name, array $param ) |
|
52 | + public function __call($name, array $param) |
|
53 | 53 | { |
54 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Unable to call method "%1$s"', $name ) ); |
|
54 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Unable to call method "%1$s"', $name)); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * @param array $include List of resource types that should be fetched |
63 | 63 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
64 | 64 | */ |
65 | - protected function getChildItems( array $items, array $include ) |
|
65 | + protected function getChildItems(array $items, array $include) |
|
66 | 66 | { |
67 | 67 | return array(); |
68 | 68 | } |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter |
86 | 86 | * @return array List of domain names |
87 | 87 | */ |
88 | - protected function getDomains( \Aimeos\MW\View\Iface $view ) |
|
88 | + protected function getDomains(\Aimeos\MW\View\Iface $view) |
|
89 | 89 | { |
90 | - if( ( $domains = $view->param( 'resource' ) ) == '' ) |
|
90 | + if (($domains = $view->param('resource')) == '') |
|
91 | 91 | { |
92 | 92 | /** admin/jsonadm/domains |
93 | 93 | * A list of domain names whose clients are available for the JSON API |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | 'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media', |
110 | 110 | 'order', 'plugin', 'price', 'product', 'service', 'supplier', 'tag', 'text' |
111 | 111 | ); |
112 | - $domains = $this->getContext()->getConfig()->get( 'admin/jsonadm/domains', $default ); |
|
112 | + $domains = $this->getContext()->getConfig()->get('admin/jsonadm/domains', $default); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | return (array) $domains; |
@@ -122,15 +122,15 @@ discard block |
||
122 | 122 | * @param \stdClass $request Decoded request body |
123 | 123 | * @return array List of item IDs |
124 | 124 | */ |
125 | - protected function getIds( $request ) |
|
125 | + protected function getIds($request) |
|
126 | 126 | { |
127 | 127 | $ids = array(); |
128 | 128 | |
129 | - if( isset( $request->data ) ) |
|
129 | + if (isset($request->data)) |
|
130 | 130 | { |
131 | - foreach( (array) $request->data as $entry ) |
|
131 | + foreach ((array) $request->data as $entry) |
|
132 | 132 | { |
133 | - if( isset( $entry->id ) ) { |
|
133 | + if (isset($entry->id)) { |
|
134 | 134 | $ids[] = $entry->id; |
135 | 135 | } |
136 | 136 | } |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * @param array $include List of resource types that should be fetched |
148 | 148 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
149 | 149 | */ |
150 | - protected function getListItems( array $items, array $include ) |
|
150 | + protected function getListItems(array $items, array $include) |
|
151 | 151 | { |
152 | 152 | return array(); |
153 | 153 | } |
@@ -170,23 +170,23 @@ discard block |
||
170 | 170 | * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
171 | 171 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
172 | 172 | */ |
173 | - protected function getRefItems( array $listItems ) |
|
173 | + protected function getRefItems(array $listItems) |
|
174 | 174 | { |
175 | 175 | $list = $map = array(); |
176 | 176 | $context = $this->getContext(); |
177 | 177 | |
178 | - foreach( $listItems as $listItem ) { |
|
178 | + foreach ($listItems as $listItem) { |
|
179 | 179 | $map[$listItem->getDomain()][] = $listItem->getRefId(); |
180 | 180 | } |
181 | 181 | |
182 | - foreach( $map as $domain => $ids ) |
|
182 | + foreach ($map as $domain => $ids) |
|
183 | 183 | { |
184 | - $manager = \Aimeos\MShop\Factory::createManager( $context, $domain ); |
|
184 | + $manager = \Aimeos\MShop\Factory::createManager($context, $domain); |
|
185 | 185 | |
186 | 186 | $search = $manager->createSearch(); |
187 | - $search->setConditions( $search->compare( '==', $domain . '.id', $ids ) ); |
|
187 | + $search->setConditions($search->compare('==', $domain . '.id', $ids)); |
|
188 | 188 | |
189 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
189 | + $list = array_merge($list, $manager->searchItems($search)); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | return $list; |
@@ -222,11 +222,11 @@ discard block |
||
222 | 222 | * @param array $params List of criteria data with condition, sorting and paging |
223 | 223 | * @return \Aimeos\MW\Criteria\Iface Initialized criteria object |
224 | 224 | */ |
225 | - protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
225 | + protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
226 | 226 | { |
227 | - $this->initCriteriaConditions( $criteria, $params ); |
|
228 | - $this->initCriteriaSortations( $criteria, $params ); |
|
229 | - $this->initCriteriaSlice( $criteria, $params ); |
|
227 | + $this->initCriteriaConditions($criteria, $params); |
|
228 | + $this->initCriteriaSortations($criteria, $params); |
|
229 | + $this->initCriteriaSlice($criteria, $params); |
|
230 | 230 | |
231 | 231 | return $criteria; |
232 | 232 | } |
@@ -238,17 +238,17 @@ discard block |
||
238 | 238 | * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object |
239 | 239 | * @param array $params List of criteria data with condition, sorting and paging |
240 | 240 | */ |
241 | - protected function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
241 | + protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
242 | 242 | { |
243 | - if( !isset( $params['filter'] ) ) { |
|
243 | + if (!isset($params['filter'])) { |
|
244 | 244 | return; |
245 | 245 | } |
246 | 246 | |
247 | 247 | $existing = $criteria->getConditions(); |
248 | - $criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) ); |
|
248 | + $criteria->setConditions($criteria->toConditions((array) $params['filter'])); |
|
249 | 249 | |
250 | - $expr = array( $criteria->getConditions(), $existing ); |
|
251 | - $criteria->setConditions( $criteria->combine( '&&', $expr ) ); |
|
250 | + $expr = array($criteria->getConditions(), $existing); |
|
251 | + $criteria->setConditions($criteria->combine('&&', $expr)); |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | |
@@ -258,12 +258,12 @@ discard block |
||
258 | 258 | * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object |
259 | 259 | * @param array $params List of criteria data with condition, sorting and paging |
260 | 260 | */ |
261 | - protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
261 | + protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
262 | 262 | { |
263 | - $start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 ); |
|
264 | - $size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 ); |
|
263 | + $start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0); |
|
264 | + $size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25); |
|
265 | 265 | |
266 | - $criteria->setSlice( $start, $size ); |
|
266 | + $criteria->setSlice($start, $size); |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | |
@@ -273,24 +273,24 @@ discard block |
||
273 | 273 | * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object |
274 | 274 | * @param array $params List of criteria data with condition, sorting and paging |
275 | 275 | */ |
276 | - protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
276 | + protected function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
277 | 277 | { |
278 | - if( !isset( $params['sort'] ) ) { |
|
278 | + if (!isset($params['sort'])) { |
|
279 | 279 | return; |
280 | 280 | } |
281 | 281 | |
282 | 282 | $sortation = array(); |
283 | 283 | |
284 | - foreach( explode( ',', $params['sort'] ) as $sort ) |
|
284 | + foreach (explode(',', $params['sort']) as $sort) |
|
285 | 285 | { |
286 | - if( $sort[0] === '-' ) { |
|
287 | - $sortation[] = $criteria->sort( '-', substr( $sort, 1 ) ); |
|
286 | + if ($sort[0] === '-') { |
|
287 | + $sortation[] = $criteria->sort('-', substr($sort, 1)); |
|
288 | 288 | } else { |
289 | - $sortation[] = $criteria->sort( '+', $sort ); |
|
289 | + $sortation[] = $criteria->sort('+', $sort); |
|
290 | 290 | } |
291 | 291 | } |
292 | 292 | |
293 | - $criteria->setSortations( $sortation ); |
|
293 | + $criteria->setSortations($sortation); |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | |
@@ -301,14 +301,14 @@ discard block |
||
301 | 301 | * @param \stdClass $request Object with request body data |
302 | 302 | * @return array List of items |
303 | 303 | */ |
304 | - protected function saveData( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request ) |
|
304 | + protected function saveData(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request) |
|
305 | 305 | { |
306 | 306 | $data = array(); |
307 | 307 | |
308 | - if( isset( $request->data ) ) |
|
308 | + if (isset($request->data)) |
|
309 | 309 | { |
310 | - foreach( (array) $request->data as $entry ) { |
|
311 | - $data[] = $this->saveEntry( $manager, $entry ); |
|
310 | + foreach ((array) $request->data as $entry) { |
|
311 | + $data[] = $this->saveEntry($manager, $entry); |
|
312 | 312 | } |
313 | 313 | } |
314 | 314 | |
@@ -323,22 +323,22 @@ discard block |
||
323 | 323 | * @param \stdClass $entry Object including "id" and "attributes" elements |
324 | 324 | * @return \Aimeos\MShop\Common\Item\Iface New or updated item |
325 | 325 | */ |
326 | - protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry ) |
|
326 | + protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry) |
|
327 | 327 | { |
328 | - if( isset( $entry->id ) ) { |
|
329 | - $item = $manager->getItem( $entry->id ); |
|
328 | + if (isset($entry->id)) { |
|
329 | + $item = $manager->getItem($entry->id); |
|
330 | 330 | } else { |
331 | 331 | $item = $manager->createItem(); |
332 | 332 | } |
333 | 333 | |
334 | - $item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() ); |
|
335 | - $manager->saveItem( $item ); |
|
334 | + $item = $this->addItemData($manager, $item, $entry, $item->getResourceType()); |
|
335 | + $manager->saveItem($item); |
|
336 | 336 | |
337 | - if( isset( $entry->relationships ) ) { |
|
338 | - $this->saveRelationships( $manager, $item, $entry->relationships ); |
|
337 | + if (isset($entry->relationships)) { |
|
338 | + $this->saveRelationships($manager, $item, $entry->relationships); |
|
339 | 339 | } |
340 | 340 | |
341 | - return $manager->getItem( $item->getId() ); |
|
341 | + return $manager->getItem($item->getId()); |
|
342 | 342 | } |
343 | 343 | |
344 | 344 | |
@@ -349,28 +349,28 @@ discard block |
||
349 | 349 | * @param \Aimeos\MShop\Common\Item\Iface $item Domain item with an unique ID set |
350 | 350 | * @param \stdClass $relationships Object including the <domain>/data/attributes structure |
351 | 351 | */ |
352 | - protected function saveRelationships( \Aimeos\MShop\Common\Manager\Iface $manager, |
|
353 | - \Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships ) |
|
352 | + protected function saveRelationships(\Aimeos\MShop\Common\Manager\Iface $manager, |
|
353 | + \Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships) |
|
354 | 354 | { |
355 | 355 | $id = $item->getId(); |
356 | - $listManager = $manager->getSubManager( 'lists' ); |
|
356 | + $listManager = $manager->getSubManager('lists'); |
|
357 | 357 | |
358 | - foreach( (array) $relationships as $domain => $list ) |
|
358 | + foreach ((array) $relationships as $domain => $list) |
|
359 | 359 | { |
360 | - if( isset( $list->data ) ) |
|
360 | + if (isset($list->data)) |
|
361 | 361 | { |
362 | - foreach( (array) $list->data as $data ) |
|
362 | + foreach ((array) $list->data as $data) |
|
363 | 363 | { |
364 | - $listItem = $this->addItemData( $listManager, $listManager->createItem(), $data, $domain ); |
|
364 | + $listItem = $this->addItemData($listManager, $listManager->createItem(), $data, $domain); |
|
365 | 365 | |
366 | - if( isset( $data->id ) ) { |
|
367 | - $listItem->setRefId( $data->id ); |
|
366 | + if (isset($data->id)) { |
|
367 | + $listItem->setRefId($data->id); |
|
368 | 368 | } |
369 | 369 | |
370 | - $listItem->setParentId( $id ); |
|
371 | - $listItem->setDomain( $domain ); |
|
370 | + $listItem->setParentId($id); |
|
371 | + $listItem->setDomain($domain); |
|
372 | 372 | |
373 | - $listManager->saveItem( $listItem, false ); |
|
373 | + $listManager->saveItem($listItem, false); |
|
374 | 374 | } |
375 | 375 | } |
376 | 376 | } |
@@ -387,20 +387,20 @@ discard block |
||
387 | 387 | * @return \Aimeos\MShop\Common\Item\Iface Item including the data |
388 | 388 | */ |
389 | 389 | protected function addItemData(\Aimeos\MShop\Common\Manager\Iface $manager, |
390 | - \Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain ) |
|
390 | + \Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain) |
|
391 | 391 | { |
392 | - if( isset( $data->attributes ) ) |
|
392 | + if (isset($data->attributes)) |
|
393 | 393 | { |
394 | 394 | $attr = (array) $data->attributes; |
395 | - $key = str_replace( '/', '.', $item->getResourceType() ); |
|
395 | + $key = str_replace('/', '.', $item->getResourceType()); |
|
396 | 396 | |
397 | - if( isset( $attr[$key.'.type'] ) ) |
|
397 | + if (isset($attr[$key . '.type'])) |
|
398 | 398 | { |
399 | - $typeItem = $manager->getSubManager( 'type' )->findItem( $attr[$key.'.type'], array(), $domain ); |
|
400 | - $attr[$key.'.typeid'] = $typeItem->getId(); |
|
399 | + $typeItem = $manager->getSubManager('type')->findItem($attr[$key . '.type'], array(), $domain); |
|
400 | + $attr[$key . '.typeid'] = $typeItem->getId(); |
|
401 | 401 | } |
402 | 402 | |
403 | - $item->fromArray( $attr ); |
|
403 | + $item->fromArray($attr); |
|
404 | 404 | } |
405 | 405 | |
406 | 406 | return $item; |