Completed
Push — master ( aaf7bf...4b53c0 )
by Aimeos
03:57
created
admin/jsonadm/src/Admin/JsonAdm/Standard.php 1 patch
Spacing   +138 added lines, -138 removed lines patch added patch discarded remove patch
@@ -31,38 +31,38 @@  discard block
 block discarded – undo
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
 block discarded – undo
93 93
 		$tplconf = 'admin/jsonadm/standard/template-delete';
94 94
 		$default = 'delete-standard.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
 block discarded – undo
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
 block discarded – undo
195 195
 			$default = 'get-standard.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
 block discarded – undo
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
 block discarded – undo
272 272
 		$tplconf = 'admin/jsonadm/standard/template-patch';
273 273
 		$default = 'patch-standard.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
 block discarded – undo
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
 block discarded – undo
349 349
 		$tplconf = 'admin/jsonadm/standard/template-post';
350 350
 		$default = 'post-standard.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
 block discarded – undo
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
 block discarded – undo
401 401
 		$tplconf = 'admin/jsonadm/standard/template-put';
402 402
 		$default = 'put-standard.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
 
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
417 417
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
418 418
 	 */
419
-	public function options( ServerRequestInterface $request, ResponseInterface $response )
419
+	public function options(ServerRequestInterface $request, ResponseInterface $response)
420 420
 	{
421 421
 		$context = $this->getContext();
422 422
 		$view = $this->getView();
@@ -425,37 +425,37 @@  discard block
 block discarded – undo
425 425
 		{
426 426
 			$resources = $attributes = [];
427 427
 
428
-			foreach( $this->getDomains( $view ) as $domain )
428
+			foreach ($this->getDomains($view) as $domain)
429 429
 			{
430
-				$manager = \Aimeos\MShop\Factory::createManager( $context, $domain );
431
-				$resources = array_merge( $resources, $manager->getResourceType( true ) );
432
-				$attributes = array_merge( $attributes, $manager->getSearchAttributes( true ) );
430
+				$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
431
+				$resources = array_merge($resources, $manager->getResourceType(true));
432
+				$attributes = array_merge($attributes, $manager->getSearchAttributes(true));
433 433
 			}
434 434
 
435
-			foreach( $this->getResources( $view ) as $resource ) {
435
+			foreach ($this->getResources($view) as $resource) {
436 436
 				$resources[] = $resource;
437 437
 			}
438 438
 
439
-			$view->resources = $this->getAllowedResources( $view, $resources );
439
+			$view->resources = $this->getAllowedResources($view, $resources);
440 440
 			$view->attributes = $attributes;
441 441
 
442 442
 			$status = 200;
443 443
 		}
444
-		catch( \Aimeos\MShop\Exception $e )
444
+		catch (\Aimeos\MShop\Exception $e)
445 445
 		{
446 446
 			$status = 404;
447
-			$view->errors = array( array(
448
-				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
447
+			$view->errors = array(array(
448
+				'title' => $context->getI18n()->dt('mshop', $e->getMessage()),
449 449
 				'detail' => $e->getTraceAsString(),
450
-			) );
450
+			));
451 451
 		}
452
-		catch( \Exception $e )
452
+		catch (\Exception $e)
453 453
 		{
454 454
 			$status = 500;
455
-			$view->errors = array( array(
455
+			$view->errors = array(array(
456 456
 				'title' => $e->getMessage(),
457 457
 				'detail' => $e->getTraceAsString(),
458
-			) );
458
+			));
459 459
 		}
460 460
 
461 461
 		/** admin/jsonadm/standard/template-options
@@ -486,12 +486,12 @@  discard block
 block discarded – undo
486 486
 		$tplconf = 'admin/jsonadm/standard/template-options';
487 487
 		$default = 'options-standard.php';
488 488
 
489
-		$body = $view->render( $view->config( $tplconf, $default ) );
489
+		$body = $view->render($view->config($tplconf, $default));
490 490
 
491
-		return $response->withHeader( 'Allow', 'DELETE,GET,PATCH,POST,OPTIONS' )
492
-			->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
493
-			->withBody( $view->response()->createStreamFromString( $body ) )
494
-			->withStatus( $status );
491
+		return $response->withHeader('Allow', 'DELETE,GET,PATCH,POST,OPTIONS')
492
+			->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
493
+			->withBody($view->response()->createStreamFromString($body))
494
+			->withStatus($status);
495 495
 	}
496 496
 
497 497
 
@@ -504,25 +504,25 @@  discard block
 block discarded – undo
504 504
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
505 505
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the request body is invalid
506 506
 	 */
507
-	protected function deleteItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
507
+	protected function deleteItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
508 508
 	{
509
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
509
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
510 510
 
511
-		if( ( $id = $view->param( 'id' ) ) == null )
511
+		if (($id = $view->param('id')) == null)
512 512
 		{
513 513
 			$body = (string) $request->getBody();
514 514
 
515
-			if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) || !is_array( $payload->data ) ) {
516
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
515
+			if (($payload = json_decode($body)) === null || !isset($payload->data) || !is_array($payload->data)) {
516
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
517 517
 			}
518 518
 
519
-			$ids = $this->getIds( $payload );
520
-			$manager->deleteItems( $ids );
521
-			$view->total = count( $ids );
519
+			$ids = $this->getIds($payload);
520
+			$manager->deleteItems($ids);
521
+			$view->total = count($ids);
522 522
 		}
523 523
 		else
524 524
 		{
525
-			$manager->deleteItem( $id );
525
+			$manager->deleteItem($id);
526 526
 			$view->total = 1;
527 527
 		}
528 528
 
@@ -538,35 +538,35 @@  discard block
 block discarded – undo
538 538
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
539 539
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
540 540
 	 */
541
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
541
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
542 542
 	{
543
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
543
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
544 544
 
545
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
545
+		if (($key = $view->param('aggregate')) !== null)
546 546
 		{
547
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
548
-			$view->data = $manager->aggregate( $search, $key, $view->param( 'value' ), $view->param( 'type' ) );
547
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
548
+			$view->data = $manager->aggregate($search, $key, $view->param('value'), $view->param('type'));
549 549
 			return $response;
550 550
 		}
551 551
 
552 552
 		$total = 1;
553
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
553
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
554 554
 
555
-		if( ( $id = $view->param( 'id' ) ) == null )
555
+		if (($id = $view->param('id')) == null)
556 556
 		{
557
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
558
-			$view->data = $manager->searchItems( $search, [], $total );
559
-			$view->childItems = $this->getChildItems( $view->data, $include );
560
-			$view->listItems = $this->getListItems( $view->data, $include );
557
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
558
+			$view->data = $manager->searchItems($search, [], $total);
559
+			$view->childItems = $this->getChildItems($view->data, $include);
560
+			$view->listItems = $this->getListItems($view->data, $include);
561 561
 		}
562 562
 		else
563 563
 		{
564
-			$view->data = $manager->getItem( $id, [] );
565
-			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
566
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
564
+			$view->data = $manager->getItem($id, []);
565
+			$view->childItems = $this->getChildItems(array($id => $view->data), $include);
566
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
567 567
 		}
568 568
 
569
-		$view->refItems = $this->getRefItems( $view->listItems );
569
+		$view->refItems = $this->getRefItems($view->listItems);
570 570
 		$view->total = $total;
571 571
 
572 572
 		return $response;
@@ -582,35 +582,35 @@  discard block
 block discarded – undo
582 582
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
583 583
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If "id" parameter isn't available or the body is invalid
584 584
 	 */
585
-	protected function patchItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
585
+	protected function patchItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
586 586
 	{
587 587
 		$body = (string) $request->getBody();
588 588
 
589
-		if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) {
590
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
589
+		if (($payload = json_decode($body)) === null || !isset($payload->data)) {
590
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
591 591
 		}
592 592
 
593
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
593
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
594 594
 
595
-		if( is_array( $payload->data ) )
595
+		if (is_array($payload->data))
596 596
 		{
597
-			$data = $this->saveData( $manager, $payload );
597
+			$data = $this->saveData($manager, $payload);
598 598
 
599 599
 			$view->data = $data;
600
-			$view->total = count( $data );
601
-			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
600
+			$view->total = count($data);
601
+			$response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"');
602 602
 		}
603
-		elseif( ( $id = $view->param( 'id' ) ) != null )
603
+		elseif (($id = $view->param('id')) != null)
604 604
 		{
605 605
 			$payload->data->id = $id;
606
-			$data = $this->saveEntry( $manager, $payload->data );
606
+			$data = $this->saveEntry($manager, $payload->data);
607 607
 
608 608
 			$view->data = $data;
609 609
 			$view->total = 1;
610 610
 		}
611 611
 		else
612 612
 		{
613
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
613
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
614 614
 		}
615 615
 
616 616
 		return $response;
@@ -625,33 +625,33 @@  discard block
 block discarded – undo
625 625
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
626 626
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
627 627
 	 */
628
-	protected function postItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
628
+	protected function postItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
629 629
 	{
630 630
 		$body = (string) $request->getBody();
631 631
 
632
-		if( ( $payload = json_decode( $body ) ) === null || !isset( $payload->data ) ) {
633
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid JSON in body' ), 400 );
632
+		if (($payload = json_decode($body)) === null || !isset($payload->data)) {
633
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid JSON in body'), 400);
634 634
 		}
635 635
 
636
-		if( isset( $payload->data->id ) || $view->param( 'id' ) != null ) {
637
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Client generated IDs are not supported' ), 403 );
636
+		if (isset($payload->data->id) || $view->param('id') != null) {
637
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Client generated IDs are not supported'), 403);
638 638
 		}
639 639
 
640 640
 
641
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $this->getPath() );
641
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $this->getPath());
642 642
 
643
-		if( is_array( $payload->data ) )
643
+		if (is_array($payload->data))
644 644
 		{
645
-			$data = $this->saveData( $manager, $payload );
645
+			$data = $this->saveData($manager, $payload);
646 646
 
647 647
 			$view->data = $data;
648
-			$view->total = count( $data );
649
-			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
648
+			$view->total = count($data);
649
+			$response = $response->withHeader('Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"');
650 650
 		}
651 651
 		else
652 652
 		{
653 653
 			$payload->data->id = null;
654
-			$data = $this->saveEntry( $manager, $payload->data );
654
+			$data = $this->saveEntry($manager, $payload->data);
655 655
 
656 656
 			$view->data = $data;
657 657
 			$view->total = 1;
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Product/StandardTest.php 1 patch
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 		$this->context = \TestHelperJadm::getContext();
22 22
 		$this->view = $this->context->getView();
23 23
 
24
-		$this->object = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, 'product' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, 'product');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,33 +31,33 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'product.code' => 'CNE' )
34
+				'==' => array('product.code' => 'CNE')
35 35
 			),
36 36
 			'include' => 'text,product,product/property'
37 37
 		);
38
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
39
-		$this->view->addHelper( 'param', $helper );
40
-
41
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
42
-		$result = json_decode( (string) $response->getBody(), true );
43
-
44
-		$this->assertEquals( 200, $response->getStatusCode() );
45
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
46
-
47
-		$this->assertEquals( 1, $result['meta']['total'] );
48
-		$this->assertEquals( 1, count( $result['data'] ) );
49
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
50
-		$this->assertEquals( 7, count( $result['data'][0]['relationships']['text'] ) );
51
-		$this->assertArrayHaskey( 'self', $result['data'][0]['relationships']['text'][0]['data']['links'] );
52
-		$this->assertEquals( 5, count( $result['data'][0]['relationships']['product'] ) );
53
-		$this->assertArrayHaskey( 'self', $result['data'][0]['relationships']['product'][0]['data']['links'] );
54
-		$this->assertEquals( 4, count( $result['data'][0]['relationships']['product/property'] ) );
55
-		$this->assertEquals( 15, count( $result['included'] ) );
56
-		$this->assertEquals( 'product/property', $result['included'][0]['type'] );
57
-		$this->assertArrayHaskey( 'self', $result['included'][0]['links'] );
58
-		$this->assertArrayHaskey( 'related', $result['included'][0]['links'] );
59
-
60
-		$this->assertArrayNotHasKey( 'errors', $result );
38
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
39
+		$this->view->addHelper('param', $helper);
40
+
41
+		$response = $this->object->get($this->view->request(), $this->view->response());
42
+		$result = json_decode((string) $response->getBody(), true);
43
+
44
+		$this->assertEquals(200, $response->getStatusCode());
45
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
46
+
47
+		$this->assertEquals(1, $result['meta']['total']);
48
+		$this->assertEquals(1, count($result['data']));
49
+		$this->assertEquals('product', $result['data'][0]['type']);
50
+		$this->assertEquals(7, count($result['data'][0]['relationships']['text']));
51
+		$this->assertArrayHaskey('self', $result['data'][0]['relationships']['text'][0]['data']['links']);
52
+		$this->assertEquals(5, count($result['data'][0]['relationships']['product']));
53
+		$this->assertArrayHaskey('self', $result['data'][0]['relationships']['product'][0]['data']['links']);
54
+		$this->assertEquals(4, count($result['data'][0]['relationships']['product/property']));
55
+		$this->assertEquals(15, count($result['included']));
56
+		$this->assertEquals('product/property', $result['included'][0]['type']);
57
+		$this->assertArrayHaskey('self', $result['included'][0]['links']);
58
+		$this->assertArrayHaskey('related', $result['included'][0]['links']);
59
+
60
+		$this->assertArrayNotHasKey('errors', $result);
61 61
 	}
62 62
 
63 63
 
@@ -70,23 +70,23 @@  discard block
 block discarded – undo
70 70
 			'sort' => 'product.id',
71 71
 			'include' => 'product,product/property'
72 72
 		);
73
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
74
-		$this->view->addHelper( 'param', $helper );
73
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
74
+		$this->view->addHelper('param', $helper);
75 75
 
76
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
77
-		$result = json_decode( (string) $response->getBody(), true );
76
+		$response = $this->object->get($this->view->request(), $this->view->response());
77
+		$result = json_decode((string) $response->getBody(), true);
78 78
 
79 79
 
80
-		$this->assertEquals( 200, $response->getStatusCode() );
81
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
80
+		$this->assertEquals(200, $response->getStatusCode());
81
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
82 82
 
83
-		$this->assertEquals( 28, $result['meta']['total'] );
84
-		$this->assertEquals( 25, count( $result['data'] ) );
85
-		$this->assertEquals( 'product', $result['data'][0]['type'] );
86
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
87
-		$this->assertEquals( 5, count( $result['data'][0]['relationships']['product'] ) );
88
-		$this->assertEquals( 21, count( $result['included'] ) );
83
+		$this->assertEquals(28, $result['meta']['total']);
84
+		$this->assertEquals(25, count($result['data']));
85
+		$this->assertEquals('product', $result['data'][0]['type']);
86
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
87
+		$this->assertEquals(5, count($result['data'][0]['relationships']['product']));
88
+		$this->assertEquals(21, count($result['included']));
89 89
 
90
-		$this->assertArrayNotHasKey( 'errors', $result );
90
+		$this->assertArrayNotHasKey('errors', $result);
91 91
 	}
92 92
 }
93 93
\ No newline at end of file
Please login to merge, or discard this patch.