aimeos / ai-admin-jsonadm

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/Factory/BaseTest.php

Doc Comments +3 added lines

@@ -123,6 +123,9 @@
 	}
 
 
+	/**
+	 * @param string $name
+	 */
 	protected function access( $name )
 	{
 		$class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class );

Spacing +26 added lines, -26 removed lines

@@ -21,29 +21,29 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' );
+		$this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], '');
 
-		$this->object = $this->getMockBuilder( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class )
+		$this->object = $this->getMockBuilder(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class)
 			->getMockForAbstractClass();
 	}
 
 
 	public function testinjectClient()
 	{
-		$this->object->injectClient( 'test', $this->client );
+		$this->object->injectClient('test', $this->client);
 	}
 
 
 	public function testAddClientDecorators()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'client/jsonapi/common/decorators/default', ['Test'] );
-		$config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] );
+		$config->set('client/jsonapi/common/decorators/default', ['Test']);
+		$config->set('client/jsonapi/product/decorators/excludes', ['Test']);
 
 		$params = [$this->client, $this->context, $this->view, [], 'product'];
-		$result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addClientDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -52,9 +52,9 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$result = $this->access('addDecorators')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -63,8 +63,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class);
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -73,8 +73,8 @@ 
 		$prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 		$params = [$this->client, [''], $prefix, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class );
-		$this->access( 'addDecorators' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class);
+		$this->access('addDecorators')->invokeArgs($this->object, $params);
 	}
 
 
@@ -84,9 +84,9 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result);
 	}
 
 
@@ -95,10 +95,10 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['test', $iface, $this->context, $this->view, [], ''];
 
-		$this->object->injectClient( 'test', $this->client );
-		$result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->object->injectClient('test', $this->client);
+		$result = $this->access('createClientBase')->invokeArgs($this->object, $params);
 
-		$this->assertSame( $this->client, $result );
+		$this->assertSame($this->client, $result);
 	}
 
 
@@ -107,8 +107,8 @@ 
 		$iface = '\Aimeos\\Admin\\JsonAdm\\Iface';
 		$params = ['invalid', $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( \Aimeos\Admin\JsonAdm\Exception::class );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException(\Aimeos\Admin\JsonAdm\Exception::class);
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
@@ -118,16 +118,16 @@ 
 		$class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard';
 		$params = [$class, $iface, $this->context, $this->view, [], ''];
 
-		$this->setExpectedException( \Aimeos\MW\Common\Exception::class );
-		$this->access( 'createClientBase' )->invokeArgs( $this->object, $params );
+		$this->setExpectedException(\Aimeos\MW\Common\Exception::class);
+		$this->access('createClientBase')->invokeArgs($this->object, $params);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( \Aimeos\Admin\JsonAdm\Common\Factory\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Admin\JsonAdm\Common\Factory\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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/src/Admin/JsonAdm/Locale/Site/Standard.php

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 			}
 
 			$item = $manager->saveItem( $item );
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 

Spacing +21 added lines, -21 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/locale/site/template-data
 		 * Relative path to the data partial template file for the locale site  client
@@ -127,9 +127,9 @@ 
 		 * @since 2016.07
 		 * @category Developer
 		 */
-		$this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/locale/site/template-data' ) );
+		$this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/locale/site/template-data'));
 
-		return parent::get( $request, $response );
+		return parent::get($request, $response);
 	}
 
 
@@ -141,16 +141,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)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'locale/site' );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'locale/site');
+		$search = $this->initCriteria($manager->createSearch(), $view->param());
 		$total = 1;
 
-		if( ( $id = $view->param( 'id' ) ) == null ) {
-			$view->data = $manager->searchItems( $search, [], $total );
+		if (($id = $view->param('id')) == null) {
+			$view->data = $manager->searchItems($search, [], $total);
 		} else {
-			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search );
+			$view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $search);
 		}
 
 		$view->childItems = [];
@@ -169,33 +169,33 @@ 
 	 * @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)
 	{
-		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);
 		}
 		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 );
+			$manager->insertItem($item);
 		}
 
-		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/Catalog/Standard.php

Braces +2 added lines, -4 removed lines

@@ -182,8 +182,7 @@ 
 			$view->data = $manager->searchItems( $search, [], $total );
 			$view->listItems = $this->getListItems( $view->data, $include );
 			$view->childItems = [];
-		}
-		else
+		} else
 		{
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 			if( in_array( 'catalog', $include ) ) {
@@ -249,8 +248,7 @@ 
 			if( isset( $entry->parentid ) && $targetId !== null ) {
 				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
 			}
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 

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/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/Factory.php

Spacing +5 added lines, -5 removed lines

@@ -32,10 +32,10 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	static public function createClient( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
+	static public function createClient(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
 	{
-		return self::create( $context, $aimeos, $path, $name );
+		return self::create($context, $aimeos, $path, $name);
 	}
 
 
@@ -45,8 +45,8 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function setCache( $value )
+	static public function setCache($value)
 	{
-		return self::cache( $value );
+		return self::cache($value);
 	}
 }

admin/jsonadm/src/Admin/JsonAdm.php

Spacing +42 added lines, -42 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function cache( $value )
+	static public function cache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;
@@ -46,11 +46,11 @@ 
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
 	 * @param string $path Path describing the client to clear, e.g. "product/lists/type"
 	 */
-	static public function clear( $id = null, $path = null )
+	static public function clear($id = null, $path = null)
 	{
-		if( $id !== null )
+		if ($id !== null)
 		{
-			if( $path !== null ) {
+			if ($path !== null) {
 				self::$clients[$id][$path] = null;
 			} else {
 				self::$clients[$id] = [];
@@ -78,18 +78,18 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	static public function create( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
+	static public function create(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
 	{
-		$path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) );
+		$path = strtolower(trim($path, "/ \n\t\r\0\x0B"));
 		$id = (string) $context;
 
-		if( self::$cache === false || !isset( self::$clients[$id][$path] ) )
+		if (self::$cache === false || !isset(self::$clients[$id][$path]))
 		{
-			if( empty( $path ) ) {
-				self::$clients[$id][$path] = self::createRoot( $context, $aimeos, $path, $name );
+			if (empty($path)) {
+				self::$clients[$id][$path] = self::createRoot($context, $aimeos, $path, $name);
 			} else {
-				self::$clients[$id][$path] = self::createNew( $context, $aimeos, $path, $name );
+				self::$clients[$id][$path] = self::createNew($context, $aimeos, $path, $name);
 			}
 		}
 
@@ -107,53 +107,53 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid
 	 */
-	protected static function createNew( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name )
+	protected static function createNew(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $path, $name)
 	{
 		$pname = $name;
-		$parts = explode( '/', $path );
+		$parts = explode('/', $path);
 
-		foreach( $parts as $key => $part )
+		foreach ($parts as $key => $part)
 		{
-			if( ctype_alnum( $part ) === false )
+			if (ctype_alnum($part) === false)
 			{
-				$msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path );
-				throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 );
+				$msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path);
+				throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400);
 			}
 
-			$parts[$key] = ucwords( $part );
+			$parts[$key] = ucwords($part);
 		}
 
-		if( $pname === null ) {
-			$pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' );
+		if ($pname === null) {
+			$pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard');
 		}
 
 		$view = $context->getView();
 		$config = $context->getConfig();
 
-		if( $view->access( $config->get( 'admin/jsonadm/resource/' . $path . '/groups', [] ) ) !== true ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JsonAdm "%1$s" client', $path ) );
+		if ($view->access($config->get('admin/jsonadm/resource/' . $path . '/groups', [])) !== true) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JsonAdm "%1$s" client', $path));
 		}
 
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
-		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname;
+		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname;
 
-		if( ctype_alnum( $pname ) === false )
+		if (ctype_alnum($pname) === false)
 		{
-			$classname = is_string( $pname ) ? $classname : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($pname) ? $classname : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
-		if( class_exists( $classname ) === false ) {
-			return self::createRoot( $context, $aimeos, $path, $name );
+		if (class_exists($classname) === false) {
+			return self::createRoot($context, $aimeos, $path, $name);
 		}
 
-		$client = self::createClientBase( $classname, $iface, $context, $path );
-		$client = self::addClientDecorators( $client, $context, $path );
+		$client = self::createClientBase($classname, $iface, $context, $path);
+		$client = self::addClientDecorators($client, $context, $path);
 
-		return $client->setAimeos( $aimeos )->setView( $view );
+		return $client->setAimeos($aimeos)->setView($view);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created
 	 */
-	protected static function createRoot( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Bootstrap $aimeos, $path, $name = null )
+	protected static function createRoot(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Bootstrap $aimeos, $path, $name = null)
 	{
 		/** admin/jsonadm/name
 		 * Class name of the used JSON API client implementation
@@ -203,21 +203,21 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('admin/jsonadm/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>';
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 		}
 
 		$view = $context->getView();
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Iface';
 		$classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name;
 
-		$client = self::createClientBase( $classname, $iface, $context, $path );
+		$client = self::createClientBase($classname, $iface, $context, $path);
 
 		/** admin/jsonadm/decorators/excludes
 		 * Excludes decorators added by the "common" option from the JSON API clients
@@ -297,8 +297,8 @@ 
 		 * @see admin/jsonadm/decorators/global
 		 */
 
-		$client = self::addClientDecorators( $client, $context, $path );
+		$client = self::addClientDecorators($client, $context, $path);
 
-		return $client->setAimeos( $aimeos )->setView( $view );
+		return $client->setAimeos($aimeos)->setView($view);
 	}
 }