aimeos / ai-admin-jsonadm

admin/jsonadm/templates/config-default.php

Spacing +14 added lines, -14 removed lines

@@ -9,29 +9,29 @@ 
 
 
 $options = 0;
-if( defined( 'JSON_PRETTY_PRINT' ) ) {
+if (defined('JSON_PRETTY_PRINT')) {
 	$options = JSON_PRETTY_PRINT;
 }
 
 
-$fields = $this->param( 'fields', [] );
+$fields = $this->param('fields', []);
 
-foreach( (array) $fields as $resource => $list ) {
-	$fields[$resource] = array_flip( explode( ',', $list ) );
+foreach ((array) $fields as $resource => $list) {
+	$fields[$resource] = array_flip(explode(',', $list));
 }
 
 
-$build = function( array $attrItems, $id ) use ( $fields )
+$build = function(array $attrItems, $id) use ($fields)
 {
 	$result = [];
 	$type = 'criteria/attribute';
 
-	foreach( $attrItems as $attrItem )
+	foreach ($attrItems as $attrItem)
 	{
-		$attributes = $attrItem->toArray( true );
+		$attributes = $attrItem->toArray(true);
 
-		if( isset( $fields[$type] ) ) {
-			$attributes = array_intersect_key( $attributes, $fields[$type] );
+		if (isset($fields[$type])) {
+			$attributes = array_intersect_key($attributes, $fields[$type]);
 		}
 
 		$result[] = array(
@@ -45,23 +45,23 @@ 
 };
 
 
-$configItems = $this->get( 'configItems', [] );
+$configItems = $this->get('configItems', []);
 
 
 ?>
 {
 	"meta": {
-		"total": <?= count( $configItems ); ?>
+		"total": <?= count($configItems); ?>
 
 	}
 
-	<?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.php' ), array( 'errors' => $this->errors ) ); ?>
+		, "errors": <?= $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?>
 
 	<?php else : ?>
 
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
+		, "data": <?= json_encode($build($configItems, $this->param('id')), $options); ?>
 
 	<?php endif; ?>
 }

Braces +5 added lines, -2 removed lines

@@ -59,9 +59,12 @@
 
 		, "errors": <?= $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?>
 
-	<?php else : ?>
+	<?php else {
+	: ?>
 
-		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options ); ?>
+		, "data": <?= json_encode( $build( $configItems, $this->param( 'id' ) ), $options );
+}
+?>
 
 	<?php endif; ?>
 }

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

Braces +2 added lines, -4 removed lines

@@ -118,16 +118,14 @@
 		{
 			$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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

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-default.php';
 
-		$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\Factory::createManager( $this->getContext(), 'service' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($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/Plugin/Config/Standard.php

Braces +2 added lines, -4 removed lines

@@ -118,16 +118,14 @@
 		{
 			$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() ),
 				'detail' => $e->getTraceAsString(),
 			) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$status = 500;
 			$view->errors = array( array(

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/plugin/config/template-get
@@ -158,11 +158,11 @@ 
 		$tplconf = 'admin/jsonadm/plugin/config/template-get';
 		$default = 'config-default.php';
 
-		$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\Factory::createManager( $this->getContext(), 'plugin' );
-		$item = $manager->createItem()->setProvider( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'plugin');
+		$item = $manager->createItem()->setProvider($id);
 
-		$view->configItems = $manager->getProvider( $item, 'order' )->getConfigBE();
+		$view->configItems = $manager->getProvider($item, 'order')->getConfigBE();
 
 		return $response;
 	}

admin/jsonadm/src/Admin/JsonAdm/Base.php

Spacing +71 added lines, -71 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
@@ -110,7 +110,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;
@@ -123,15 +123,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;
 				}
 			}
@@ -148,7 +148,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 [];
 	}
@@ -171,23 +171,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;
@@ -200,7 +200,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter
 	 * @return array List of domain names
 	 */
-	protected function getResources( \Aimeos\MW\View\Iface $view )
+	protected function getResources(\Aimeos\MW\View\Iface $view)
 	{
 		/** admin/jsonadm/resources
 		 * A list of additional resources name whose clients are available for the JSON API
@@ -218,7 +218,7 @@ 
 		 * @category Developer
 		 * @see admin/jsonadm/domains
 		 */
-		return (array) $view->config( 'admin/jsonadm/resources', ['coupon/config', 'plugin/config', 'service/config'] );
+		return (array) $view->config('admin/jsonadm/resources', ['coupon/config', 'plugin/config', 'service/config']);
 	}
 
 
@@ -251,11 +251,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;
 	}
@@ -267,17 +267,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));
 	}
 
 
@@ -287,12 +287,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);
 	}
 
 
@@ -302,24 +302,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);
 	}
 
 
@@ -330,14 +330,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);
 			}
 		}
 
@@ -352,22 +352,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() );
-		$item = $manager->saveItem( $item );
+		$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+		$item = $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());
 	}
 
 
@@ -378,28 +378,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);
 				}
 			}
 		}
@@ -416,20 +416,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/tests/Admin/JsonAdm/Plugin/Config/StandardTest.php

Spacing +22 added lines, -22 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Plugin\Config\Standard( $this->context, $this->view, $templatePaths, 'plugin/config' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Plugin\Config\Standard($this->context, $this->view, $templatePaths, 'plugin/config');
 	}
 
 
@@ -31,26 +31,26 @@ 
 		$params = array(
 			'id' => 'Autofill,Log',
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
-
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
-
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
-
-		$this->assertEquals( 8, $result['meta']['total'] );
-		$this->assertInternalType( 'array', $result['data'] );
-		$this->assertEquals( 'autofill.address', $result['data'][0]['id'] );
-		$this->assertEquals( 'autofill.delivery', $result['data'][1]['id'] );
-		$this->assertEquals( 'autofill.deliverycode', $result['data'][2]['id'] );
-		$this->assertEquals( 'autofill.payment', $result['data'][3]['id'] );
-		$this->assertEquals( 'autofill.paymentcode', $result['data'][4]['id'] );
-		$this->assertEquals( 'autofill.useorder', $result['data'][5]['id'] );
-		$this->assertEquals( 'autofill.orderaddress', $result['data'][6]['id'] );
-		$this->assertEquals( 'autofill.orderservice', $result['data'][7]['id'] );
-
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
+
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
+
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
+
+		$this->assertEquals(8, $result['meta']['total']);
+		$this->assertInternalType('array', $result['data']);
+		$this->assertEquals('autofill.address', $result['data'][0]['id']);
+		$this->assertEquals('autofill.delivery', $result['data'][1]['id']);
+		$this->assertEquals('autofill.deliverycode', $result['data'][2]['id']);
+		$this->assertEquals('autofill.payment', $result['data'][3]['id']);
+		$this->assertEquals('autofill.paymentcode', $result['data'][4]['id']);
+		$this->assertEquals('autofill.useorder', $result['data'][5]['id']);
+		$this->assertEquals('autofill.orderaddress', $result['data'][6]['id']);
+		$this->assertEquals('autofill.orderservice', $result['data'][7]['id']);
+
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 }
\ No newline at end of file

admin/jsonadm/src/Admin/JsonAdm/Locale/Site/Standard.php

Spacing +19 added lines, -19 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\Factory::createManager( $this->getContext(), 'locale/site' );
-		$search = $this->initCriteria( $manager->createSearch(), $view->param() );
+		$manager = \Aimeos\MShop\Factory::createManager($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,25 +169,25 @@ 
 	 * @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 = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$item = $manager->saveItem($item);
 		}
 		else
 		{
 			$item = $manager->createItem();
-			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
-			$manager->insertItem( $item );
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$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());
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
 			$item = $manager->getItem( $entry->id );
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );
 			$item = $manager->saveItem( $item );
-		}
-		else
+		} else
 		{
 			$item = $manager->createItem();
 			$item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() );

admin/jsonadm/tests/Admin/JsonAdm/Locale/Site/StandardTest.php

Spacing +72 added lines, -72 removed lines

@@ -22,32 +22,32 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Locale\Site\Standard( $this->context, $this->view, $templatePaths, 'locale/site' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Locale\Site\Standard($this->context, $this->view, $templatePaths, 'locale/site');
 	}
 
 
 	public function testGet()
 	{
 		$params = array(
-			'id' => $this->getSiteItem( 'unittest' )->getId(),
+			'id' => $this->getSiteItem('unittest')->getId(),
 			'filter' => array(
-				'==' => array( 'locale.status' => 0 )
+				'==' => array('locale.status' => 0)
 			),
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
@@ -55,124 +55,124 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'locale.site.code' => 'unittest' )
+				'==' => array('locale.site.code' => 'unittest')
 			),
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'locale/site', $result['data'][0]['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('locale/site', $result['data'][0]['type']);
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatch()
 	{
-		$stub = $this->getSiteMock( array( 'getItem', 'moveItem', 'saveItem' ) );
+		$stub = $this->getSiteMock(array('getItem', 'moveItem', 'saveItem'));
 		$item = $stub->createItem();
 
-		$stub->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $stub->createItem() ) );
-		$stub->expects( $this->exactly( 2 ) )->method( 'getItem' ) // 2x due to decorator
-			->will( $this->returnValue( $item ) );
+		$stub->expects($this->once())->method('saveItem')
+			->will($this->returnValue($stub->createItem()));
+		$stub->expects($this->exactly(2))->method('getItem') // 2x due to decorator
+			->will($this->returnValue($item));
 
 
-		$params = array( 'id' => '-1' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => '-1');
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
 		$body = '{"data": {"parentid": "1", "targetid": 2, "type": "locale/site", "attributes": {"locale.site.label": "test"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->patch( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->patch($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPost()
 	{
-		$stub = $this->getSiteMock( array( 'getItem', 'insertItem' ) );
+		$stub = $this->getSiteMock(array('getItem', 'insertItem'));
 		$item = $stub->createItem();
 
-		$stub->expects( $this->any() )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
-		$stub->expects( $this->once() )->method( 'insertItem' );
+		$stub->expects($this->any())->method('getItem')
+			->will($this->returnValue($item));
+		$stub->expects($this->once())->method('insertItem');
 
 
 		$body = '{"data": {"type": "locale/site", "attributes": {"locale.site.code": "unittest", "locale.site.label": "Unit test"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->post( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->post($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'locale/site', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('locale/site', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
-	protected function getSiteItem( $code )
+	protected function getSiteItem($code)
 	{
-		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $this->context )->getSubManager( 'site' );
+		$manager = \Aimeos\MShop\Locale\Manager\Factory::createManager($this->context)->getSubManager('site');
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'locale.site.code', $code ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'locale.site.code', $code));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No locale site item with code "%1$s" found', $code ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No locale site item with code "%1$s" found', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getSiteMock( array $methods )
+	protected function getSiteMock(array $methods)
 	{
 		$name = 'AdminJsonAdmStandard';
-		$this->context->getConfig()->set( 'mshop/locale/manager/name', $name );
+		$this->context->getConfig()->set('mshop/locale/manager/name', $name);
 
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Locale\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'getSubManager' ) )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Locale\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('getSubManager'))
 			->getMock();
 
-		$siteStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Locale\\Manager\\Site\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( $methods )
+		$siteStub = $this->getMockBuilder('\\Aimeos\\MShop\\Locale\\Manager\\Site\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods($methods)
 			->getMock();
 
-		$stub->expects( $this->once() )->method( 'getSubManager' )
-			->will( $this->returnValue( $siteStub ) );
+		$stub->expects($this->once())->method('getSubManager')
+			->will($this->returnValue($siteStub));
 
-		\Aimeos\MShop\Locale\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Locale\\Manager\\' . $name, $stub );
+		\Aimeos\MShop\Locale\Manager\Factory::injectManager('\\Aimeos\\MShop\\Locale\\Manager\\' . $name, $stub);
 
 		return $siteStub;
 	}

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], $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\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->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\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);
 	}
 
 
@@ -231,32 +231,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() );
-			$item = $manager->saveItem( $item );
+			$item = $manager->getItem($entry->id);
+			$item = $this->addItemData($manager, $item, $entry, $item->getResourceType());
+			$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();
-			$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 = [];
-		}
-		else
+		} else
 		{
 			$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 			if( in_array( 'catalog', $include ) ) {
@@ -245,8 +244,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/tests/Admin/JsonAdm/Catalog/StandardTest.php

Spacing +71 added lines, -71 removed lines

@@ -22,7 +22,7 @@ 
 		$this->context = \TestHelperJadm::getContext();
 		$this->view = $this->context->getView();
 
-		$this->object = new \Aimeos\Admin\JsonAdm\Catalog\Standard( $this->context, $this->view, $templatePaths, 'catalog' );
+		$this->object = new \Aimeos\Admin\JsonAdm\Catalog\Standard($this->context, $this->view, $templatePaths, 'catalog');
 	}
 
 
@@ -30,142 +30,142 @@ 
 	{
 		$params = array(
 			'filter' => array(
-				'==' => array( 'catalog.code' => 'cafe' )
+				'==' => array('catalog.code' => 'cafe')
 			),
 			'include' => 'text'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 1, count( $result['data'] ) );
-		$this->assertEquals( 'catalog', $result['data'][0]['type'] );
-		$this->assertEquals( 6, count( $result['data'][0]['relationships']['text'] ) );
-		$this->assertEquals( 6, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals(1, count($result['data']));
+		$this->assertEquals('catalog', $result['data'][0]['type']);
+		$this->assertEquals(6, count($result['data'][0]['relationships']['text']));
+		$this->assertEquals(6, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testGetTree()
 	{
 		$params = array(
-			'id' => $this->getCatalogItem( 'root' )->getId(),
+			'id' => $this->getCatalogItem('root')->getId(),
 			'include' => 'catalog,text'
 		);
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
-		$response = $this->object->get( $this->view->request(), $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->get($this->view->request(), $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertEquals( 'catalog', $result['data']['type'] );
-		$this->assertEquals( 2, count( $result['data']['relationships']['catalog'] ) );
-		$this->assertEquals( 2, count( $result['included'] ) );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertEquals('catalog', $result['data']['type']);
+		$this->assertEquals(2, count($result['data']['relationships']['catalog']));
+		$this->assertEquals(2, count($result['included']));
 
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPatch()
 	{
-		$stub = $this->getCatalogMock( array( 'getItem', 'moveItem', 'saveItem' ) );
+		$stub = $this->getCatalogMock(array('getItem', 'moveItem', 'saveItem'));
 
-		$stub->expects( $this->once() )->method( 'moveItem' );
-		$stub->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $stub->createItem() ) );
-		$stub->expects( $this->exactly( 2 ) )->method( 'getItem' ) // 2x due to decorator
-			->will( $this->returnValue( $stub->createItem() ) );
+		$stub->expects($this->once())->method('moveItem');
+		$stub->expects($this->once())->method('saveItem')
+			->will($this->returnValue($stub->createItem()));
+		$stub->expects($this->exactly(2))->method('getItem') // 2x due to decorator
+			->will($this->returnValue($stub->createItem()));
 
 
-		$params = array( 'id' => '-1' );
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $this->view, $params );
-		$this->view->addHelper( 'param', $helper );
+		$params = array('id' => '-1');
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($this->view, $params);
+		$this->view->addHelper('param', $helper);
 
 		$body = '{"data": {"parentid": "1", "targetid": 2, "type": "catalog", "attributes": {"catalog.label": "test"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->patch( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->patch($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'catalog', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('catalog', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
 	public function testPost()
 	{
-		$stub = $this->getCatalogMock( array( 'getItem', 'insertItem' ) );
+		$stub = $this->getCatalogMock(array('getItem', 'insertItem'));
 
-		$stub->expects( $this->any() )->method( 'getItem' )
-			->will( $this->returnValue( $stub->createItem() ) );
-		$stub->expects( $this->once() )->method( 'insertItem' );
+		$stub->expects($this->any())->method('getItem')
+			->will($this->returnValue($stub->createItem()));
+		$stub->expects($this->once())->method('insertItem');
 
 
 		$body = '{"data": {"type": "catalog", "attributes": {"catalog.code": "test", "catalog.label": "Test catalog"}}}';
-		$request = $this->view->request()->withBody( $this->view->response()->createStreamFromString( $body ) );
+		$request = $this->view->request()->withBody($this->view->response()->createStreamFromString($body));
 
-		$response = $this->object->post( $request, $this->view->response() );
-		$result = json_decode( (string) $response->getBody(), true );
+		$response = $this->object->post($request, $this->view->response());
+		$result = json_decode((string) $response->getBody(), true);
 
 
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 1, count( $response->getHeader( 'Content-Type' ) ) );
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(1, count($response->getHeader('Content-Type')));
 
-		$this->assertEquals( 1, $result['meta']['total'] );
-		$this->assertArrayHasKey( 'data', $result );
-		$this->assertEquals( 'catalog', $result['data']['type'] );
+		$this->assertEquals(1, $result['meta']['total']);
+		$this->assertArrayHasKey('data', $result);
+		$this->assertEquals('catalog', $result['data']['type']);
 
-		$this->assertArrayNotHasKey( 'included', $result );
-		$this->assertArrayNotHasKey( 'errors', $result );
+		$this->assertArrayNotHasKey('included', $result);
+		$this->assertArrayNotHasKey('errors', $result);
 	}
 
 
-	protected function getCatalogItem( $code )
+	protected function getCatalogItem($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'catalog.code', $code ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'catalog.code', $code));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No catalog item with code "%1$s" found', $code ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No catalog item with code "%1$s" found', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getCatalogMock( array $methods )
+	protected function getCatalogMock(array $methods)
 	{
 		$name = 'ClientJsonAdmStandard';
-		$this->context->getConfig()->set( 'mshop/catalog/manager/name', $name );
+		$this->context->getConfig()->set('mshop/catalog/manager/name', $name);
 
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Catalog\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( $methods )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Catalog\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods($methods)
 			->getMock();
 
-		\Aimeos\MShop\Product\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Catalog\\Manager\\' . $name, $stub );
+		\Aimeos\MShop\Product\Manager\Factory::injectManager('\\Aimeos\\MShop\\Catalog\\Manager\\' . $name, $stub);
 
 		return $stub;
 	}