Completed
Push — master ( fe5b58...e0af17 )
by Aimeos
02:07
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/tests/Admin/JsonAdm/Supplier/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\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
 
@@ -65,23 +65,23 @@  discard block
 block discarded – undo
65 65
 			'sort' => 'supplier.id',
66 66
 			'include' => 'supplier/address'
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->assertEquals( 3, $result['meta']['total'] );
79
-		$this->assertEquals( 3, count( $result['data'] ) );
80
-		$this->assertEquals( 'supplier', $result['data'][0]['type'] );
81
-		$this->assertEquals( 2, count( $result['data'][0]['attributes'] ) );
82
-		$this->assertEquals( 1, count( $result['data'][0]['relationships']['supplier/address'] ) );
83
-		$this->assertEquals( 3, count( $result['included'] ) );
78
+		$this->assertEquals(3, $result['meta']['total']);
79
+		$this->assertEquals(3, count($result['data']));
80
+		$this->assertEquals('supplier', $result['data'][0]['type']);
81
+		$this->assertEquals(2, count($result['data'][0]['attributes']));
82
+		$this->assertEquals(1, count($result['data'][0]['relationships']['supplier/address']));
83
+		$this->assertEquals(3, 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/Base.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
32 32
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
33 33
 	 */
34
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, $path )
34
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, $path)
35 35
 	{
36 36
 		$this->context = $context;
37 37
 		$this->path = $path;
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 	 * @param array $param List of method parameter
46 46
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed
47 47
 	 */
48
-	public function __call( $name, array $param )
48
+	public function __call($name, array $param)
49 49
 	{
50
-		throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Unable to call method "%1$s"', $name ) );
50
+		throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Unable to call method "%1$s"', $name));
51 51
 	}
52 52
 
53 53
 
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 	 */
59 59
 	public function getAimeos()
60 60
 	{
61
-		if( !isset( $this->aimeos ) ) {
62
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Aimeos object not available' ) );
61
+		if (!isset($this->aimeos)) {
62
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Aimeos object not available'));
63 63
 		}
64 64
 
65 65
 		return $this->aimeos;
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
73 73
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
74 74
 	 */
75
-	public function setAimeos( \Aimeos\Bootstrap $aimeos )
75
+	public function setAimeos(\Aimeos\Bootstrap $aimeos)
76 76
 	{
77 77
 		$this->aimeos = $aimeos;
78 78
 		return $this;
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	public function getView()
88 88
 	{
89
-		if( !isset( $this->view ) ) {
90
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No view available' ) );
89
+		if (!isset($this->view)) {
90
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No view available'));
91 91
 		}
92 92
 
93 93
 		return $this->view;
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
101 101
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
102 102
 	 */
103
-	public function setView( \Aimeos\MW\View\Iface $view )
103
+	public function setView(\Aimeos\MW\View\Iface $view)
104 104
 	{
105 105
 		$this->view = $view;
106 106
 		return $this;
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @param array $include List of resource types that should be fetched
115 115
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
116 116
 	 */
117
-	protected function getChildItems( array $items, array $include )
117
+	protected function getChildItems(array $items, array $include)
118 118
 	{
119 119
 		return [];
120 120
 	}
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
138 138
 	 * @return array List of domain names
139 139
 	 */
140
-	protected function getDomains( \Aimeos\MW\View\Iface $view )
140
+	protected function getDomains(\Aimeos\MW\View\Iface $view)
141 141
 	{
142
-		if( ( $domains = $view->param( 'resource' ) ) == '' )
142
+		if (($domains = $view->param('resource')) == '')
143 143
 		{
144 144
 			/** admin/jsonadm/domains
145 145
 			 * A list of domain names whose clients are available for the JSON API
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 				'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media', 'order',
163 163
 				'plugin', 'price', 'product', 'service', 'supplier', 'stock', 'tag', 'text'
164 164
 			);
165
-			$domains = $this->getContext()->getConfig()->get( 'admin/jsonadm/domains', $default );
165
+			$domains = $this->getContext()->getConfig()->get('admin/jsonadm/domains', $default);
166 166
 		}
167 167
 
168 168
 		return (array) $domains;
@@ -175,15 +175,15 @@  discard block
 block discarded – undo
175 175
 	 * @param \stdClass $request Decoded request body
176 176
 	 * @return array List of item IDs
177 177
 	 */
178
-	protected function getIds( $request )
178
+	protected function getIds($request)
179 179
 	{
180 180
 		$ids = [];
181 181
 
182
-		if( isset( $request->data ) )
182
+		if (isset($request->data))
183 183
 		{
184
-			foreach( (array) $request->data as $entry )
184
+			foreach ((array) $request->data as $entry)
185 185
 			{
186
-				if( isset( $entry->id ) ) {
186
+				if (isset($entry->id)) {
187 187
 					$ids[] = $entry->id;
188 188
 				}
189 189
 			}
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 	 * @param array $include List of resource types that should be fetched
201 201
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
202 202
 	 */
203
-	protected function getListItems( array $items, array $include )
203
+	protected function getListItems(array $items, array $include)
204 204
 	{
205 205
 		return [];
206 206
 	}
@@ -223,23 +223,23 @@  discard block
 block discarded – undo
223 223
 	 * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
224 224
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
225 225
 	 */
226
-	protected function getRefItems( array $listItems )
226
+	protected function getRefItems(array $listItems)
227 227
 	{
228 228
 		$list = $map = [];
229 229
 		$context = $this->getContext();
230 230
 
231
-		foreach( $listItems as $listItem ) {
231
+		foreach ($listItems as $listItem) {
232 232
 			$map[$listItem->getDomain()][] = $listItem->getRefId();
233 233
 		}
234 234
 
235
-		foreach( $map as $domain => $ids )
235
+		foreach ($map as $domain => $ids)
236 236
 		{
237
-			$manager = \Aimeos\MShop\Factory::createManager( $context, $domain );
237
+			$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
238 238
 
239 239
 			$search = $manager->createSearch();
240
-			$search->setConditions( $search->compare( '==', $domain . '.id', $ids ) );
240
+			$search->setConditions($search->compare('==', $domain . '.id', $ids));
241 241
 
242
-			$list = array_merge( $list, $manager->searchItems( $search ) );
242
+			$list = array_merge($list, $manager->searchItems($search));
243 243
 		}
244 244
 
245 245
 		return $list;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
253 253
 	 * @return array List of domain names
254 254
 	 */
255
-	protected function getResources( \Aimeos\MW\View\Iface $view )
255
+	protected function getResources(\Aimeos\MW\View\Iface $view)
256 256
 	{
257 257
 		/** admin/jsonadm/resources
258 258
 		 * A list of additional resources name whose clients are available for the JSON API
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 		 * @category Developer
271 271
 		 * @see admin/jsonadm/domains
272 272
 		 */
273
-		return (array) $view->config( 'admin/jsonadm/resources', ['coupon/config', 'plugin/config', 'service/config'] );
273
+		return (array) $view->config('admin/jsonadm/resources', ['coupon/config', 'plugin/config', 'service/config']);
274 274
 	}
275 275
 
276 276
 
@@ -281,11 +281,11 @@  discard block
 block discarded – undo
281 281
 	 * @param array $params List of criteria data with condition, sorting and paging
282 282
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
283 283
 	 */
284
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params )
284
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params)
285 285
 	{
286
-		$this->initCriteriaConditions( $criteria, $params );
287
-		$this->initCriteriaSortations( $criteria, $params );
288
-		$this->initCriteriaSlice( $criteria, $params );
286
+		$this->initCriteriaConditions($criteria, $params);
287
+		$this->initCriteriaSortations($criteria, $params);
288
+		$this->initCriteriaSlice($criteria, $params);
289 289
 
290 290
 		return $criteria;
291 291
 	}
@@ -297,17 +297,17 @@  discard block
 block discarded – undo
297 297
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
298 298
 	 * @param array $params List of criteria data with condition, sorting and paging
299 299
 	 */
300
-	protected function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
300
+	protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
301 301
 	{
302
-		if( !isset( $params['filter'] ) ) {
302
+		if (!isset($params['filter'])) {
303 303
 			return;
304 304
 		}
305 305
 
306 306
 		$existing = $criteria->getConditions();
307
-		$criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) );
307
+		$criteria->setConditions($criteria->toConditions((array) $params['filter']));
308 308
 
309
-		$expr = array( $criteria->getConditions(), $existing );
310
-		$criteria->setConditions( $criteria->combine( '&&', $expr ) );
309
+		$expr = array($criteria->getConditions(), $existing);
310
+		$criteria->setConditions($criteria->combine('&&', $expr));
311 311
 	}
312 312
 
313 313
 
@@ -317,12 +317,12 @@  discard block
 block discarded – undo
317 317
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
318 318
 	 * @param array $params List of criteria data with condition, sorting and paging
319 319
 	 */
320
-	protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
320
+	protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
321 321
 	{
322
-		$start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 );
323
-		$size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 );
322
+		$start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0);
323
+		$size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25);
324 324
 
325
-		$criteria->setSlice( $start, $size );
325
+		$criteria->setSlice($start, $size);
326 326
 	}
327 327
 
328 328
 
@@ -332,24 +332,24 @@  discard block
 block discarded – undo
332 332
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
333 333
 	 * @param array $params List of criteria data with condition, sorting and paging
334 334
 	 */
335
-	protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
335
+	protected function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
336 336
 	{
337
-		if( !isset( $params['sort'] ) ) {
337
+		if (!isset($params['sort'])) {
338 338
 			return;
339 339
 		}
340 340
 
341 341
 		$sortation = [];
342 342
 
343
-		foreach( explode( ',', $params['sort'] ) as $sort )
343
+		foreach (explode(',', $params['sort']) as $sort)
344 344
 		{
345
-			if( $sort[0] === '-' ) {
346
-				$sortation[] = $criteria->sort( '-', substr( $sort, 1 ) );
345
+			if ($sort[0] === '-') {
346
+				$sortation[] = $criteria->sort('-', substr($sort, 1));
347 347
 			} else {
348
-				$sortation[] = $criteria->sort( '+', $sort );
348
+				$sortation[] = $criteria->sort('+', $sort);
349 349
 			}
350 350
 		}
351 351
 
352
-		$criteria->setSortations( $sortation );
352
+		$criteria->setSortations($sortation);
353 353
 	}
354 354
 
355 355
 
@@ -360,14 +360,14 @@  discard block
 block discarded – undo
360 360
 	 * @param \stdClass $request Object with request body data
361 361
 	 * @return array List of items
362 362
 	 */
363
-	protected function saveData( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request )
363
+	protected function saveData(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request)
364 364
 	{
365 365
 		$data = [];
366 366
 
367
-		if( isset( $request->data ) )
367
+		if (isset($request->data))
368 368
 		{
369
-			foreach( (array) $request->data as $entry ) {
370
-				$data[] = $this->saveEntry( $manager, $entry );
369
+			foreach ((array) $request->data as $entry) {
370
+				$data[] = $this->saveEntry($manager, $entry);
371 371
 			}
372 372
 		}
373 373
 
@@ -382,22 +382,22 @@  discard block
 block discarded – undo
382 382
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
383 383
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
384 384
 	 */
385
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
385
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
386 386
 	{
387
-		if( isset( $entry->id ) ) {
388
-			$item = $manager->getItem( $entry->id );
387
+		if (isset($entry->id)) {
388
+			$item = $manager->getItem($entry->id);
389 389
 		} else {
390 390
 			$item = $manager->createItem();
391 391
 		}
392 392
 
393
-		$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
394
-		$item = $manager->saveItem( $item );
393
+		$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
394
+		$item = $manager->saveItem($item);
395 395
 
396
-		if( isset( $entry->relationships ) ) {
397
-			$this->saveRelationships( $manager, $item, $entry->relationships );
396
+		if (isset($entry->relationships)) {
397
+			$this->saveRelationships($manager, $item, $entry->relationships);
398 398
 		}
399 399
 
400
-		return $manager->getItem( $item->getId() );
400
+		return $manager->getItem($item->getId());
401 401
 	}
402 402
 
403 403
 
@@ -408,28 +408,28 @@  discard block
 block discarded – undo
408 408
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Domain item with an unique ID set
409 409
 	 * @param \stdClass $relationships Object including the <domain>/data/attributes structure
410 410
 	 */
411
-	protected function saveRelationships( \Aimeos\MShop\Common\Manager\Iface $manager,
412
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships )
411
+	protected function saveRelationships(\Aimeos\MShop\Common\Manager\Iface $manager,
412
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships)
413 413
 	{
414 414
 		$id = $item->getId();
415
-		$listManager = $manager->getSubManager( 'lists' );
415
+		$listManager = $manager->getSubManager('lists');
416 416
 
417
-		foreach( (array) $relationships as $domain => $list )
417
+		foreach ((array) $relationships as $domain => $list)
418 418
 		{
419
-			if( isset( $list->data ) )
419
+			if (isset($list->data))
420 420
 			{
421
-				foreach( (array) $list->data as $data )
421
+				foreach ((array) $list->data as $data)
422 422
 				{
423
-					$listItem = $this->addItemData( $listManager, $listManager->createItem(), $data, $domain );
423
+					$listItem = $this->addItemData($listManager, $listManager->createItem(), $data, $domain);
424 424
 
425
-					if( isset( $data->id ) ) {
426
-						$listItem->setRefId( $data->id );
425
+					if (isset($data->id)) {
426
+						$listItem->setRefId($data->id);
427 427
 					}
428 428
 
429
-					$listItem->setParentId( $id );
430
-					$listItem->setDomain( $domain );
429
+					$listItem->setParentId($id);
430
+					$listItem->setDomain($domain);
431 431
 
432
-					$listManager->saveItem( $listItem, false );
432
+					$listManager->saveItem($listItem, false);
433 433
 				}
434 434
 			}
435 435
 		}
@@ -446,20 +446,20 @@  discard block
 block discarded – undo
446 446
 	 * @return \Aimeos\MShop\Common\Item\Iface Item including the data
447 447
 	 */
448 448
 	protected function addItemData(\Aimeos\MShop\Common\Manager\Iface $manager,
449
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain )
449
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain)
450 450
 	{
451
-		if( isset( $data->attributes ) )
451
+		if (isset($data->attributes))
452 452
 		{
453 453
 			$attr = (array) $data->attributes;
454
-			$key = str_replace( '/', '.', $item->getResourceType() );
454
+			$key = str_replace('/', '.', $item->getResourceType());
455 455
 
456
-			if( isset( $attr[$key.'.type'] ) )
456
+			if (isset($attr[$key . '.type']))
457 457
 			{
458
-				$typeItem = $manager->getSubManager( 'type' )->findItem( $attr[$key.'.type'], [], $domain );
459
-				$attr[$key.'.typeid'] = $typeItem->getId();
458
+				$typeItem = $manager->getSubManager('type')->findItem($attr[$key . '.type'], [], $domain);
459
+				$attr[$key . '.typeid'] = $typeItem->getId();
460 460
 			}
461 461
 
462
-			$item->fromArray( $attr );
462
+			$item->fromArray($attr);
463 463
 		}
464 464
 
465 465
 		return $item;
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 1 patch
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.
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 1 patch
Spacing   +37 added lines, -37 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,29 +120,29 @@  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 126
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface';
127 127
 
128
-		foreach( $decorators as $name )
128
+		foreach ($decorators as $name)
129 129
 		{
130
-			if( ctype_alnum( $name ) === false )
130
+			if (ctype_alnum($name) === false)
131 131
 			{
132
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
133
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 );
132
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
133
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404);
134 134
 			}
135 135
 
136 136
 			$classname = $classprefix . $name;
137 137
 
138
-			if( class_exists( $classname ) === false ) {
139
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
138
+			if (class_exists($classname) === false) {
139
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
140 140
 			}
141 141
 
142
-			$client = new $classname( $client, $context, $path );
142
+			$client = new $classname($client, $context, $path);
143 143
 
144
-			if( !( $client instanceof $iface ) ) {
145
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ), 404 );
144
+			if (!($client instanceof $iface)) {
145
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface), 404);
146 146
 			}
147 147
 		}
148 148
 
@@ -159,20 +159,20 @@  discard block
 block discarded – undo
159 159
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
160 160
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
161 161
 	 */
162
-	protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path )
162
+	protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, $path)
163 163
 	{
164
-		if( isset( self::$objects[$classname] ) ) {
164
+		if (isset(self::$objects[$classname])) {
165 165
 			return self::$objects[$classname];
166 166
 		}
167 167
 
168
-		if( class_exists( $classname ) === false ) {
169
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
168
+		if (class_exists($classname) === false) {
169
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
170 170
 		}
171 171
 
172
-		$client = new $classname( $context, $path );
172
+		$client = new $classname($context, $path);
173 173
 
174
-		if( !( $client instanceof $interface ) ) {
175
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $interface ), 500 );
174
+		if (!($client instanceof $interface)) {
175
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $interface), 500);
176 176
 		}
177 177
 
178 178
 		return $client;
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.