Completed
Push — master ( 911ad3...49a04a )
by Aimeos
01:52
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/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 createAdmin( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path )
158
+	protected static function createAdmin($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/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/tests/Admin/JsonAdm/Price/StandardTest.php 1 patch
Spacing   +16 added lines, -16 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\Price\Standard( $this->context, 'price' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Price\Standard($this->context, 'price');
25
+		$this->object->setAimeos(\TestHelperJadm::getAimeos());
26
+		$this->object->setView($this->view);
27 27
 	}
28 28
 
29 29
 
@@ -31,26 +31,26 @@  discard block
 block discarded – undo
31 31
 	{
32 32
 		$params = array(
33 33
 			'filter' => array(
34
-				'==' => array( 'price.value' => '12.95' )
34
+				'==' => array('price.value' => '12.95')
35 35
 			),
36 36
 			'include' => 'attribute'
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->assertGreaterThan( 1, $result['meta']['total'] );
49
-		$this->assertGreaterThan( 1, count( $result['data'] ) );
50
-		$this->assertEquals( 'price', $result['data'][0]['type'] );
51
-		$this->assertEquals( 0, count( $result['data'][0]['relationships'] ) );
52
-		$this->assertEquals( 0, count( $result['included'] ) );
48
+		$this->assertGreaterThan(1, $result['meta']['total']);
49
+		$this->assertGreaterThan(1, count($result['data']));
50
+		$this->assertEquals('price', $result['data'][0]['type']);
51
+		$this->assertEquals(0, count($result['data'][0]['relationships']));
52
+		$this->assertEquals(0, count($result['included']));
53 53
 
54
-		$this->assertArrayNotHasKey( 'errors', $result );
54
+		$this->assertArrayNotHasKey('errors', $result);
55 55
 	}
56 56
 }
57 57
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Media/StandardTest.php 1 patch
Spacing   +16 added lines, -16 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\Media\Standard( $this->context, 'media' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Media\Standard($this->context, 'media');
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( 'media.label' => 'prod_179x178/196_prod_179x178.jpg' )
34
+				'==' => array('media.label' => 'prod_179x178/196_prod_179x178.jpg')
35 35
 			),
36 36
 			'include' => 'attribute'
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( 'media', $result['data'][0]['type'] );
50
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['attribute'] ) );
51
-		$this->assertEquals( 1, count( $result['included'] ) );
47
+		$this->assertEquals(1, $result['meta']['total']);
48
+		$this->assertEquals(1, count($result['data']));
49
+		$this->assertEquals('media', $result['data'][0]['type']);
50
+		$this->assertEquals(1, count($result['data'][0]['relationships']['attribute']));
51
+		$this->assertEquals(1, count($result['included']));
52 52
 
53
-		$this->assertArrayNotHasKey( 'errors', $result );
53
+		$this->assertArrayNotHasKey('errors', $result);
54 54
 	}
55 55
 }
56 56
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Supplier/StandardTest.php 1 patch
Spacing   +31 added lines, -31 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\Supplier\Standard( $this->context, 'supplier' );
25
-		$this->object->setAimeos( \TestHelperJadm::getAimeos() );
26
-		$this->object->setView( $this->view );
24
+		$this->object = new \Aimeos\Admin\JsonAdm\Supplier\Standard($this->context, 'supplier');
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( 'supplier.code' => 'unitCode001' )
34
+				'==' => array('supplier.code' => 'unitCode001')
35 35
 			),
36 36
 			'include' => 'text,supplier/address'
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( 'supplier', $result['data'][0]['type'] );
51
-		$this->assertEquals( 3, count( $result['data'][0]['relationships']['text'] ) );
52
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
53
-		$this->assertEquals( 4, count( $result['included'] ) );
48
+		$this->assertEquals(1, $result['meta']['total']);
49
+		$this->assertEquals(1, count($result['data']));
50
+		$this->assertEquals('supplier', $result['data'][0]['type']);
51
+		$this->assertEquals(3, count($result['data'][0]['relationships']['text']));
52
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
53
+		$this->assertEquals(4, count($result['included']));
54 54
 
55
-		$this->assertArrayNotHasKey( 'errors', $result );
55
+		$this->assertArrayNotHasKey('errors', $result);
56 56
 	}
57 57
 
58 58
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	{
61 61
 		$params = array(
62 62
 			'filter' => array(
63
-				'=~' => array( 'supplier.code' => 'unitCode00' )
63
+				'=~' => array('supplier.code' => 'unitCode00')
64 64
 			),
65 65
 			'fields' => array(
66 66
 				'supplier' => 'supplier.id,supplier.label'
@@ -68,23 +68,23 @@  discard block
 block discarded – undo
68 68
 			'sort' => 'supplier.id',
69 69
 			'include' => 'supplier/address'
70 70
 		);
71
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
72
-		$this->view->addHelper( 'param', $helper );
71
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
72
+		$this->view->addHelper('param', $helper);
73 73
 
74
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
75
-		$result = json_decode( (string) $response->getBody(), true );
74
+		$response = $this->object->get($this->view->request(), $this->view->response());
75
+		$result = json_decode((string) $response->getBody(), true);
76 76
 
77 77
 
78
-		$this->assertEquals( 200, $response->getStatusCode() );
79
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
78
+		$this->assertEquals(200, $response->getStatusCode());
79
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
80 80
 
81
-		$this->assertEquals( 3, $result['meta']['total'] );
82
-		$this->assertEquals( 3, count( $result['data'] ) );
83
-		$this->assertEquals( 'supplier', $result['data'][0]['type'] );
84
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
85
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
86
-		$this->assertEquals( 3, count( $result['included'] ) );
81
+		$this->assertEquals(3, $result['meta']['total']);
82
+		$this->assertEquals(3, count($result['data']));
83
+		$this->assertEquals('supplier', $result['data'][0]['type']);
84
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
85
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
86
+		$this->assertEquals(3, count($result['included']));
87 87
 
88
-		$this->assertArrayNotHasKey( 'errors', $result );
88
+		$this->assertArrayNotHasKey('errors', $result);
89 89
 	}
90 90
 }
91 91
\ No newline at end of file
Please login to merge, or discard this patch.