Completed
Push — master ( 49a04a...2b6933 )
by Aimeos
01:40
created
admin/jsonadm/src/Admin/JsonAdm/Base.php 1 patch
Spacing   +76 added lines, -76 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::create( $context, $domain );
237
+			$manager = \Aimeos\MShop::create($context, $domain);
238 238
 
239 239
 			$search = $manager->createSearch();
240
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $domain ) . '.id', $ids ) );
240
+			$search->setConditions($search->compare('==', str_replace('/', '.', $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;
@@ -253,14 +253,14 @@  discard block
 block discarded – undo
253 253
 	 * @param array List of all available resources
254 254
 	 * @return array List of allowed resources
255 255
 	 */
256
-	protected function getAllowedResources( \Aimeos\MW\View\Iface $view, array $resources )
256
+	protected function getAllowedResources(\Aimeos\MW\View\Iface $view, array $resources)
257 257
 	{
258 258
 		$config = $this->getContext()->getConfig();
259 259
 		$allowed = [];
260 260
 
261
-		foreach( $resources as $resource )
261
+		foreach ($resources as $resource)
262 262
 		{
263
-			if( $view->access( $config->get( 'admin/jsonadm/resource/' . $resource . '/groups', [] ) ) === true ) {
263
+			if ($view->access($config->get('admin/jsonadm/resource/' . $resource . '/groups', [])) === true) {
264 264
 				$allowed[] = $resource;
265 265
 			}
266 266
 		}
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
276 276
 	 * @return array List of domain names
277 277
 	 */
278
-	protected function getResources( \Aimeos\MW\View\Iface $view )
278
+	protected function getResources(\Aimeos\MW\View\Iface $view)
279 279
 	{
280 280
 		/** admin/jsonadm/resources
281 281
 		 * A list of additional resources name whose clients are available for the JSON API
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		 * @category Developer
294 294
 		 * @see admin/jsonadm/domains
295 295
 		 */
296
-		return (array) $view->config( 'admin/jsonadm/resources', [
296
+		return (array) $view->config('admin/jsonadm/resources', [
297 297
 			'coupon/config', 'plugin/config', 'service/config',
298 298
 			'attribute/type', 'attribute/list/type', 'attribute/property/type',
299 299
 			'catalog/list/type',
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 			'service/type', 'service/list/type',
306 306
 			'supplier/list/type',
307 307
 			'text/type', 'text/list/type',
308
-		] );
308
+		]);
309 309
 	}
310 310
 
311 311
 
@@ -316,11 +316,11 @@  discard block
 block discarded – undo
316 316
 	 * @param array $params List of criteria data with condition, sorting and paging
317 317
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
318 318
 	 */
319
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params )
319
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params)
320 320
 	{
321
-		$this->initCriteriaConditions( $criteria, $params );
322
-		$this->initCriteriaSortations( $criteria, $params );
323
-		$this->initCriteriaSlice( $criteria, $params );
321
+		$this->initCriteriaConditions($criteria, $params);
322
+		$this->initCriteriaSortations($criteria, $params);
323
+		$this->initCriteriaSlice($criteria, $params);
324 324
 
325 325
 		return $criteria;
326 326
 	}
@@ -332,17 +332,17 @@  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 initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
335
+	protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
336 336
 	{
337
-		if( !isset( $params['filter'] ) ) {
337
+		if (!isset($params['filter'])) {
338 338
 			return;
339 339
 		}
340 340
 
341 341
 		$existing = $criteria->getConditions();
342
-		$criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) );
342
+		$criteria->setConditions($criteria->toConditions((array) $params['filter']));
343 343
 
344
-		$expr = array( $criteria->getConditions(), $existing );
345
-		$criteria->setConditions( $criteria->combine( '&&', $expr ) );
344
+		$expr = array($criteria->getConditions(), $existing);
345
+		$criteria->setConditions($criteria->combine('&&', $expr));
346 346
 	}
347 347
 
348 348
 
@@ -352,12 +352,12 @@  discard block
 block discarded – undo
352 352
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
353 353
 	 * @param array $params List of criteria data with condition, sorting and paging
354 354
 	 */
355
-	protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
355
+	protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
356 356
 	{
357
-		$start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 );
358
-		$size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 );
357
+		$start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0);
358
+		$size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25);
359 359
 
360
-		$criteria->setSlice( $start, $size );
360
+		$criteria->setSlice($start, $size);
361 361
 	}
362 362
 
363 363
 
@@ -367,24 +367,24 @@  discard block
 block discarded – undo
367 367
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
368 368
 	 * @param array $params List of criteria data with condition, sorting and paging
369 369
 	 */
370
-	protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
370
+	protected function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
371 371
 	{
372
-		if( !isset( $params['sort'] ) ) {
372
+		if (!isset($params['sort'])) {
373 373
 			return;
374 374
 		}
375 375
 
376 376
 		$sortation = [];
377 377
 
378
-		foreach( explode( ',', $params['sort'] ) as $sort )
378
+		foreach (explode(',', $params['sort']) as $sort)
379 379
 		{
380
-			if( $sort[0] === '-' ) {
381
-				$sortation[] = $criteria->sort( '-', substr( $sort, 1 ) );
380
+			if ($sort[0] === '-') {
381
+				$sortation[] = $criteria->sort('-', substr($sort, 1));
382 382
 			} else {
383
-				$sortation[] = $criteria->sort( '+', $sort );
383
+				$sortation[] = $criteria->sort('+', $sort);
384 384
 			}
385 385
 		}
386 386
 
387
-		$criteria->setSortations( $sortation );
387
+		$criteria->setSortations($sortation);
388 388
 	}
389 389
 
390 390
 
@@ -395,14 +395,14 @@  discard block
 block discarded – undo
395 395
 	 * @param \stdClass $request Object with request body data
396 396
 	 * @return array List of items
397 397
 	 */
398
-	protected function saveData( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request )
398
+	protected function saveData(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request)
399 399
 	{
400 400
 		$data = [];
401 401
 
402
-		if( isset( $request->data ) )
402
+		if (isset($request->data))
403 403
 		{
404
-			foreach( (array) $request->data as $entry ) {
405
-				$data[] = $this->saveEntry( $manager, $entry );
404
+			foreach ((array) $request->data as $entry) {
405
+				$data[] = $this->saveEntry($manager, $entry);
406 406
 			}
407 407
 		}
408 408
 
@@ -417,25 +417,25 @@  discard block
 block discarded – undo
417 417
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
418 418
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
419 419
 	 */
420
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
420
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
421 421
 	{
422
-		if( isset( $entry->id ) ) {
423
-			$item = $manager->getItem( $entry->id );
422
+		if (isset($entry->id)) {
423
+			$item = $manager->getItem($entry->id);
424 424
 		} else {
425 425
 			$item = $manager->createItem();
426 426
 		}
427 427
 
428
-		if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
429
-			$item = $item->fromArray( $attr );
428
+		if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
429
+			$item = $item->fromArray($attr);
430 430
 		}
431 431
 
432
-		$item = $manager->saveItem( $item );
432
+		$item = $manager->saveItem($item);
433 433
 
434
-		if( isset( $entry->relationships ) ) {
435
-			$this->saveRelationships( $manager, $item, $entry->relationships );
434
+		if (isset($entry->relationships)) {
435
+			$this->saveRelationships($manager, $item, $entry->relationships);
436 436
 		}
437 437
 
438
-		return $manager->getItem( $item->getId() );
438
+		return $manager->getItem($item->getId());
439 439
 	}
440 440
 
441 441
 
@@ -446,32 +446,32 @@  discard block
 block discarded – undo
446 446
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Domain item with an unique ID set
447 447
 	 * @param \stdClass $relationships Object including the <domain>/data/attributes structure
448 448
 	 */
449
-	protected function saveRelationships( \Aimeos\MShop\Common\Manager\Iface $manager,
450
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships )
449
+	protected function saveRelationships(\Aimeos\MShop\Common\Manager\Iface $manager,
450
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships)
451 451
 	{
452 452
 		$id = $item->getId();
453
-		$listManager = $manager->getSubManager( 'lists' );
453
+		$listManager = $manager->getSubManager('lists');
454 454
 
455
-		foreach( (array) $relationships as $domain => $list )
455
+		foreach ((array) $relationships as $domain => $list)
456 456
 		{
457
-			if( isset( $list->data ) )
457
+			if (isset($list->data))
458 458
 			{
459
-				foreach( (array) $list->data as $data )
459
+				foreach ((array) $list->data as $data)
460 460
 				{
461 461
 					$listItem = $listManager->createItem();
462 462
 
463
-					if( isset( $data->attributes ) && ( $attr = (array) $data->attributes ) ) {
464
-						$item = $item->fromArray( $attr );
463
+					if (isset($data->attributes) && ($attr = (array) $data->attributes)) {
464
+						$item = $item->fromArray($attr);
465 465
 					}
466 466
 
467
-					if( isset( $data->id ) ) {
468
-						$listItem->setRefId( $data->id );
467
+					if (isset($data->id)) {
468
+						$listItem->setRefId($data->id);
469 469
 					}
470 470
 
471
-					$listItem->setParentId( $id );
472
-					$listItem->setDomain( $domain );
471
+					$listItem->setParentId($id);
472
+					$listItem->setDomain($domain);
473 473
 
474
-					$listManager->saveItem( $listItem, false );
474
+					$listManager->saveItem($listItem, false);
475 475
 				}
476 476
 			}
477 477
 		}
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Coupon/Config/Standard.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -110,30 +110,30 @@  discard block
 block discarded – undo
110 110
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
111 111
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
112 112
 	 */
113
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
113
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
114 114
 	{
115 115
 		$view = $this->getView();
116 116
 
117 117
 		try
118 118
 		{
119
-			$response = $this->getItems( $view, $request, $response );
119
+			$response = $this->getItems($view, $request, $response);
120 120
 			$status = 200;
121 121
 		}
122
-		catch( \Aimeos\MShop\Exception $e )
122
+		catch (\Aimeos\MShop\Exception $e)
123 123
 		{
124 124
 			$status = 404;
125
-			$view->errors = array( array(
126
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
125
+			$view->errors = array(array(
126
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
127 127
 				'detail' => $e->getTraceAsString(),
128
-			) );
128
+			));
129 129
 		}
130
-		catch( \Exception $e )
130
+		catch (\Exception $e)
131 131
 		{
132 132
 			$status = 500;
133
-			$view->errors = array( array(
133
+			$view->errors = array(array(
134 134
 				'title' => $e->getMessage(),
135 135
 				'detail' => $e->getTraceAsString(),
136
-			) );
136
+			));
137 137
 		}
138 138
 
139 139
 		/** admin/jsonadm/coupon/config/template-get
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
158 158
 		$tplconf = 'admin/jsonadm/coupon/config/template-get';
159 159
 		$default = 'config-standard';
160 160
 
161
-		$body = $view->render( $view->config( $tplconf, $default ) );
161
+		$body = $view->render($view->config($tplconf, $default));
162 162
 
163
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
164
-			->withBody( $view->response()->createStreamFromString( $body ) )
165
-			->withStatus( $status );
163
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
164
+			->withBody($view->response()->createStreamFromString($body))
165
+			->withStatus($status);
166 166
 	}
167 167
 
168 168
 
@@ -174,18 +174,18 @@  discard block
 block discarded – undo
174 174
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
175 175
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
176 176
 	 */
177
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
177
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
178 178
 	{
179
-		if( ( $id = $view->param( 'id' ) ) == null ) {
180
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
179
+		if (($id = $view->param('id')) == null) {
180
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
181 181
 		}
182 182
 
183
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'coupon' );
183
+		$manager = \Aimeos\MShop::create($this->getContext(), 'coupon');
184 184
 
185 185
 		$item = $manager->createItem();
186
-		$item->setProvider( $id );
186
+		$item->setProvider($id);
187 187
 
188
-		$view->configItems = $manager->getProvider( $item, null )->getConfigBE();
188
+		$view->configItems = $manager->getProvider($item, null)->getConfigBE();
189 189
 
190 190
 		return $response;
191 191
 	}
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Coupon/Standard.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -107,20 +107,20 @@
 block discarded – undo
107 107
 	 * @param array $include List of resource types that should be fetched
108 108
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
109 109
 	 */
110
-	protected function getChildItems( array $items, array $include )
110
+	protected function getChildItems(array $items, array $include)
111 111
 	{
112 112
 		$list = [];
113
-		$ids = array_keys( $items );
114
-		$include = array_intersect( $include, array( 'coupon/code' ) );
113
+		$ids = array_keys($items);
114
+		$include = array_intersect($include, array('coupon/code'));
115 115
 
116
-		foreach( $include as $type )
116
+		foreach ($include as $type)
117 117
 		{
118
-			$manager = \Aimeos\MShop::create( $this->getContext(), $type );
118
+			$manager = \Aimeos\MShop::create($this->getContext(), $type);
119 119
 
120 120
 			$search = $manager->createSearch();
121
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $ids ) );
121
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $ids));
122 122
 
123
-			$list = array_merge( $list, $manager->searchItems( $search ) );
123
+			$list = array_merge($list, $manager->searchItems($search));
124 124
 		}
125 125
 
126 126
 		return $list;
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/FactoryTest.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
 		$context = \TestHelperJadm::getContext();
17 17
 		$aimeos = \TestHelperJadm::getAimeos();
18 18
 
19
-		$client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
20
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
21
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client );
19
+		$client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
20
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
21
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client);
22 22
 	}
23 23
 
24 24
 
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 		$context = \TestHelperJadm::getContext();
28 28
 		$aimeos = \TestHelperJadm::getAimeos();
29 29
 
30
-		$client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' );
31
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
32
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client );
30
+		$client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base');
31
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
32
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client);
33 33
 	}
34 34
 
35 35
 
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 		$context = \TestHelperJadm::getContext();
39 39
 		$aimeos = \TestHelperJadm::getAimeos();
40 40
 
41
-		$client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'stock/type' );
42
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
43
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
41
+		$client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'stock/type');
42
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
43
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
44 44
 	}
45 45
 
46 46
 
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 		$context = \TestHelperJadm::getContext();
50 50
 		$aimeos = \TestHelperJadm::getAimeos();
51 51
 
52
-		$client = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, '' );
53
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
54
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
52
+		$client = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, '');
53
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
54
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
55 55
 	}
56 56
 
57 57
 
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 		$context = \TestHelperJadm::getContext();
61 61
 		$aimeos = \TestHelperJadm::getAimeos();
62 62
 
63
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
64
-		\Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, '%^' );
63
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
64
+		\Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, '%^');
65 65
 	}
66 66
 
67 67
 
@@ -70,68 +70,68 @@  discard block
 block discarded – undo
70 70
 		$context = \TestHelperJadm::getContext();
71 71
 		$aimeos = \TestHelperJadm::getAimeos();
72 72
 
73
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
74
-		\Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, '', '%^' );
73
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
74
+		\Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, '', '%^');
75 75
 	}
76 76
 
77 77
 
78 78
 	public function testClear()
79 79
 	{
80
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
80
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
81 81
 
82 82
 		$context = \TestHelperJadm::getContext();
83 83
 		$aimeos = \TestHelperJadm::getAimeos();
84 84
 
85
-		$client1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
85
+		$client1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
86 86
 		\Aimeos\Admin\JsonAdm\Factory::clear();
87
-		$client2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
87
+		$client2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
88 88
 
89
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
89
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
90 90
 
91
-		$this->assertNotSame( $client1, $client2 );
91
+		$this->assertNotSame($client1, $client2);
92 92
 	}
93 93
 
94 94
 
95 95
 	public function testClearSite()
96 96
 	{
97
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
97
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
98 98
 
99 99
 		$context = \TestHelperJadm::getContext();
100 100
 		$aimeos = \TestHelperJadm::getAimeos();
101 101
 
102
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
103
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' );
104
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context );
102
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
103
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base');
104
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context);
105 105
 
106
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
107
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' );
106
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
107
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base');
108 108
 
109
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
109
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
110 110
 
111
-		$this->assertNotSame( $cntlA1, $cntlA2 );
112
-		$this->assertNotSame( $cntlB1, $cntlB2 );
111
+		$this->assertNotSame($cntlA1, $cntlA2);
112
+		$this->assertNotSame($cntlB1, $cntlB2);
113 113
 	}
114 114
 
115 115
 
116 116
 	public function testClearSpecific()
117 117
 	{
118
-		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true );
118
+		$cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true);
119 119
 
120 120
 		$context = \TestHelperJadm::getContext();
121 121
 		$aimeos = \TestHelperJadm::getAimeos();
122 122
 
123
-		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
124
-		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' );
123
+		$cntlA1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
124
+		$cntlB1 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base');
125 125
 
126
-		\Aimeos\Admin\JsonAdm\Factory::clear( (string) $context, 'order' );
126
+		\Aimeos\Admin\JsonAdm\Factory::clear((string) $context, 'order');
127 127
 
128
-		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order' );
129
-		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create( $context, $aimeos, 'order/base' );
128
+		$cntlA2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order');
129
+		$cntlB2 = \Aimeos\Admin\JsonAdm\Factory::create($context, $aimeos, 'order/base');
130 130
 
131
-		\Aimeos\Admin\JsonAdm\Factory::setCache( $cache );
131
+		\Aimeos\Admin\JsonAdm\Factory::setCache($cache);
132 132
 
133
-		$this->assertNotSame( $cntlA1, $cntlA2 );
134
-		$this->assertSame( $cntlB1, $cntlB2 );
133
+		$this->assertNotSame($cntlA1, $cntlA2);
134
+		$this->assertSame($cntlB1, $cntlB2);
135 135
 	}
136 136
 
137 137
 }
138 138
\ No newline at end of file
Please login to merge, or discard this patch.
admin/jsonadm/tests/Admin/JsonAdm/Common/Factory/BaseTest.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -21,29 +21,29 @@  discard block
 block discarded – undo
21 21
 		$this->context = \TestHelperJadm::getContext();
22 22
 		$this->view = $this->context->getView();
23 23
 
24
-		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' );
24
+		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], '');
25 25
 
26
-		$this->object = $this->getMockBuilder( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class )
26
+		$this->object = $this->getMockBuilder(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class)
27 27
 			->getMockForAbstractClass();
28 28
 	}
29 29
 
30 30
 
31 31
 	public function testinjectClient()
32 32
 	{
33
-		$this->object->injectClient( 'test', $this->client );
33
+		$this->object->injectClient('test', $this->client);
34 34
 	}
35 35
 
36 36
 
37 37
 	public function testAddClientDecorators()
38 38
 	{
39 39
 		$config = $this->context->getConfig();
40
-		$config->set( 'client/jsonapi/common/decorators/default', ['Test'] );
41
-		$config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] );
40
+		$config->set('client/jsonapi/common/decorators/default', ['Test']);
41
+		$config->set('client/jsonapi/product/decorators/excludes', ['Test']);
42 42
 
43 43
 		$params = [$this->client, $this->context, $this->view, [], 'product'];
44
-		$result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params );
44
+		$result = $this->access('addClientDecorators')->invokeArgs($this->object, $params);
45 45
 
46
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
46
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
47 47
 	}
48 48
 
49 49
 
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
53 53
 		$params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], ''];
54 54
 
55
-		$result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
55
+		$result = $this->access('addDecorators')->invokeArgs($this->object, $params);
56 56
 
57
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
57
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
58 58
 	}
59 59
 
60 60
 
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
64 64
 		$params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], ''];
65 65
 
66
-		$this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class );
67
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
66
+		$this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class);
67
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
68 68
 	}
69 69
 
70 70
 
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
74 74
 		$params = [$this->client, [''], $prefix, $this->context, $this->view, [], ''];
75 75
 
76
-		$this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class );
77
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
76
+		$this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class);
77
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
78 78
 	}
79 79
 
80 80
 
@@ -84,9 +84,9 @@  discard block
 block discarded – undo
84 84
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
85 85
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
86 86
 
87
-		$result = $this->access( 'createAdmin' )->invokeArgs( $this->object, $params );
87
+		$result = $this->access('createAdmin')->invokeArgs($this->object, $params);
88 88
 
89
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
89
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
90 90
 	}
91 91
 
92 92
 
@@ -95,10 +95,10 @@  discard block
 block discarded – undo
95 95
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
96 96
 		$params = ['test', $iface, $this->context, $this->view, [], ''];
97 97
 
98
-		$this->object->injectClient( 'test', $this->client );
99
-		$result = $this->access( 'createAdmin' )->invokeArgs( $this->object, $params );
98
+		$this->object->injectClient('test', $this->client);
99
+		$result = $this->access('createAdmin')->invokeArgs($this->object, $params);
100 100
 
101
-		$this->assertSame( $this->client, $result );
101
+		$this->assertSame($this->client, $result);
102 102
 	}
103 103
 
104 104
 
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
108 108
 		$params = ['invalid', $iface, $this->context, $this->view, [], ''];
109 109
 
110
-		$this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class );
111
-		$this->access( 'createAdmin' )->invokeArgs( $this->object, $params );
110
+		$this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class);
111
+		$this->access('createAdmin')->invokeArgs($this->object, $params);
112 112
 	}
113 113
 
114 114
 
@@ -118,16 +118,16 @@  discard block
 block discarded – undo
118 118
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
119 119
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
120 120
 
121
-		$this->setExpectedException( \Aimeos\MW\Common\Exception::class );
122
-		$this->access( 'createAdmin' )->invokeArgs( $this->object, $params );
121
+		$this->setExpectedException(\Aimeos\MW\Common\Exception::class);
122
+		$this->access('createAdmin')->invokeArgs($this->object, $params);
123 123
 	}
124 124
 
125 125
 
126
-	protected function access( $name )
126
+	protected function access($name)
127 127
 	{
128
-		$class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class );
129
-		$method = $class->getMethod( $name );
130
-		$method->setAccessible( true );
128
+		$class = new \ReflectionClass(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class);
129
+		$method = $class->getMethod($name);
130
+		$method->setAccessible(true);
131 131
 
132 132
 		return $method;
133 133
 	}
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Factory.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
33 33
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
34 34
 	 */
35
-	static public function create( \Aimeos\MShop\Context\Item\Iface $context,
36
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
35
+	static public function create(\Aimeos\MShop\Context\Item\Iface $context,
36
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
37 37
 	{
38
-		return parent::create( $context, $aimeos, $path, $name );
38
+		return parent::create($context, $aimeos, $path, $name);
39 39
 	}
40 40
 
41 41
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	 * @param boolean $value True to enable caching, false to disable it.
46 46
 	 * @return boolean Previous cache setting
47 47
 	 */
48
-	static public function setCache( $value )
48
+	static public function setCache($value)
49 49
 	{
50
-		return self::cache( $value );
50
+		return self::cache($value);
51 51
 	}
52 52
 }
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 create( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $path, $name = null );
31
+	public static function create(\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   +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.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @param boolean $value True to enable caching, false to disable it.
30 30
 	 * @return boolean Previous cache setting
31 31
 	 */
32
-	static public function cache( $value )
32
+	static public function cache($value)
33 33
 	{
34 34
 		$old = self::$cache;
35 35
 		self::$cache = (boolean) $value;
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
47 47
 	 * @param string $path Path describing the client to clear, e.g. "product/lists/type"
48 48
 	 */
49
-	static public function clear( $id = null, $path = null )
49
+	static public function clear($id = null, $path = null)
50 50
 	{
51
-		if( $id !== null )
51
+		if ($id !== null)
52 52
 		{
53
-			if( $path !== null ) {
53
+			if ($path !== null) {
54 54
 				self::$clients[$id][$path] = null;
55 55
 			} else {
56 56
 				self::$clients[$id] = [];
@@ -78,18 +78,18 @@  discard block
 block discarded – undo
78 78
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
79 79
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
80 80
 	 */
81
-	static public function create( \Aimeos\MShop\Context\Item\Iface $context,
82
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
81
+	static public function create(\Aimeos\MShop\Context\Item\Iface $context,
82
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
83 83
 	{
84
-		$path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) );
84
+		$path = strtolower(trim($path, "/ \n\t\r\0\x0B"));
85 85
 		$id = (string) $context;
86 86
 
87
-		if( self::$cache === false || !isset( self::$clients[$id][$path] ) )
87
+		if (self::$cache === false || !isset(self::$clients[$id][$path]))
88 88
 		{
89
-			if( empty( $path ) ) {
90
-				self::$clients[$id][$path] = self::createRoot( $context, $aimeos, $path, $name );
89
+			if (empty($path)) {
90
+				self::$clients[$id][$path] = self::createRoot($context, $aimeos, $path, $name);
91 91
 			} else {
92
-				self::$clients[$id][$path] = self::createNew( $context, $aimeos, $path, $name );
92
+				self::$clients[$id][$path] = self::createNew($context, $aimeos, $path, $name);
93 93
 			}
94 94
 		}
95 95
 
@@ -107,53 +107,53 @@  discard block
 block discarded – undo
107 107
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
108 108
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
109 109
 	 */
110
-	protected static function createNew( \Aimeos\MShop\Context\Item\Iface $context,
111
-		\Aimeos\Bootstrap $aimeos, $path, $name )
110
+	protected static function createNew(\Aimeos\MShop\Context\Item\Iface $context,
111
+		\Aimeos\Bootstrap $aimeos, $path, $name)
112 112
 	{
113 113
 		$pname = $name;
114
-		$parts = explode( '/', $path );
114
+		$parts = explode('/', $path);
115 115
 
116
-		foreach( $parts as $key => $part )
116
+		foreach ($parts as $key => $part)
117 117
 		{
118
-			if( ctype_alnum( $part ) === false )
118
+			if (ctype_alnum($part) === false)
119 119
 			{
120
-				$msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path );
121
-				throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 );
120
+				$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
121
+				throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400);
122 122
 			}
123 123
 
124
-			$parts[$key] = ucwords( $part );
124
+			$parts[$key] = ucwords($part);
125 125
 		}
126 126
 
127
-		if( $pname === null ) {
128
-			$pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' );
127
+		if ($pname === null) {
128
+			$pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard');
129 129
 		}
130 130
 
131 131
 		$view = $context->getView();
132 132
 		$config = $context->getConfig();
133 133
 
134
-		if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) {
135
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) );
134
+		if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) {
135
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path));
136 136
 		}
137 137
 
138 138
 
139 139
 		$view = $context->getView();
140 140
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
141
-		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname;
141
+		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname;
142 142
 
143
-		if( ctype_alnum( $pname ) === false )
143
+		if (ctype_alnum($pname) === false)
144 144
 		{
145
-			$classname = is_string( $pname ) ? $classname : '<not a string>';
146
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
145
+			$classname = is_string($pname) ? $classname : '<not a string>';
146
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
147 147
 		}
148 148
 
149
-		if( class_exists( $classname ) === false ) {
150
-			return self::createRoot( $context, $aimeos, $path, $name );
149
+		if (class_exists($classname) === false) {
150
+			return self::createRoot($context, $aimeos, $path, $name);
151 151
 		}
152 152
 
153
-		$client = self::createAdmin( $classname, $iface, $context, $path );
154
-		$client = self::addClientDecorators( $client, $context, $path );
153
+		$client = self::createAdmin($classname, $iface, $context, $path);
154
+		$client = self::addClientDecorators($client, $context, $path);
155 155
 
156
-		return $client->setAimeos( $aimeos )->setView( $view );
156
+		return $client->setAimeos($aimeos)->setView($view);
157 157
 	}
158 158
 
159 159
 
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
168 168
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
169 169
 	 */
170
-	protected static function createRoot( \Aimeos\MShop\Context\Item\Iface $context,
171
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
170
+	protected static function createRoot(\Aimeos\MShop\Context\Item\Iface $context,
171
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
172 172
 	{
173 173
 		/** admin/jsonadm/name
174 174
 		 * Class name of the used JSON API client implementation
@@ -203,21 +203,21 @@  discard block
 block discarded – undo
203 203
 		 * @since 2015.12
204 204
 		 * @category Developer
205 205
 		 */
206
-		if( $name === null ) {
207
-			$name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' );
206
+		if ($name === null) {
207
+			$name = $context->getConfig()->get('admin/jsonadm/name', 'Standard');
208 208
 		}
209 209
 
210
-		if( ctype_alnum( $name ) === false )
210
+		if (ctype_alnum($name) === false)
211 211
 		{
212
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
213
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
212
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
213
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
214 214
 		}
215 215
 
216 216
 		$view = $context->getView();
217 217
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
218 218
 		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
219 219
 
220
-		$client = self::createAdmin( $classname, $iface, $context, $path );
220
+		$client = self::createAdmin($classname, $iface, $context, $path);
221 221
 
222 222
 		/** admin/jsonadm/decorators/excludes
223 223
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -297,8 +297,8 @@  discard block
 block discarded – undo
297 297
 		 * @see admin/jsonadm/decorators/global
298 298
 		 */
299 299
 
300
-		$client = self::addClientDecorators( $client, $context, $path );
300
+		$client = self::addClientDecorators($client, $context, $path);
301 301
 
302
-		return $client->setAimeos( $aimeos )->setView( $view );
302
+		return $client->setAimeos($aimeos)->setView($view);
303 303
 	}
304 304
 }
Please login to merge, or discard this patch.