aimeos / ai-admin-jsonadm

admin/jsonadm/tests/TestHelperJadm.php

Spacing +48 added lines, -48 removed lines

@@ -15,15 +15,15 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
-		\Aimeos\Admin\JsonAdm\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
+		\Aimeos\Admin\JsonAdm\Factory::setCache(false);
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -32,13 +32,13 @@ 
 
 	public static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
+			$extdir = dirname(dirname(dirname(dirname(__FILE__))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
 		}
 
 		return self::$aimeos;
@@ -47,85 +47,85 @@ 
 
 	public static function getJsonadmPaths()
 	{
-		return self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' );
+		return self::getAimeos()->getCustomPaths('admin/jsonadm/templates');
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
+		$paths = $aimeos->getConfigPaths('mysql');
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, 'de', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, 'de', '', false);
+		$ctx->setLocale($locale);
 
 
-		$view = self::createView( $conf );
-		$ctx->setView( $view );
+		$view = self::createView($conf);
+		$ctx->setView($view);
 
 
-		$ctx->setEditor( 'core:admin/jsonadm' );
+		$ctx->setEditor('core:admin/jsonadm');
 
 		return $ctx;
 	}
 
 
-	protected static function createView( \Aimeos\MW\Config\Iface $config )
+	protected static function createView(\Aimeos\MW\Config\Iface $config)
 	{
-		$tmplpaths = self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' );
+		$tmplpaths = self::getAimeos()->getCustomPaths('admin/jsonadm/templates');
 
-		$view = new \Aimeos\MW\View\Standard( $tmplpaths );
+		$view = new \Aimeos\MW\View\Standard($tmplpaths);
 
-		$trans = new \Aimeos\MW\Translation\None( 'de_DE' );
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans );
-		$view->addHelper( 'translate', $helper );
+		$trans = new \Aimeos\MW\Translation\None('de_DE');
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl');
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', '');
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' );
-		$view->addHelper( 'date', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d');
+		$view->addHelper('date', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'admin/jsonadm' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect($config, array('admin/jsonadm'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, new \Zend\Diactoros\ServerRequest() );
-		$view->addHelper( 'request', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Request\Standard($view, new \Zend\Diactoros\ServerRequest());
+		$view->addHelper('request', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, new \Zend\Diactoros\Response() );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Standard($view, new \Zend\Diactoros\Response());
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}

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' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +42 added lines, -42 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->getChildren() );
+			foreach ($items as $item) {
+				$list = array_merge($list, $item->getChildren());
 			}
 		}
 
@@ -162,35 +162,35 @@ 
 	 * @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\Factory::createManager( $this->getContext(), 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($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->childItems = $this->getChildItems( $view->data, $include );
+			$view->data = $manager->searchItems($search, [], $total);
+			$view->listItems = $this->getListItems($view->data, $include);
+			$view->childItems = $this->getChildItems($view->data, $include);
 		}
 		else
 		{
-			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
-			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
-			$view->childItems = $this->getChildItems( array( $view->data ), $include );
+			$view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search);
+			$view->listItems = $this->getListItems(array($id => $view->data), $include);
+			$view->childItems = $this->getChildItems(array($view->data), $include);
 		}
 
-		$view->refItems = $this->getRefItems( $view->listItems );
+		$view->refItems = $this->getRefItems($view->listItems);
 		$view->total = $total;
 
 		return $response;
@@ -204,18 +204,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\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($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);
 	}
 
 
@@ -226,32 +226,32 @@ 
 	 * @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 = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$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();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item, $targetId, $refId );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$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());
 	}
 }

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 = $this->getChildItems( $view->data, $include );
-		}
-		else
+		} else
 		{
 			$view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search );
 			$view->listItems = $this->getListItems( array( $id => $view->data ), $include );
@@ -240,8 +239,7 @@ 
 			if( isset( $entry->parentid ) && $targetId !== null ) {
 				$manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId );
 			}
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );

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

Spacing +13 added lines, -13 removed lines

@@ -107,20 +107,20 @@ 
 	 * @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 = [];
-		$prodIds = array_keys( $items );
-		$include = array_intersect( $include, array( 'product/property' ) );
+		$prodIds = array_keys($items);
+		$include = array_intersect($include, array('product/property'));
 
-		foreach( $include as $type )
+		foreach ($include as $type)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $prodIds ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $prodIds));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;
@@ -134,17 +134,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\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'product.lists.domain', $include ),
+			$search->compare('==', 'product.lists.parentid', array_keys($items)),
+			$search->compare('==', 'product.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/Base.php

Spacing +69 added lines, -69 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $templatePaths List of file system paths where the templates are stored
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
 		$this->view = $view;
 		$this->context = $context;
@@ -49,9 +49,9 @@ 
 	 * @param array $param List of method parameter
 	 * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Unable to call method "%1$s"', $name ) );
+		throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Unable to call method "%1$s"', $name));
 	}
 
 
@@ -62,7 +62,7 @@ 
 	 * @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)
 	{
 		return [];
 	}
@@ -85,9 +85,9 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
 	 * @return array List of domain names
 	 */
-	protected function getDomains( \Aimeos\MW\View\Iface $view )
+	protected function getDomains(\Aimeos\MW\View\Iface $view)
 	{
-		if( ( $domains = $view->param( 'resource' ) ) == '' )
+		if (($domains = $view->param('resource')) == '')
 		{
 			/** admin/jsonadm/domains
 			 * A list of domain names whose clients are available for the JSON API
@@ -109,7 +109,7 @@ 
 				'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media', 'order',
 				'plugin', 'price', 'product', 'service', 'supplier', 'stock', 'tag', 'text'
 			);
-			$domains = $this->getContext()->getConfig()->get( 'admin/jsonadm/domains', $default );
+			$domains = $this->getContext()->getConfig()->get('admin/jsonadm/domains', $default);
 		}
 
 		return (array) $domains;
@@ -122,15 +122,15 @@ 
 	 * @param \stdClass $request Decoded request body
 	 * @return array List of item IDs
 	 */
-	protected function getIds( $request )
+	protected function getIds($request)
 	{
 		$ids = [];
 
-		if( isset( $request->data ) )
+		if (isset($request->data))
 		{
-			foreach( (array) $request->data as $entry )
+			foreach ((array) $request->data as $entry)
 			{
-				if( isset( $entry->id ) ) {
+				if (isset($entry->id)) {
 					$ids[] = $entry->id;
 				}
 			}
@@ -147,7 +147,7 @@ 
 	 * @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)
 	{
 		return [];
 	}
@@ -170,23 +170,23 @@ 
 	 * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
-	protected function getRefItems( array $listItems )
+	protected function getRefItems(array $listItems)
 	{
 		$list = $map = [];
 		$context = $this->getContext();
 
-		foreach( $listItems as $listItem ) {
+		foreach ($listItems as $listItem) {
 			$map[$listItem->getDomain()][] = $listItem->getRefId();
 		}
 
-		foreach( $map as $domain => $ids )
+		foreach ($map as $domain => $ids)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, $domain );
+			$manager = \Aimeos\MShop\Factory::createManager($context, $domain);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', $domain . '.id', $ids ) );
+			$search->setConditions($search->compare('==', $domain . '.id', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;
@@ -222,11 +222,11 @@ 
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$this->initCriteriaConditions( $criteria, $params );
-		$this->initCriteriaSortations( $criteria, $params );
-		$this->initCriteriaSlice( $criteria, $params );
+		$this->initCriteriaConditions($criteria, $params);
+		$this->initCriteriaSortations($criteria, $params);
+		$this->initCriteriaSlice($criteria, $params);
 
 		return $criteria;
 	}
@@ -238,17 +238,17 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	protected function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['filter'] ) ) {
+		if (!isset($params['filter'])) {
 			return;
 		}
 
 		$existing = $criteria->getConditions();
-		$criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) );
+		$criteria->setConditions($criteria->toConditions((array) $params['filter']));
 
-		$expr = array( $criteria->getConditions(), $existing );
-		$criteria->setConditions( $criteria->combine( '&&', $expr ) );
+		$expr = array($criteria->getConditions(), $existing);
+		$criteria->setConditions($criteria->combine('&&', $expr));
 	}
 
 
@@ -258,12 +258,12 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 );
-		$size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 );
+		$start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25);
 
-		$criteria->setSlice( $start, $size );
+		$criteria->setSlice($start, $size);
 	}
 
 
@@ -273,24 +273,24 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	protected function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['sort'] ) ) {
+		if (!isset($params['sort'])) {
 			return;
 		}
 
 		$sortation = [];
 
-		foreach( explode( ',', $params['sort'] ) as $sort )
+		foreach (explode(',', $params['sort']) as $sort)
 		{
-			if( $sort[0] === '-' ) {
-				$sortation[] = $criteria->sort( '-', substr( $sort, 1 ) );
+			if ($sort[0] === '-') {
+				$sortation[] = $criteria->sort('-', substr($sort, 1));
 			} else {
-				$sortation[] = $criteria->sort( '+', $sort );
+				$sortation[] = $criteria->sort('+', $sort);
 			}
 		}
 
-		$criteria->setSortations( $sortation );
+		$criteria->setSortations($sortation);
 	}
 
 
@@ -301,14 +301,14 @@ 
 	 * @param \stdClass $request Object with request body data
 	 * @return array List of items
 	 */
-	protected function saveData( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request )
+	protected function saveData(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request)
 	{
 		$data = [];
 
-		if( isset( $request->data ) )
+		if (isset($request->data))
 		{
-			foreach( (array) $request->data as $entry ) {
-				$data[] = $this->saveEntry( $manager, $entry );
+			foreach ((array) $request->data as $entry) {
+				$data[] = $this->saveEntry($manager, $entry);
 			}
 		}
 
@@ -323,22 +323,22 @@ 
 	 * @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 ) ) {
-			$item = $manager->getItem( $entry->id );
+		if (isset($entry->id)) {
+			$item = $manager->getItem($entry->id);
 		} else {
 			$item = $manager->createItem();
 		}
 
-		$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-		$manager->saveItem( $item );
+		$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+		$manager->saveItem($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());
 	}
 
 
@@ -349,28 +349,28 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Domain item with an unique ID set
 	 * @param \stdClass $relationships Object including the <domain>/data/attributes structure
 	 */
-	protected function saveRelationships( \Aimeos\MShop\Common\Manager\Iface $manager,
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships )
+	protected function saveRelationships(\Aimeos\MShop\Common\Manager\Iface $manager,
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships)
 	{
 		$id = $item->getId();
-		$listManager = $manager->getSubManager( 'lists' );
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( (array) $relationships as $domain => $list )
+		foreach ((array) $relationships as $domain => $list)
 		{
-			if( isset( $list->data ) )
+			if (isset($list->data))
 			{
-				foreach( (array) $list->data as $data )
+				foreach ((array) $list->data as $data)
 				{
-					$listItem = $this->addItemData( $listManager, $listManager->createItem(), $data, $domain );
+					$listItem = $this->addItemData($listManager, $listManager->createItem(), $data, $domain);
 
-					if( isset( $data->id ) ) {
-						$listItem->setRefId( $data->id );
+					if (isset($data->id)) {
+						$listItem->setRefId($data->id);
 					}
 
-					$listItem->setParentId( $id );
-					$listItem->setDomain( $domain );
+					$listItem->setParentId($id);
+					$listItem->setDomain($domain);
 
-					$listManager->saveItem( $listItem, false );
+					$listManager->saveItem($listItem, false);
 				}
 			}
 		}
@@ -387,20 +387,20 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Iface Item including the data
 	 */
 	protected function addItemData(\Aimeos\MShop\Common\Manager\Iface $manager,
-		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain )
+		\Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain)
 	{
-		if( isset( $data->attributes ) )
+		if (isset($data->attributes))
 		{
 			$attr = (array) $data->attributes;
-			$key = str_replace( '/', '.', $item->getResourceType() );
+			$key = str_replace('/', '.', $item->getResourceType());
 
-			if( isset( $attr[$key.'.type'] ) )
+			if (isset($attr[$key . '.type']))
 			{
-				$typeItem = $manager->getSubManager( 'type' )->findItem( $attr[$key.'.type'], [], $domain );
-				$attr[$key.'.typeid'] = $typeItem->getId();
+				$typeItem = $manager->getSubManager('type')->findItem($attr[$key . '.type'], [], $domain);
+				$attr[$key . '.typeid'] = $typeItem->getId();
 			}
 
-			$item->fromArray( $attr );
+			$item->fromArray($attr);
 		}
 
 		return $item;

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

Spacing +13 added lines, -13 removed lines

@@ -107,20 +107,20 @@ 
 	 * @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 = [];
-		$refIds = array_keys( $items );
-		$include = array_intersect( $include, array( 'customer/address' ) );
+		$refIds = array_keys($items);
+		$include = array_intersect($include, array('customer/address'));
 
-		foreach( $include as $type )
+		foreach ($include as $type)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;
@@ -134,17 +134,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\Factory::createManager( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'customer.lists.domain', $include ),
+			$search->compare('==', 'customer.lists.parentid', array_keys($items)),
+			$search->compare('==', 'customer.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/Supplier/Standard.php

Spacing +13 added lines, -13 removed lines

@@ -107,20 +107,20 @@ 
 	 * @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 = [];
-		$refIds = array_keys( $items );
-		$include = array_intersect( $include, array( 'supplier/address' ) );
+		$refIds = array_keys($items);
+		$include = array_intersect($include, array('supplier/address'));
 
-		foreach( $include as $type )
+		foreach ($include as $type)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;
@@ -134,17 +134,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\Factory::createManager( $this->getContext(), 'supplier/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'supplier.lists.parentid', array_keys( $items ) ),
-			$search->compare( '==', 'supplier.lists.domain', $include ),
+			$search->compare('==', 'supplier.lists.parentid', array_keys($items)),
+			$search->compare('==', 'supplier.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/Common/Factory/Base.php

Spacing +38 added lines, -38 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Admin\JsonAdm\Iface|null $client JSON API client object
 	 */
-	public static function injectClient( $classname, \Aimeos\Admin\JsonAdm\Iface $client = null )
+	public static function injectClient($classname, \Aimeos\Admin\JsonAdm\Iface $client = null)
 	{
 		self::$objects[$classname] = $client;
 	}
@@ -47,8 +47,8 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/property"
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
 	 */
-	protected static function addClientDecorators( \Aimeos\Admin\JsonAdm\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	protected static function addClientDecorators(\Aimeos\Admin\JsonAdm\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
 		$config = $context->getConfig();
 
@@ -74,38 +74,38 @@ 
 		 * @since 2015.12
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'admin/jsonadm/common/decorators/default', [] );
+		$decorators = $config->get('admin/jsonadm/common/decorators/default', []);
 
-		if( $path !== null && is_string( $path ) )
+		if ($path !== null && is_string($path))
 		{
-			$dpath = trim( $path, '/' );
-			$dpath = ( $dpath !== '' ? $dpath . '/' : $dpath );
+			$dpath = trim($path, '/');
+			$dpath = ($dpath !== '' ? $dpath . '/' : $dpath);
 
-			$excludes = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/excludes', [] );
-			$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+			$excludes = $config->get('admin/jsonadm/' . $dpath . 'decorators/excludes', []);
+			$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 
-			foreach( $decorators as $key => $name )
+			foreach ($decorators as $key => $name)
 			{
-				if( in_array( $name, $excludes ) ) {
-					unset( $decorators[$key] );
+				if (in_array($name, $excludes)) {
+					unset($decorators[$key]);
 				}
 			}
 
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
-			$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/global', [] );
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+			$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/global', []);
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 
-			if( !empty( $path ) )
+			if (!empty($path))
 			{
-				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst( $localClass ) . '\\Decorator\\';
-				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] );
-				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+				$classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst($localClass) . '\\Decorator\\';
+				$decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/local', []);
+				$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 			}
 		}
 		else
 		{
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
-			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
+			$client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path);
 		}
 
 		return $client;
@@ -124,29 +124,29 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
 	 */
-	protected static function addDecorators( \Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
-			\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path )
+	protected static function addDecorators(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix,
+			\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path)
 	{
 		$iface = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404);
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
 			}
 
-			$client = new $classname( $client, $context, $view, $templatePaths, $path );
+			$client = new $classname($client, $context, $view, $templatePaths, $path);
 
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ), 404 );
+			if (!($client instanceof $iface)) {
+				throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface), 404);
 			}
 		}
 
@@ -165,21 +165,21 @@ 
 	 * @param string $path Name of the client separated by slashes, e.g "product/stock"
 	 * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object
 	 */
-	protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MW\View\Iface $view, array $templatePaths, $path )
+	protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MW\View\Iface $view, array $templatePaths, $path)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404);
 		}
 
-		$client = new $classname( $context, $view, $templatePaths, $path );
+		$client = new $classname($context, $view, $templatePaths, $path);
 
-		if( !( $client instanceof $interface ) ) {
-			throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $interface ), 500 );
+		if (!($client instanceof $interface)) {
+			throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $interface), 500);
 		}
 
 		return $client;

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 				$decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] );
 				$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );
 			}
-		}
-		else
+		} else
 		{
 			$classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\';
 			$client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path );

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

Spacing +7 added lines, -7 removed lines

@@ -107,20 +107,20 @@
 	 * @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 = [];
-		$ids = array_keys( $items );
-		$include = array_intersect( $include, array( 'coupon/code' ) );
+		$ids = array_keys($items);
+		$include = array_intersect($include, array('coupon/code'));
 
-		foreach( $include as $type )
+		foreach ($include as $type)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type);
 
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $ids ) );
+			$search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $ids));
 
-			$list = array_merge( $list, $manager->searchItems( $search ) );
+			$list = array_merge($list, $manager->searchItems($search));
 		}
 
 		return $list;