aimeos / ai-admin-jsonadm

admin/jsonadm/templates/options-standard.php

Spacing +15 added lines, -15 removed lines

@@ -8,32 +8,32 @@ 
  */
 
 
-$target = $this->config( 'admin/jsonadm/url/target' );
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' );
-$action = $this->config( 'admin/jsonadm/url/action', 'get' );
-$config = $this->config( 'admin/jsonadm/url/config', [] );
+$target = $this->config('admin/jsonadm/url/target');
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm');
+$action = $this->config('admin/jsonadm/url/action', 'get');
+$config = $this->config('admin/jsonadm/url/config', []);
 
 
 $resources = $attributes = [];
-$site = $this->param( 'site', 'default' );
+$site = $this->param('site', 'default');
 
-foreach( $this->get( 'resources', [] ) as $resource ) {
-	$resources[$resource] = $this->url( $target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config );
+foreach ($this->get('resources', []) as $resource) {
+	$resources[$resource] = $this->url($target, $cntl, $action, ['site' => $site, 'resource' => $resource], [], $config);
 }
 
-foreach( $this->get( 'attributes', [] ) as $attr ) {
-	$attributes[$attr->getCode()] = $attr->toArray( true );
+foreach ($this->get('attributes', []) as $attr) {
+	$attributes[$attr->getCode()] = $attr->toArray(true);
 }
 
 
 ?>
 {
 	"meta": {
-		"prefix": <?= json_encode( $this->get( 'prefix' ) ); ?>,
-		"resources": <?= json_encode( $resources ); ?>,
-		"attributes": <?= json_encode( $attributes ); ?>
+		"prefix": <?= json_encode($this->get('prefix')); ?>,
+		"resources": <?= json_encode($resources); ?>,
+		"attributes": <?= json_encode($attributes); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -41,9 +41,9 @@ 
 		<?php endif; ?>
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		,"errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?>
+		,"errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?>
 
 	<?php endif; ?>
 

admin/jsonadm/templates/aggregate-standard.php

Spacing +9 added lines, -9 removed lines

@@ -8,19 +8,19 @@ 
  */
 
 
-$data = $this->get( 'data', [] );
+$data = $this->get('data', []);
 $entries = [];
 
-foreach( $data as $key => $value ) {
-	$entries[] = array( 'id' => $key, 'type' => 'aggregate', 'attributes' => $value );
+foreach ($data as $key => $value) {
+	$entries[] = array('id' => $key, 'type' => 'aggregate', 'attributes' => $value);
 }
 
 ?>
 {
 	"meta": {
-		"total": <?= count( $data ); ?>
+		"total": <?= count($data); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -29,13 +29,13 @@ 
 
 	},
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		"errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?>
+		"errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard'), array('errors' => $this->errors)); ?>
 
-	<?php elseif( isset( $this->data ) ) : ?>
+	<?php elseif (isset($this->data)) : ?>
 
-		"data": <?= json_encode( $entries ); ?>
+		"data": <?= json_encode($entries); ?>
 
 	<?php endif; ?>
 }

admin/jsonadm/tests/Admin/JsonAdm/Common/Decorator/BaseTest.php

Spacing +23 added lines, -23 removed lines

@@ -21,88 +21,88 @@
 		$context = \TestHelperJadm::getContext();
 		$this->view = $context->getView();
 
-		$this->stub = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Standard' )
-			->setConstructorArgs( array( $context, $this->view, [], 'attribute' ) )
+		$this->stub = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Standard')
+			->setConstructorArgs(array($context, $this->view, [], 'attribute'))
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $context, $this->view, [], ''] )
+		$this->object = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base')
+			->setConstructorArgs([$this->stub, $context, $this->view, [], ''])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->stub, $this->view );
+		unset($this->object, $this->stub, $this->view);
 	}
 
 
 	public function testDelete()
 	{
-		$this->stub->expects( $this->once() )->method( 'delete' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('delete')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->delete( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->delete($this->view->request(), $response));
 	}
 
 
 	public function testGet()
 	{
-		$this->stub->expects( $this->once() )->method( 'get' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('get')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->get( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->get($this->view->request(), $response));
 	}
 
 
 	public function testPatch()
 	{
-		$this->stub->expects( $this->once() )->method( 'patch' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('patch')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->patch( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->patch($this->view->request(), $response));
 	}
 
 
 	public function testPost()
 	{
-		$this->stub->expects( $this->once() )->method( 'post' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('post')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->post( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->post($this->view->request(), $response));
 	}
 
 
 	public function testPut()
 	{
-		$this->stub->expects( $this->once() )->method( 'put' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('put')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->put( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->put($this->view->request(), $response));
 	}
 
 
 	public function testOptions()
 	{
-		$this->stub->expects( $this->once() )->method( 'options' )->will( $this->returnArgument( 1 ) );
+		$this->stub->expects($this->once())->method('options')->will($this->returnArgument(1));
 		$response = $this->view->response();
 
-		$this->assertSame( $response, $this->object->options( $this->view->request(), $response ) );
+		$this->assertSame($response, $this->object->options($this->view->request(), $response));
 	}
 
 
 	public function testGetClient()
 	{
-		$result = $this->access( 'getClient' )->invokeArgs( $this->object, [] );
-		$this->assertSame( $this->stub, $result );
+		$result = $this->access('getClient')->invokeArgs($this->object, []);
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Admin\JsonAdm\Common\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

admin/jsonadm/templates/post-standard.php

Spacing +6 added lines, -6 removed lines

@@ -11,9 +11,9 @@ 
 ?>
 {
 	"meta": {
-		"total": <?= $this->get( 'total', 0 ); ?>
+		"total": <?= $this->get('total', 0); ?>
 
-		<?php if( $this->csrf()->name() != '' ) : ?>
+		<?php if ($this->csrf()->name() != '') : ?>
 			, "csrf": {
 				"name": "<?= $this->csrf()->name(); ?>",
 				"value": "<?= $this->csrf()->value(); ?>"
@@ -22,13 +22,13 @@ 
 
 	}
 
-	<?php if( isset( $this->errors ) ) : ?>
+	<?php if (isset($this->errors)) : ?>
 
-		, "errors": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-errors', 'partials/errors-standard' ), array( 'errors' => $this->errors ) ); ?>
+		, "errors": <?= $this->partial($this->config('admin/jsonadm/partials/template-errors', 'partials/errors-standard'), array('errors' => $this->errors)); ?>
 
-	<?php elseif( isset( $this->data ) ) : ?>
+	<?php elseif (isset($this->data)) : ?>
 
-		, "data": <?= $this->partial( $this->config( 'admin/jsonadm/partials/template-data', 'partials/data-standard' ), array( 'data' => $this->get( 'data' ) ) ); ?>
+		, "data": <?= $this->partial($this->config('admin/jsonadm/partials/template-data', 'partials/data-standard'), array('data' => $this->get('data'))); ?>
 
 	<?php endif; ?>
 

admin/jsonadm/tests/Admin/JsonAdmTest.php

Spacing +39 added lines, -39 removed lines

@@ -16,9 +16,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Standard', $client);
 	}
 
 
@@ -27,9 +27,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Order\\Base\\Standard', $client);
 	}
 
 
@@ -38,9 +38,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'stock/type' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'stock/type');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
 	}
 
 
@@ -49,9 +49,9 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, '' );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client );
-		$this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Standard', $client );
+		$client = \Aimeos\Admin\JsonAdm::create($context, $aimeos, '');
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client);
+		$this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Standard', $client);
 	}
 
 
@@ -60,8 +60,8 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm::create( $context, $aimeos, '%^' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm::create($context, $aimeos, '%^');
 	}
 
 
@@ -70,69 +70,69 @@ 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Admin\\JsonAdm\\Exception' );
-		\Aimeos\Admin\JsonAdm::create( $context, $aimeos, '', '%^' );
+		$this->setExpectedException('\\Aimeos\\Admin\\JsonAdm\\Exception');
+		\Aimeos\Admin\JsonAdm::create($context, $aimeos, '', '%^');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Admin\JsonAdm::cache( true );
+		$cache = \Aimeos\Admin\JsonAdm::cache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$client1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
+		$client1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
 		\Aimeos\Admin\JsonAdm::clear();
-		$client2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
+		$client2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
 
-		\Aimeos\Admin\JsonAdm::cache( $cache );
+		\Aimeos\Admin\JsonAdm::cache($cache);
 
-		$this->assertNotSame( $client1, $client2 );
+		$this->assertNotSame($client1, $client2);
 	}
 
 
 	public function testClearSite()
 	{
-		$cache = \Aimeos\Admin\JsonAdm::cache( true );
+		$cache = \Aimeos\Admin\JsonAdm::cache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$cntlA1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
-		$cntlB1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
+		$cntlA1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
+		$cntlB1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
 
-		\Aimeos\Admin\JsonAdm::clear( (string) $context );
+		\Aimeos\Admin\JsonAdm::clear((string) $context);
 
-		$cntlA2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
-		$cntlB2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
+		$cntlA2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
+		$cntlB2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
 
-		\Aimeos\Admin\JsonAdm::cache( $cache );
+		\Aimeos\Admin\JsonAdm::cache($cache);
 
-		$this->assertNotSame( $cntlA1, $cntlA2 );
-		$this->assertNotSame( $cntlB1, $cntlB2 );
+		$this->assertNotSame($cntlA1, $cntlA2);
+		$this->assertNotSame($cntlB1, $cntlB2);
 	}
 
 
 	public function testClearSpecific()
 	{
-		$cache = \Aimeos\Admin\JsonAdm::cache( true );
+		$cache = \Aimeos\Admin\JsonAdm::cache(true);
 
 		$context = \TestHelperJadm::getContext();
 		$aimeos = \TestHelperJadm::getAimeos();
 
-		$cntlA1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
-		$cntlB1 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
+		$cntlA1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
+		$cntlB1 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
 
-		\Aimeos\Admin\JsonAdm::clear( (string) $context, 'order' );
+		\Aimeos\Admin\JsonAdm::clear((string) $context, 'order');
 
-		$cntlA2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order' );
-		$cntlB2 = \Aimeos\Admin\JsonAdm::create( $context, $aimeos, 'order/base' );
+		$cntlA2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order');
+		$cntlB2 = \Aimeos\Admin\JsonAdm::create($context, $aimeos, 'order/base');
 
-		\Aimeos\Admin\JsonAdm::cache( $cache );
+		\Aimeos\Admin\JsonAdm::cache($cache);
 
-		$this->assertNotSame( $cntlA1, $cntlA2 );
-		$this->assertSame( $cntlB1, $cntlB2 );
+		$this->assertNotSame($cntlA1, $cntlA2);
+		$this->assertSame($cntlB1, $cntlB2);
 	}
 
 }
\ No newline at end of file

admin/jsonadm/src/Admin/JsonAdm/Media/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'media/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'media/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'media.lists.domain', $include ),
+			$search->compare('==', 'media.lists.parentid', array_keys($items)),
+			$search->compare('==', 'media.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Catalog/Standard.php

Spacing +44 added lines, -44 removed lines

@@ -110,7 +110,7 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		/** admin/jsonadm/partials/catalog/template-data
 		 * Relative path to the data partial template file for the catalog client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -140,14 +140,14 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getChildItems( array $items, array $include )
+	protected function getChildItems(array $items, array $include)
 	{
 		$list = [];
 
-		if( in_array( 'catalog', $include ) )
+		if (in_array('catalog', $include))
 		{
-			foreach( $items as $item ) {
-				$list = array_merge( $list, [$item], $this->getChildItems( $item->getChildren(), $include ) );
+			foreach ($items as $item) {
+				$list = array_merge($list, [$item], $this->getChildItems($item->getChildren(), $include));
 			}
 		}
 
@@ -162,40 +162,40 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'catalog' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'catalog');
 
-		if( ( $key = $view->param( 'aggregate' ) ) !== null )
+		if (($key = $view->param('aggregate')) !== null)
 		{
-			$search = $this->initCriteria( $manager->createSearch(), $view->param() );
-			$view->data = $manager->aggregate( $search, $key );
+			$search = $this->initCriteria($manager->createSearch(), $view->param());
+			$view->data = $manager->aggregate($search, $key);
 			return $response;
 		}
 
-		$include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$include = (($include = $view->param('include')) !== null ? explode(',', $include) : []);
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null )
+		if (($id = $view->param('id')) == null)
 		{
-			$view->data = $manager->searchItems( $search, [], $total );
-			$view->listItems = $this->getListItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, [], $total);
+			$view->listItems = $this->getListItems($view->data, $include);
 			$view->childItems = [];
 		}
 		else
 		{
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
-			if( in_array( 'catalog', $include ) ) {
+			if (in_array('catalog', $include)) {
 				$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
 			}
 
-			$view->data = $manager->getTree( $id, $include, $level, $search );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
-			$view->childItems = $this->getChildItems( $view->data->getChildren(), $include );
+			$view->data = $manager->getTree($id, $include, $level, $search);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
+			$view->childItems = $this->getChildItems($view->data->getChildren(), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $response;
@@ -209,18 +209,18 @@ 
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'catalog/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'catalog.lists.domain', $include ),
+			$search->compare('==', 'catalog.lists.parentid', array_keys($items)),
+			$search->compare('==', 'catalog.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -231,40 +231,40 @@ 
 	 * @param \stdClass $entry Object including "id" and "attributes" elements
 	 * @return \Aimeos\MShop\Common\Item\Iface New or updated item
 	 */
-	protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry )
+	protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry)
 	{
-		$targetId = ( isset( $entry->targetid ) ? $entry->targetid : null );
-		$refId = ( isset( $entry->refid ) ? $entry->refid : null );
+		$targetId = (isset($entry->targetid) ? $entry->targetid : null);
+		$refId = (isset($entry->refid) ? $entry->refid : null);
 
-		if( isset( $entry->id ) )
+		if (isset($entry->id))
 		{
-			$item = $manager->getItem( $entry->id );
+			$item = $manager->getItem($entry->id);
 
-			if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
-				$item = $item->fromArray( $attr );
+			if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
+				$item = $item->fromArray($attr);
 			}
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
-			if( isset( $entry->parentid ) && $targetId !== null ) {
-				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
+			if (isset($entry->parentid) && $targetId !== null) {
+				$manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId);
 			}
 		}
 		else
 		{
 			$item = $manager->createItem();
 
-			if( isset( $entry->attributes ) && ( $attr = (array) $entry->attributes ) ) {
-				$item = $item->fromArray( $attr );
+			if (isset($entry->attributes) && ($attr = (array) $entry->attributes)) {
+				$item = $item->fromArray($attr);
 			}
 
-			$manager->insertItem( $item, $targetId, $refId );
+			$manager->insertItem($item, $targetId, $refId);
 		}
 
-		if( isset( $entry->relationships ) ) {
-			$this->saveRelationships( $manager, $item, $entry->relationships );
+		if (isset($entry->relationships)) {
+			$this->saveRelationships($manager, $item, $entry->relationships);
 		}
 
-		return $manager->getItem( $item->getId() );
+		return $manager->getItem($item->getId());
 	}
 }

admin/jsonadm/src/Admin/JsonAdm/Service/Config/Standard.php

Spacing +19 added lines, -19 removed lines

@@ -110,30 +110,30 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	public function get( ServerRequestInterface $request, ResponseInterface $response )
+	public function get(ServerRequestInterface $request, ResponseInterface $response)
 	{
 		$view = $this->getView();
 
 		try
 		{
-			$response = $this->getItems( $view, $request, $response );
+			$response = $this->getItems($view, $request, $response);
 			$status = 200;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$status = 404;
-			$view->errors = array( array(
-				'title' => $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ),
+			$view->errors = array(array(
+				'title' => $this->getContext()->getI18n()->dt('mshop', $e->getMessage()),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$status = 500;
-			$view->errors = array( array(
+			$view->errors = array(array(
 				'title' => $e->getMessage(),
 				'detail' => $e->getTraceAsString(),
-			) );
+			));
 		}
 
 		/** admin/jsonadm/service/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/service/config/template-get';
 		$default = 'config-standard';
 
-		$body = $view->render( $view->config( $tplconf, $default ) );
+		$body = $view->render($view->config($tplconf, $default));
 
-		return $response->withHeader( 'Content-Type', 'application/vnd.api+json; supported-ext="bulk"' )
-			->withBody( $view->response()->createStreamFromString( $body ) )
-			->withStatus( $status );
+		return $response->withHeader('Content-Type', 'application/vnd.api+json; supported-ext="bulk"')
+			->withBody($view->response()->createStreamFromString($body))
+			->withStatus($status);
 	}
 
 
@@ -174,16 +174,16 @@ 
 	 * @param \Psr\Http\Message\ResponseInterface $response Response object
 	 * @return \Psr\Http\Message\ResponseInterface Modified response object
 	 */
-	protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response )
+	protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response)
 	{
-		if( ( $id = $view->param( 'id' ) ) == null ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'No ID given' ), 400 );
+		if (($id = $view->param('id')) == null) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('No ID given'), 400);
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->createItem()->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, $view->param( 'type', 'payment' ) )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, $view->param('type', 'payment'))->getConfigBE();
 
 		return $response;
 	}

admin/jsonadm/src/Admin/JsonAdm/Service/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -107,17 +107,17 @@
 	 * @param array $include List of resource types that should be fetched
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItems( array $items, array $include )
+	protected function getListItems(array $items, array $include)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'service.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'service.lists.domain', $include ),
+			$search->compare('==', 'service.lists.parentid', array_keys($items)),
+			$search->compare('==', 'service.lists.domain', $include),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }