Completed
Push — master ( c8a9f6...8238b8 )
by Aimeos
01:39
created
admin/jsonadm/src/Admin/JsonAdm/Base.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * Sets the Aimeos bootstrap object
71 71
 	 *
72 72
 	 * @param \Aimeos\Bootstrap $aimeos The Aimeos bootstrap object
73
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
73
+	 * @return Base Reference to this object for fluent calls
74 74
 	 */
75 75
 	public function setAimeos( \Aimeos\Bootstrap $aimeos )
76 76
 	{
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * Sets the view object that will generate the admin output.
99 99
 	 *
100 100
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
101
-	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
101
+	 * @return Base Reference to this object for fluent calls
102 102
 	 */
103 103
 	public function setView( \Aimeos\MW\View\Iface $view )
104 104
 	{
Please login to merge, or discard this patch.
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\Factory::createManager( $context, $domain );
237
+			$manager = \Aimeos\MShop\Factory::createManager($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/Locale/Site/Standard.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  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
 		/** admin/jsonadm/partials/locale/site/template-data
116 116
 		 * Relative path to the data partial template file for the locale site  client
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 		 * @since 2016.07
128 128
 		 * @category Developer
129 129
 		 */
130
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/locale/site/template-data' ) );
130
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/locale/site/template-data'));
131 131
 
132
-		return parent::get( $request, $response );
132
+		return parent::get($request, $response);
133 133
 	}
134 134
 
135 135
 
@@ -141,16 +141,16 @@  discard block
 block discarded – undo
141 141
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
142 142
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
143 143
 	 */
144
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
144
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
145 145
 	{
146
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale/site' );
147
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
146
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale/site');
147
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
148 148
 		$total = 1;
149 149
 
150
-		if( ( $id = $view->param( 'id' ) ) == null ) {
151
-			$view->data = $manager->searchItems( $search, [], $total );
150
+		if (($id = $view->param('id')) == null) {
151
+			$view->data = $manager->searchItems($search, [], $total);
152 152
 		} else {
153
-			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search );
153
+			$view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search);
154 154
 		}
155 155
 
156 156
 		$view->childItems = [];
@@ -169,33 +169,33 @@  discard block
 block discarded – undo
169 169
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
170 170
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
171 171
 	 */
172
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
172
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
173 173
 	{
174
-		if( isset( $entry->id ) )
174
+		if (isset($entry->id))
175 175
 		{
176
-			$item = $manager->getItem( $entry->id );
176
+			$item = $manager->getItem($entry->id);
177 177
 
178
-			if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
179
-				$item = $item->fromArray( $attr );
178
+			if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
179
+				$item = $item->fromArray($attr);
180 180
 			}
181 181
 
182
-			$item = $manager->saveItem( $item );
182
+			$item = $manager->saveItem($item);
183 183
 		}
184 184
 		else
185 185
 		{
186 186
 			$item = $manager->createItem();
187 187
 
188
-			if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
189
-				$item = $item->fromArray( $attr );
188
+			if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
189
+				$item = $item->fromArray($attr);
190 190
 			}
191 191
 
192
-			$manager->insertItem( $item );
192
+			$manager->insertItem($item);
193 193
 		}
194 194
 
195
-		if( isset( $entry->relationships ) ) {
196
-			$this->saveRelationships( $manager, $item, $entry->relationships );
195
+		if (isset($entry->relationships)) {
196
+			$this->saveRelationships($manager, $item, $entry->relationships);
197 197
 		}
198 198
 
199
-		return $manager->getItem( $item->getId() );
199
+		return $manager->getItem($item->getId());
200 200
 	}
201 201
 }
Please login to merge, or discard this patch.
admin/jsonadm/src/Admin/JsonAdm/Catalog/Standard.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  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
 		/** admin/jsonadm/partials/catalog/template-data
116 116
 		 * Relative path to the data partial template file for the catalog client
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 		 * @since 2016.07
128 128
 		 * @category Developer
129 129
 		 */
130
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) );
130
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data'));
131 131
 
132
-		return parent::get( $request, $response );
132
+		return parent::get($request, $response);
133 133
 	}
134 134
 
135 135
 
@@ -140,14 +140,14 @@  discard block
 block discarded – undo
140 140
 	 * @param array $include List of resource types that should be fetched
141 141
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
142 142
 	 */
143
-	protected function getChildItems( array $items, array $include )
143
+	protected function getChildItems(array $items, array $include)
144 144
 	{
145 145
 		$list = [];
146 146
 
147
-		if( in_array( 'catalog', $include ) )
147
+		if (in_array('catalog', $include))
148 148
 		{
149
-			foreach( $items as $item ) {
150
-				$list = array_merge( $list, [$item], $this->getChildItems( $item->getChildren(), $include ) );
149
+			foreach ($items as $item) {
150
+				$list = array_merge($list, [$item], $this->getChildItems($item->getChildren(), $include));
151 151
 			}
152 152
 		}
153 153
 
@@ -162,40 +162,40 @@  discard block
 block discarded – undo
162 162
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
163 163
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
164 164
 	 */
165
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
165
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
166 166
 	{
167
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' );
167
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
168 168
 
169
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
169
+		if (($key = $view->param('aggregate')) !== null)
170 170
 		{
171
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
172
-			$view->data = $manager->aggregate( $search, $key );
171
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
172
+			$view->data = $manager->aggregate($search, $key);
173 173
 			return $response;
174 174
 		}
175 175
 
176
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
177
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
176
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
177
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
178 178
 		$total = 1;
179 179
 
180
-		if( ( $id = $view->param( 'id' ) ) == null )
180
+		if (($id = $view->param('id')) == null)
181 181
 		{
182
-			$view->data = $manager->searchItems( $search, [], $total );
183
-			$view->listItems = $this->getListItems( $view->data, $include );
182
+			$view->data = $manager->searchItems($search, [], $total);
183
+			$view->listItems = $this->getListItems($view->data, $include);
184 184
 			$view->childItems = [];
185 185
 		}
186 186
 		else
187 187
 		{
188 188
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
189
-			if( in_array( 'catalog', $include ) ) {
189
+			if (in_array('catalog', $include)) {
190 190
 				$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
191 191
 			}
192 192
 
193
-			$view->data = $manager->getTree( $id, $include, $level, $search );
194
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
195
-			$view->childItems = $this->getChildItems( $view->data->getChildren(), $include );
193
+			$view->data = $manager->getTree($id, $include, $level, $search);
194
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
195
+			$view->childItems = $this->getChildItems($view->data->getChildren(), $include);
196 196
 		}
197 197
 
198
-		$view->refItems = $this->getRefItems( $view->listItems );
198
+		$view->refItems = $this->getRefItems($view->listItems);
199 199
 		$view->total = $total;
200 200
 
201 201
 		return $response;
@@ -209,18 +209,18 @@  discard block
 block discarded – undo
209 209
 	 * @param array $include List of resource types that should be fetched
210 210
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
211 211
 	 */
212
-	protected function getListItems( array $items, array $include )
212
+	protected function getListItems(array $items, array $include)
213 213
 	{
214
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
214
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
215 215
 
216 216
 		$search = $manager->createSearch();
217 217
 		$expr = array(
218
-			$search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ),
219
-			$search->compare( '==', 'catalog.lists.domain', $include ),
218
+			$search->compare('==', 'catalog.lists.parentid', array_keys($items)),
219
+			$search->compare('==', 'catalog.lists.domain', $include),
220 220
 		);
221
-		$search->setConditions( $search->combine( '&&', $expr ) );
221
+		$search->setConditions($search->combine('&&', $expr));
222 222
 
223
-		return $manager->searchItems( $search );
223
+		return $manager->searchItems($search);
224 224
 	}
225 225
 
226 226
 
@@ -231,40 +231,40 @@  discard block
 block discarded – undo
231 231
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
232 232
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
233 233
 	 */
234
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
234
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
235 235
 	{
236
-		$targetId = ( isset( $entry->targetid ) ? $entry->targetid : null );
237
-		$refId = ( isset( $entry->refid ) ? $entry->refid : null );
236
+		$targetId = (isset($entry->targetid) ? $entry->targetid : null);
237
+		$refId = (isset($entry->refid) ? $entry->refid : null);
238 238
 
239
-		if( isset( $entry->id ) )
239
+		if (isset($entry->id))
240 240
 		{
241
-			$item = $manager->getItem( $entry->id );
241
+			$item = $manager->getItem($entry->id);
242 242
 
243
-			if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
244
-				$item = $item->fromArray( $attr );
243
+			if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
244
+				$item = $item->fromArray($attr);
245 245
 			}
246 246
 
247
-			$item = $manager->saveItem( $item );
247
+			$item = $manager->saveItem($item);
248 248
 
249
-			if( isset( $entry->parentid ) && $targetId !== null ) {
250
-				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
249
+			if (isset($entry->parentid) && $targetId !== null) {
250
+				$manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId);
251 251
 			}
252 252
 		}
253 253
 		else
254 254
 		{
255 255
 			$item = $manager->createItem();
256 256
 
257
-			if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
258
-				$item = $item->fromArray( $attr );
257
+			if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
258
+				$item = $item->fromArray($attr);
259 259
 			}
260 260
 
261
-			$manager->insertItem( $item, $targetId, $refId );
261
+			$manager->insertItem($item, $targetId, $refId);
262 262
 		}
263 263
 
264
-		if( isset( $entry->relationships ) ) {
265
-			$this->saveRelationships( $manager, $item, $entry->relationships );
264
+		if (isset($entry->relationships)) {
265
+			$this->saveRelationships($manager, $item, $entry->relationships);
266 266
 		}
267 267
 
268
-		return $manager->getItem( $item->getId() );
268
+		return $manager->getItem($item->getId());
269 269
 	}
270 270
 }
Please login to merge, or discard this patch.