Completed
Push — master ( 7ad21f...0bf26f )
by Aimeos
01:53
created
admin/jsonadm/tests/Admin/JsonAdm/Order/StandardTest.php 1 patch
Spacing   +42 added lines, -42 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\Order\Standard( $this->context, 'order' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Order\Standard($this->context, 'order');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,25 +31,25 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'order.editor' => 'core:unittest' )
34
+				'==' => array('order.editor' => 'core:unittest')
35 35
 			),
36 36
 			'aggregate' => 'order.cdate',
37 37
 		);
38
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
39
-		$this->view->addHelper( 'param', $helper );
38
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
39
+		$this->view->addHelper('param', $helper);
40 40
 
41
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
42
-		$result = json_decode( (string) $response->getBody(), true );
41
+		$response = $this->object->get($this->view->request(), $this->view->response());
42
+		$result = json_decode((string) $response->getBody(), true);
43 43
 
44
-		$this->assertEquals( 200, $response->getStatusCode() );
45
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
44
+		$this->assertEquals(200, $response->getStatusCode());
45
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
46 46
 
47
-		$this->assertEquals( 1, $result['meta']['total'] );
48
-		$this->assertEquals( 1, count( $result['data'] ) );
49
-		$this->assertEquals( 'aggregate', $result['data'][0]['type'] );
50
-		$this->assertGreaterThan( 0, $result['data'][0]['attributes'] );
47
+		$this->assertEquals(1, $result['meta']['total']);
48
+		$this->assertEquals(1, count($result['data']));
49
+		$this->assertEquals('aggregate', $result['data'][0]['type']);
50
+		$this->assertGreaterThan(0, $result['data'][0]['attributes']);
51 51
 
52
-		$this->assertArrayNotHasKey( 'errors', $result );
52
+		$this->assertArrayNotHasKey('errors', $result);
53 53
 	}
54 54
 
55 55
 
@@ -57,28 +57,28 @@  discard block
 block discarded – undo
57 57
 	{
58 58
 		$params = array(
59 59
 			'filter' => array(
60
-				'==' => array( 'order.datepayment' => '2008-02-15 12:34:56' )
60
+				'==' => array('order.datepayment' => '2008-02-15 12:34:56')
61 61
 			),
62 62
 			'include' => 'order/base,order/status'
63 63
 		);
64
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
65
-		$this->view->addHelper( 'param', $helper );
64
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
65
+		$this->view->addHelper('param', $helper);
66 66
 
67
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
68
-		$result = json_decode( (string) $response->getBody(), true );
67
+		$response = $this->object->get($this->view->request(), $this->view->response());
68
+		$result = json_decode((string) $response->getBody(), true);
69 69
 
70 70
 
71
-		$this->assertEquals( 200, $response->getStatusCode() );
72
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
71
+		$this->assertEquals(200, $response->getStatusCode());
72
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
73 73
 
74
-		$this->assertEquals( 1, $result['meta']['total'] );
75
-		$this->assertEquals( 1, count( $result['data'] ) );
76
-		$this->assertEquals( 'order', $result['data'][0]['type'] );
77
-		$this->assertEquals( 3, count( $result['data'][0]['relationships']['order/status'] ) );
78
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['order/base'] ) );
79
-		$this->assertEquals( 4, count( $result['included'] ) );
74
+		$this->assertEquals(1, $result['meta']['total']);
75
+		$this->assertEquals(1, count($result['data']));
76
+		$this->assertEquals('order', $result['data'][0]['type']);
77
+		$this->assertEquals(3, count($result['data'][0]['relationships']['order/status']));
78
+		$this->assertEquals(1, count($result['data'][0]['relationships']['order/base']));
79
+		$this->assertEquals(4, count($result['included']));
80 80
 
81
-		$this->assertArrayNotHasKey( 'errors', $result );
81
+		$this->assertArrayNotHasKey('errors', $result);
82 82
 	}
83 83
 
84 84
 
@@ -91,23 +91,23 @@  discard block
 block discarded – undo
91 91
 			'sort' => 'order.id',
92 92
 			'include' => 'order/status'
93 93
 		);
94
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
95
-		$this->view->addHelper( 'param', $helper );
94
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
95
+		$this->view->addHelper('param', $helper);
96 96
 
97
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
98
-		$result = json_decode( (string) $response->getBody(), true );
97
+		$response = $this->object->get($this->view->request(), $this->view->response());
98
+		$result = json_decode((string) $response->getBody(), true);
99 99
 
100 100
 
101
-		$this->assertEquals( 200, $response->getStatusCode() );
102
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
101
+		$this->assertEquals(200, $response->getStatusCode());
102
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
103 103
 
104
-		$this->assertGreaterThanOrEqual( 4, $result['meta']['total'] );
105
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'] ) );
106
-		$this->assertEquals( 'order', $result['data'][0]['type'] );
107
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
108
-		$this->assertGreaterThanOrEqual( 3, count( $result['data'][0]['relationships']['order/status'] ) );
109
-		$this->assertGreaterThanOrEqual( 11, count( $result['included'] ) );
104
+		$this->assertGreaterThanOrEqual(4, $result['meta']['total']);
105
+		$this->assertGreaterThanOrEqual(4, count($result['data']));
106
+		$this->assertEquals('order', $result['data'][0]['type']);
107
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
108
+		$this->assertGreaterThanOrEqual(3, count($result['data'][0]['relationships']['order/status']));
109
+		$this->assertGreaterThanOrEqual(11, count($result['included']));
110 110
 
111
-		$this->assertArrayNotHasKey( 'errors', $result );
111
+		$this->assertArrayNotHasKey('errors', $result);
112 112
 	}
113 113
 }
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Order/Base/StandardTest.php 1 patch
Spacing   +30 added lines, -30 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\Order\Base\Standard( $this->context, 'order/base' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Order\Base\Standard($this->context, 'order/base');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,28 +31,28 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'order.base.price' => '4800.00' )
34
+				'==' => array('order.base.price' => '4800.00')
35 35
 			),
36 36
 			'include' => 'order/base/address,order/base/product'
37 37
 		);
38
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
39
-		$this->view->addHelper( 'param', $helper );
38
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
39
+		$this->view->addHelper('param', $helper);
40 40
 
41
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
42
-		$result = json_decode( (string) $response->getBody(), true );
41
+		$response = $this->object->get($this->view->request(), $this->view->response());
42
+		$result = json_decode((string) $response->getBody(), true);
43 43
 
44 44
 
45
-		$this->assertEquals( 200, $response->getStatusCode() );
46
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
45
+		$this->assertEquals(200, $response->getStatusCode());
46
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
47 47
 
48
-		$this->assertEquals( 1, $result['meta']['total'] );
49
-		$this->assertEquals( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'order/base', $result['data'][0]['type'] );
51
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['order/base/address'] ) );
52
-		$this->assertEquals( 6, count( $result['data'][0]['relationships']['order/base/product'] ) );
53
-		$this->assertEquals( 7, count( $result['included'] ) );
48
+		$this->assertEquals(1, $result['meta']['total']);
49
+		$this->assertEquals(1, count($result['data']));
50
+		$this->assertEquals('order/base', $result['data'][0]['type']);
51
+		$this->assertEquals(1, count($result['data'][0]['relationships']['order/base/address']));
52
+		$this->assertEquals(6, count($result['data'][0]['relationships']['order/base/product']));
53
+		$this->assertEquals(7, count($result['included']));
54 54
 
55
-		$this->assertArrayNotHasKey( 'errors', $result );
55
+		$this->assertArrayNotHasKey('errors', $result);
56 56
 	}
57 57
 
58 58
 
@@ -65,23 +65,23 @@  discard block
 block discarded – undo
65 65
 			'sort' => 'order.base.id',
66 66
 			'include' => 'order/base/product'
67 67
 		);
68
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
69
-		$this->view->addHelper( 'param', $helper );
68
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
69
+		$this->view->addHelper('param', $helper);
70 70
 
71
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
72
-		$result = json_decode( (string) $response->getBody(), true );
71
+		$response = $this->object->get($this->view->request(), $this->view->response());
72
+		$result = json_decode((string) $response->getBody(), true);
73 73
 
74 74
 
75
-		$this->assertEquals( 200, $response->getStatusCode() );
76
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
75
+		$this->assertEquals(200, $response->getStatusCode());
76
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
77 77
 
78
-		$this->assertGreaterThanOrEqual( 4, $result['meta']['total'] );
79
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'] ) );
80
-		$this->assertEquals( 'order/base', $result['data'][0]['type'] );
81
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
82
-		$this->assertGreaterThanOrEqual( 4, count( $result['data'][0]['relationships']['order/base/product'] ) );
83
-		$this->assertGreaterThanOrEqual( 14, count( $result['included'] ) );
78
+		$this->assertGreaterThanOrEqual(4, $result['meta']['total']);
79
+		$this->assertGreaterThanOrEqual(4, count($result['data']));
80
+		$this->assertEquals('order/base', $result['data'][0]['type']);
81
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
82
+		$this->assertGreaterThanOrEqual(4, count($result['data'][0]['relationships']['order/base/product']));
83
+		$this->assertGreaterThanOrEqual(14, count($result['included']));
84 84
 
85
-		$this->assertArrayNotHasKey( 'errors', $result );
85
+		$this->assertArrayNotHasKey('errors', $result);
86 86
 	}
87 87
 }
88 88
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Common/Decorator/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,5 +27,5 @@
 block discarded – undo
27 27
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
28 28
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
29 29
 	 */
30
-	public function __construct( \Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path );
30
+	public function __construct(\Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path);
31 31
 }
32 32
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Common/Decorator/Base.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
35 35
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
36 36
 	 */
37
-	public function __construct( \Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path )
37
+	public function __construct(\Aimeos\Admin\JsonAdm\Iface $client, \Aimeos\MShop\Context\Item\Iface $context, $path)
38 38
 	{
39
-		parent::__construct( $context, $path );
39
+		parent::__construct($context, $path);
40 40
 
41 41
 		$this->client = $client;
42 42
 	}
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
 	 * @return mixed Returns the value of the called method
51 51
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed
52 52
 	 */
53
-	public function __call( $name, array $param )
53
+	public function __call($name, array $param)
54 54
 	{
55
-		return @call_user_func_array( array( $this->client, $name ), $param );
55
+		return @call_user_func_array(array($this->client, $name), $param);
56 56
 	}
57 57
 
58 58
 
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
64 64
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
65 65
 	 */
66
-	public function delete( ServerRequestInterface $request, ResponseInterface $response )
66
+	public function delete(ServerRequestInterface $request, ResponseInterface $response)
67 67
 	{
68
-		return $this->client->delete( $request, $response );
68
+		return $this->client->delete($request, $response);
69 69
 	}
70 70
 
71 71
 
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
77 77
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
78 78
 	 */
79
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
79
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
80 80
 	{
81
-		return $this->client->get( $request, $response );
81
+		return $this->client->get($request, $response);
82 82
 	}
83 83
 
84 84
 
@@ -90,9 +90,9 @@  discard block
 block discarded – undo
90 90
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
91 91
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
92 92
 	 */
93
-	public function patch( ServerRequestInterface $request, ResponseInterface $response )
93
+	public function patch(ServerRequestInterface $request, ResponseInterface $response)
94 94
 	{
95
-		return $this->client->patch( $request, $response );
95
+		return $this->client->patch($request, $response);
96 96
 	}
97 97
 
98 98
 
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
105 105
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
106 106
 	 */
107
-	public function post( ServerRequestInterface $request, ResponseInterface $response )
107
+	public function post(ServerRequestInterface $request, ResponseInterface $response)
108 108
 	{
109
-		return $this->client->post( $request, $response );
109
+		return $this->client->post($request, $response);
110 110
 	}
111 111
 
112 112
 
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
119 119
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
120 120
 	 */
121
-	public function put( ServerRequestInterface $request, ResponseInterface $response )
121
+	public function put(ServerRequestInterface $request, ResponseInterface $response)
122 122
 	{
123
-		return $this->client->put( $request, $response );
123
+		return $this->client->put($request, $response);
124 124
 	}
125 125
 
126 126
 
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 	 * @param string|null $prefix Form parameter prefix when nesting parameters is required
134 134
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
135 135
 	 */
136
-	public function options( ServerRequestInterface $request, ResponseInterface $response, $prefix = null )
136
+	public function options(ServerRequestInterface $request, ResponseInterface $response, $prefix = null)
137 137
 	{
138
-		return $this->client->options( $request, $response, $prefix );
138
+		return $this->client->options($request, $response, $prefix);
139 139
 	}
140 140
 
141 141
 
@@ -156,11 +156,11 @@  discard block
 block discarded – undo
156 156
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
157 157
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
158 158
 	 */
159
-	public function setAimeos( \Aimeos\Bootstrap $aimeos )
159
+	public function setAimeos(\Aimeos\Bootstrap $aimeos)
160 160
 	{
161
-		parent::setAimeos( $aimeos );
161
+		parent::setAimeos($aimeos);
162 162
 
163
-		$this->client->setAimeos( $aimeos );
163
+		$this->client->setAimeos($aimeos);
164 164
 		return $this;
165 165
 	}
166 166
 
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
182 182
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
183 183
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
184 184
 	 */
185
-	public function setView( \Aimeos\MW\View\Iface $view )
185
+	public function setView(\Aimeos\MW\View\Iface $view)
186 186
 	{
187
-		parent::setView( $view );
187
+		parent::setView($view);
188 188
 
189
-		$this->client->setView( $view );
189
+		$this->client->setView($view);
190 190
 		return $this;
191 191
 	}
192 192
 
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * Sets the Aimeos bootstrap object
71 71
 	 *
72 72
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
73
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
73
+	 * @return Base Reference to this object for fluent calls
74 74
 	 */
75 75
 	public function setAimeos( \Aimeos\Bootstrap $aimeos )
76 76
 	{
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * Sets the view object that will generate the admin output.
99 99
 	 *
100 100
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
101
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
101
+	 * @return Base Reference to this object for fluent calls
102 102
 	 */
103 103
 	public function setView( \Aimeos\MW\View\Iface $view )
104 104
 	{
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Common/Factory/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
 	 * @param string|null $name Name of the client implementation ("Standard" if null)
29 29
 	 * @return \Aimeos\Admin\JsonAdm\Iface Client Interface
30 30
 	 */
31
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null );
31
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null);
32 32
 }
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Common/Factory/Base.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,7 @@
 block discarded – undo
99 99
 				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] );
100 100
 				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
101 101
 			}
102
-		}
103
-		else
102
+		} else
104 103
 		{
105 104
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
106 105
 			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 * @param string $classname Full name of the class for which the object should be returned
32 32
 	 * @param \Aimeos\Admin\JsonAdm\Iface|null $client JSON API client object
33 33
 	 */
34
-	public static function injectClient( $classname, \Aimeos\Admin\JsonAdm\Iface $client = null )
34
+	public static function injectClient($classname, \Aimeos\Admin\JsonAdm\Iface $client = null)
35 35
 	{
36 36
 		self::$objects[$classname] = $client;
37 37
 	}
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
46 46
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
47 47
 	 */
48
-	protected static function addClientDecorators( \Aimeos\Admin\JsonAdm\Iface $client,
49
-		\Aimeos\MShop\Context\Item\Iface $context, $path )
48
+	protected static function addClientDecorators(\Aimeos\Admin\JsonAdm\Iface $client,
49
+		\Aimeos\MShop\Context\Item\Iface $context, $path)
50 50
 	{
51 51
 		$config = $context->getConfig();
52 52
 
@@ -72,38 +72,38 @@  discard block
 block discarded – undo
72 72
 		 * @since 2015.12
73 73
 		 * @category Developer
74 74
 		 */
75
-		$decorators = $config->get( 'admin/jsonadm/common/decorators/default', [] );
75
+		$decorators = $config->get('admin/jsonadm/common/decorators/default', []);
76 76
 
77
-		if( $path !== null && is_string( $path ) )
77
+		if ($path !== null && is_string($path))
78 78
 		{
79
-			$dpath = trim( $path, '/' );
80
-			$dpath = ( $dpath !== '' ? $dpath . '/' : $dpath );
79
+			$dpath = trim($path, '/');
80
+			$dpath = ($dpath !== '' ? $dpath . '/' : $dpath);
81 81
 
82
-			$excludes = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/excludes', [] );
83
-			$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
82
+			$excludes = $config->get('admin/jsonadm/' . $dpath . 'decorators/excludes', []);
83
+			$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
84 84
 
85
-			foreach( $decorators as $key => $name )
85
+			foreach ($decorators as $key => $name)
86 86
 			{
87
-				if( in_array( $name, $excludes ) ) {
88
-					unset( $decorators[$key] );
87
+				if (in_array($name, $excludes)) {
88
+					unset($decorators[$key]);
89 89
 				}
90 90
 			}
91 91
 
92 92
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
93
-			$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/global', [] );
94
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
93
+			$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/global', []);
94
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $path);
95 95
 
96
-			if( !empty( $path ) )
96
+			if (!empty($path))
97 97
 			{
98
-				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst( $localClass ) . '\\Decorator\\';
99
-				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] );
100
-				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
98
+				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst($localClass) . '\\Decorator\\';
99
+				$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/local', []);
100
+				$client = self::addDecorators($client, $decorators, $classprefix, $context, $path);
101 101
 			}
102 102
 		}
103 103
 		else
104 104
 		{
105 105
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
106
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $path );
106
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $path);
107 107
 		}
108 108
 
109 109
 		return $client;
@@ -120,26 +120,26 @@  discard block
 block discarded – undo
120 120
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
121 121
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
122 122
 	 */
123
-	protected static function addDecorators( \Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
124
-			\Aimeos\MShop\Context\Item\Iface $context, $path )
123
+	protected static function addDecorators(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
124
+			\Aimeos\MShop\Context\Item\Iface $context, $path)
125 125
 	{
126
-		foreach( $decorators as $name )
126
+		foreach ($decorators as $name)
127 127
 		{
128
-			if( ctype_alnum( $name ) === false )
128
+			if (ctype_alnum($name) === false)
129 129
 			{
130
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
131
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 );
130
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
131
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404);
132 132
 			}
133 133
 
134 134
 			$classname = $classprefix . $name;
135 135
 
136
-			if( class_exists( $classname ) === false ) {
137
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
136
+			if (class_exists($classname) === false) {
137
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
138 138
 			}
139 139
 
140
-			$client = new $classname( $client, $context, $path );
140
+			$client = new $classname($client, $context, $path);
141 141
 
142
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface', $client );
142
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface', $client);
143 143
 		}
144 144
 
145 145
 		return $client;
@@ -155,19 +155,19 @@  discard block
 block discarded – undo
155 155
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
156 156
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
157 157
 	 */
158
-	protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path )
158
+	protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path)
159 159
 	{
160
-		if( isset( self::$objects[$classname] ) ) {
160
+		if (isset(self::$objects[$classname])) {
161 161
 			return self::$objects[$classname];
162 162
 		}
163 163
 
164
-		if( class_exists( $classname ) === false ) {
165
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
164
+		if (class_exists($classname) === false) {
165
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
166 166
 		}
167 167
 
168
-		$client = new $classname( $context, $path );
168
+		$client = new $classname($context, $path);
169 169
 
170
-		\Aimeos\MW\Common\Base::checkClass( $interface, $client );
170
+		\Aimeos\MW\Common\Base::checkClass($interface, $client);
171 171
 
172 172
 		return $client;
173 173
 	}
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Factory.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
34 34
 	 * @param string $path Path describing the client to clear, e.g. "product/lists/type"
35 35
 	 */
36
-	static public function clear( $id = null, $path = null )
36
+	static public function clear($id = null, $path = null)
37 37
 	{
38
-		if( $id !== null )
38
+		if ($id !== null)
39 39
 		{
40
-			if( $path !== null ) {
40
+			if ($path !== null) {
41 41
 				self::$clients[$id][$path] = null;
42 42
 			} else {
43 43
 				self::$clients[$id] = [];
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
66 66
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
67 67
 	 */
68
-	static public function createClient( \Aimeos\MShop\Context\Item\Iface $context,
69
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
68
+	static public function createClient(\Aimeos\MShop\Context\Item\Iface $context,
69
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
70 70
 	{
71
-		$path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) );
71
+		$path = strtolower(trim($path, "/ \n\t\r\0\x0B"));
72 72
 		$id = (string) $context;
73 73
 
74
-		if( self::$cache === false || !isset( self::$clients[$id][$path] ) )
74
+		if (self::$cache === false || !isset(self::$clients[$id][$path]))
75 75
 		{
76
-			if( empty( $path ) ) {
77
-				self::$clients[$id][$path] = self::createClientRoot( $context, $aimeos, $path, $name );
76
+			if (empty($path)) {
77
+				self::$clients[$id][$path] = self::createClientRoot($context, $aimeos, $path, $name);
78 78
 			} else {
79
-				self::$clients[$id][$path] = self::createClientNew( $context, $aimeos, $path, $name );
79
+				self::$clients[$id][$path] = self::createClientNew($context, $aimeos, $path, $name);
80 80
 			}
81 81
 		}
82 82
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 * @param boolean $value True to enable caching, false to disable it.
91 91
 	 * @return boolean Previous cache setting
92 92
 	 */
93
-	static public function setCache( $value )
93
+	static public function setCache($value)
94 94
 	{
95 95
 		$old = self::$cache;
96 96
 		self::$cache = (boolean) $value;
@@ -109,53 +109,53 @@  discard block
 block discarded – undo
109 109
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
110 110
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
111 111
 	 */
112
-	protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context,
113
-		\Aimeos\Bootstrap $aimeos, $path, $name )
112
+	protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context,
113
+		\Aimeos\Bootstrap $aimeos, $path, $name)
114 114
 	{
115 115
 		$pname = $name;
116
-		$parts = explode( '/', $path );
116
+		$parts = explode('/', $path);
117 117
 
118
-		foreach( $parts as $key => $part )
118
+		foreach ($parts as $key => $part)
119 119
 		{
120
-			if( ctype_alnum( $part ) === false )
120
+			if (ctype_alnum($part) === false)
121 121
 			{
122
-				$msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path );
123
-				throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 );
122
+				$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
123
+				throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400);
124 124
 			}
125 125
 
126
-			$parts[$key] = ucwords( $part );
126
+			$parts[$key] = ucwords($part);
127 127
 		}
128 128
 
129
-		if( $pname === null ) {
130
-			$pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' );
129
+		if ($pname === null) {
130
+			$pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard');
131 131
 		}
132 132
 
133 133
 		$view = $context->getView();
134 134
 		$config = $context->getConfig();
135 135
 
136
-		if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) {
137
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) );
136
+		if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) {
137
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path));
138 138
 		}
139 139
 
140 140
 
141 141
 		$view = $context->getView();
142 142
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
143
-		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname;
143
+		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname;
144 144
 
145
-		if( ctype_alnum( $pname ) === false )
145
+		if (ctype_alnum($pname) === false)
146 146
 		{
147
-			$classname = is_string( $pname ) ? $classname : '<not a string>';
148
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
147
+			$classname = is_string($pname) ? $classname : '<not a string>';
148
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
149 149
 		}
150 150
 
151
-		if( class_exists( $classname ) === false ) {
152
-			return self::createClientRoot( $context, $aimeos, $path, $name );
151
+		if (class_exists($classname) === false) {
152
+			return self::createClientRoot($context, $aimeos, $path, $name);
153 153
 		}
154 154
 
155
-		$client = self::createClientBase( $classname, $iface, $context, $path );
156
-		$client = self::addClientDecorators( $client, $context, $path );
155
+		$client = self::createClientBase($classname, $iface, $context, $path);
156
+		$client = self::addClientDecorators($client, $context, $path);
157 157
 
158
-		return $client->setAimeos( $aimeos )->setView( $view );
158
+		return $client->setAimeos($aimeos)->setView($view);
159 159
 	}
160 160
 
161 161
 
@@ -169,8 +169,8 @@  discard block
 block discarded – undo
169 169
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
170 170
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
171 171
 	 */
172
-	protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context,
173
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
172
+	protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context,
173
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
174 174
 	{
175 175
 		/** admin/jsonadm/name
176 176
 		 * Class name of the used JSON API client implementation
@@ -205,21 +205,21 @@  discard block
 block discarded – undo
205 205
 		 * @since 2015.12
206 206
 		 * @category Developer
207 207
 		 */
208
-		if( $name === null ) {
209
-			$name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' );
208
+		if ($name === null) {
209
+			$name = $context->getConfig()->get('admin/jsonadm/name', 'Standard');
210 210
 		}
211 211
 
212
-		if( ctype_alnum( $name ) === false )
212
+		if (ctype_alnum($name) === false)
213 213
 		{
214
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
215
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
214
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
215
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
216 216
 		}
217 217
 
218 218
 		$view = $context->getView();
219 219
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
220 220
 		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
221 221
 
222
-		$client = self::createClientBase( $classname, $iface, $context, $path );
222
+		$client = self::createClientBase($classname, $iface, $context, $path);
223 223
 
224 224
 		/** admin/jsonadm/decorators/excludes
225 225
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -299,8 +299,8 @@  discard block
 block discarded – undo
299 299
 		 * @see admin/jsonadm/decorators/global
300 300
 		 */
301 301
 
302
-		$client = self::addClientDecorators( $client, $context, $path );
302
+		$client = self::addClientDecorators($client, $context, $path);
303 303
 
304
-		return $client->setAimeos( $aimeos )->setView( $view );
304
+		return $client->setAimeos($aimeos)->setView($view);
305 305
 	}
306 306
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Common/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,5 +26,5 @@
 block discarded – undo
26 26
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
27 27
 	 * @param string $path Name of the client separated by slashes, e.g "order/base"
28 28
 	 */
29
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, $path );
29
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, $path);
30 30
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Standard.php 2 patches
Braces   +19 added lines, -38 removed lines patch added patch discarded remove patch
@@ -39,24 +39,21 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
163 158
 			 */
164 159
 			$tplconf = 'admin/jsonadm/standard/template-aggregate';
165 160
 			$default = 'aggregate-standard.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
 block discarded – undo
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
 block discarded – undo
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(
@@ -440,16 +428,14 @@  discard block
 block discarded – undo
440 428
 			$view->attributes = $attributes;
441 429
 
442 430
 			$status = 200;
443
-		}
444
-		catch( \Aimeos\MShop\Exception $e )
431
+		} catch( \Aimeos\MShop\Exception $e )
445 432
 		{
446 433
 			$status = 404;
447 434
 			$view->errors = array( array(
448 435
 				'title' => $context->getI18n()->dt( 'mshop', $e->getMessage() ),
449 436
 				'detail' => $e->getTraceAsString(),
450 437
 			) );
451
-		}
452
-		catch( \Exception $e )
438
+		} catch( \Exception $e )
453 439
 		{
454 440
 			$status = 500;
455 441
 			$view->errors = array( array(
@@ -519,8 +505,7 @@  discard block
 block discarded – undo
519 505
 			$ids = $this->getIds( $payload );
520 506
 			$manager->deleteItems( $ids );
521 507
 			$view->total = count( $ids );
522
-		}
523
-		else
508
+		} else
524 509
 		{
525 510
 			$manager->deleteItem( $id );
526 511
 			$view->total = 1;
@@ -558,8 +543,7 @@  discard block
 block discarded – undo
558 543
 			$view->data = $manager->searchItems( $search, [], $total );
559 544
 			$view->childItems = $this->getChildItems( $view->data, $include );
560 545
 			$view->listItems = $this->getListItems( $view->data, $include );
561
-		}
562
-		else
546
+		} else
563 547
 		{
564 548
 			$view->data = $manager->getItem( $id, [] );
565 549
 			$view->childItems = $this->getChildItems( array( $id => $view->data ), $include );
@@ -599,16 +583,14 @@  discard block
 block discarded – undo
599 583
 			$view->data = $data;
600 584
 			$view->total = count( $data );
601 585
 			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
602
-		}
603
-		elseif( ( $id = $view->param( 'id' ) ) != null )
586
+		} elseif( ( $id = $view->param( 'id' ) ) != null )
604 587
 		{
605 588
 			$payload->data->id = $id;
606 589
 			$data = $this->saveEntry( $manager, $payload->data );
607 590
 
608 591
 			$view->data = $data;
609 592
 			$view->total = 1;
610
-		}
611
-		else
593
+		} else
612 594
 		{
613 595
 			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
614 596
 		}
@@ -647,8 +629,7 @@  discard block
 block discarded – undo
647 629
 			$view->data = $data;
648 630
 			$view->total = count( $data );
649 631
 			$response = $response->withHeader( 'Content-Type', 'application/vnd.api+json; ext="bulk"; supported-ext="bulk"' );
650
-		}
651
-		else
632
+		} else
652 633
 		{
653 634
 			$payload->data->id = null;
654 635
 			$data = $this->saveEntry( $manager, $payload->data );
Please login to merge, or discard this 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.