aimeos / ai-admin-jqadm

admin/jqadm/tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -11,17 +11,17 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', '1' );
+ini_set('display_errors', '1');
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_TIME, 'POSIX');
 
 
 require_once 'TestHelperJqadm.php';

admin/jqadm/src/Admin/JQAdm/Base.php

Spacing +71 added lines, -71 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths)
 	{
 		$this->context = $context;
 		$this->templatePaths = $templatePaths;
@@ -48,8 +48,8 @@ 
 	 */
 	public function getView()
 	{
-		if( !isset( $this->view ) ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'No view available' ) );
+		if (!isset($this->view)) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('No view available'));
 		}
 
 		return $this->view;
@@ -62,7 +62,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the admin output
 	 * @return \Aimeos\Admin\JQAdm\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
 		$this->view = $view;
 		return $this;
@@ -98,29 +98,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Admin\JQAdm\Catalog\Decorator\"
 	 * @return \Aimeos\Admin\JQAdm\Iface Admin object
 	 */
-	protected function addDecorators( \Aimeos\Admin\JQAdm\Iface $client, array $templatePaths,
-		array $decorators, $classprefix )
+	protected function addDecorators(\Aimeos\Admin\JQAdm\Iface $client, array $templatePaths,
+		array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Admin\\JQAdm\\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\JQAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid class name "%1$s"', $classname));
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$client = new $classname( $client, $this->context, $this->templatePaths );
+			$client = new $classname($client, $this->context, $this->templatePaths);
 
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ) );
+			if (!($client instanceof $iface)) {
+				throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -136,35 +136,35 @@ 
 	 * @param string $path Admin string in lower case, e.g. "catalog/detail/basic"
 	 * @return \Aimeos\Admin\JQAdm\Iface Admin object
 	 */
-	protected function addClientDecorators( \Aimeos\Admin\JQAdm\Iface $client, array $templatePaths, $path )
+	protected function addClientDecorators(\Aimeos\Admin\JQAdm\Iface $client, array $templatePaths, $path)
 	{
-		if( !is_string( $path ) || $path === '' ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid domain "%1$s"', $path ) );
+		if (!is_string($path) || $path === '') {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid domain "%1$s"', $path));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 		$config = $this->context->getConfig();
 
-		$decorators = $config->get( 'admin/jqadm/common/decorators/default', array() );
-		$excludes = $config->get( 'admin/jqadm/' . $path . '/decorators/excludes', array() );
+		$decorators = $config->get('admin/jqadm/common/decorators/default', array());
+		$excludes = $config->get('admin/jqadm/' . $path . '/decorators/excludes', array());
 
-		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\\JQAdm\\Common\\Decorator\\';
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Admin\\JQAdm\\Common\\Decorator\\';
-		$decorators = $config->get( 'admin/jqadm/' . $path . '/decorators/global', array() );
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$decorators = $config->get('admin/jqadm/' . $path . '/decorators/global', array());
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Admin\\JQAdm\\' . $localClass . '\\Decorator\\';
-		$decorators = $config->get( 'admin/jqadm/' . $path . '/decorators/local', array() );
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$decorators = $config->get('admin/jqadm/' . $path . '/decorators/local', array());
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		return $client;
 	}
@@ -177,35 +177,35 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-part object
 	 */
-	protected function createSubClient( $path, $name )
+	protected function createSubClient($path, $name)
 	{
-		$path = strtolower( $path );
+		$path = strtolower($path);
 
-		if( $name === null ) {
-			$name = $this->context->getConfig()->get( 'admin/jqadm/' . $path . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $this->context->getConfig()->get('admin/jqadm/' . $path . '/name', 'Standard');
 		}
 
-		if( empty( $name ) || ctype_alnum( $name ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Invalid characters in client name "%1$s"', $name ) );
+		if (empty($name) || ctype_alnum($name) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Invalid characters in client name "%1$s"', $name));
 		}
 
-		$subnames = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$subnames = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 
 		$classname = '\\Aimeos\\Admin\\JQAdm\\' . $subnames . '\\' . $name;
 		$interface = '\\Aimeos\\Admin\\JQAdm\\Iface';
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$object = new $classname( $this->context, $this->templatePaths );
+		$object = new $classname($this->context, $this->templatePaths);
 
-		if( ( $object instanceof $interface ) === false ) {
-			throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (($object instanceof $interface) === false) {
+			throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
-		$object = $this->addClientDecorators( $object, $this->templatePaths, $path );
-		$object->setView( $this->view );
+		$object = $this->addClientDecorators($object, $this->templatePaths, $path);
+		$object->setView($this->view);
 
 		return $object;
 	}
@@ -217,13 +217,13 @@ 
 	 * @param array $names List of parameter names
 	 * @return array Associative list of parameters names as key and their values
 	 */
-	protected function getClientParams( $names = array( 'resource', 'site', 'lang', 'fields', 'filter', 'page', 'sort' ) )
+	protected function getClientParams($names = array('resource', 'site', 'lang', 'fields', 'filter', 'page', 'sort'))
 	{
 		$list = array();
 
-		foreach( $names as $name )
+		foreach ($names as $name)
 		{
-			if( ( $val = $this->view->param( $name ) ) !== null ) {
+			if (($val = $this->view->param($name)) !== null) {
 				$list[$name] = $val;
 			}
 		}
@@ -258,12 +258,12 @@ 
 	 */
 	protected function getSubClients()
 	{
-		if( !isset( $this->subclients ) )
+		if (!isset($this->subclients))
 		{
 			$this->subclients = array();
 
-			foreach( $this->getSubClientNames() as $name ) {
-				$this->subclients[] = $this->getSubClient( $name );
+			foreach ($this->getSubClientNames() as $name) {
+				$this->subclients[] = $this->getSubClient($name);
 			}
 		}
 
@@ -289,11 +289,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;
 	}
@@ -305,24 +305,24 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( isset( $params['filter'] ) && isset( $params['filter']['key'] ) )
+		if (isset($params['filter']) && isset($params['filter']['key']))
 		{
 			$expr = array();
 			$existing = $criteria->getConditions();
 
-			foreach( (array) $params['filter']['key'] as $idx => $key )
+			foreach ((array) $params['filter']['key'] as $idx => $key)
 			{
-				if( $key != '' && isset( $params['filter']['op'][$idx] ) && $params['filter']['op'][$idx] != ''
-					&& isset( $params['filter']['val'][$idx] )
+				if ($key != '' && isset($params['filter']['op'][$idx]) && $params['filter']['op'][$idx] != ''
+					&& isset($params['filter']['val'][$idx])
 				) {
-					$expr[] = $criteria->compare( $params['filter']['op'][$idx], $key, $params['filter']['val'][$idx] );
+					$expr[] = $criteria->compare($params['filter']['op'][$idx], $key, $params['filter']['val'][$idx]);
 				}
 			}
 
 			$expr[] = $existing;
-			$criteria->setConditions( $criteria->combine( '&&', $expr ) );
+			$criteria->setConditions($criteria->combine('&&', $expr));
 		}
 	}
 
@@ -333,12 +333,12 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		$start = ( isset( $params['page']['offset'] ) ? $params['page']['offset'] : 0 );
-		$size = ( isset( $params['page']['limit'] ) ? $params['page']['limit'] : 100 );
+		$start = (isset($params['page']['offset']) ? $params['page']['offset'] : 0);
+		$size = (isset($params['page']['limit']) ? $params['page']['limit'] : 100);
 
-		$criteria->setSlice( $start, $size );
+		$criteria->setSlice($start, $size);
 	}
 
 
@@ -348,23 +348,23 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object
 	 * @param array $params List of criteria data with condition, sorting and paging
 	 */
-	private function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params )
+	private function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params)
 	{
-		if( !isset( $params['sort'] ) ) {
+		if (!isset($params['sort'])) {
 			return;
 		}
 
 		$sortation = array();
 
-		foreach( (array) $params['sort'] as $sort )
+		foreach ((array) $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 ); break;
+				$sortation[] = $criteria->sort('+', $sort); break;
 			}
 		}
 
-		$criteria->setSortations( $sortation );
+		$criteria->setSortations($sortation);
 	}
 }

admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Attribute/Standard.php

Spacing +53 added lines, -53 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->attributeBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->attributeBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/attribute/template-item';
 		$default = 'product/item-characteristic-attribute-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->attributeBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->attributeBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/attribute/template-item';
 		$default = 'product/item-characteristic-attribute-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->attributeBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->attributeBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/attribute/template-item';
 		$default = 'product/item-characteristic-attribute-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->attributeBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->attributeBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic-attribute' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-characteristic-attribute' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-characteristic-attribute' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-characteristic-attribute' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/attribute/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/characteristic/attribute/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/attribute/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/attribute/' . $type, $name );
+		return $this->createSubClient('product/characteristic/attribute/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -273,20 +273,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of attribute product IDs as keys and list items as values
 	 */
-	protected function getListItems( $prodid )
+	protected function getListItems($prodid)
 	{
-		$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', $prodid ),
-			$search->compare( '==', 'product.lists.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.code', 'default' ),
+			$search->compare('==', 'product.lists.parentid', $prodid),
+			$search->compare('==', 'product.lists.domain', 'attribute'),
+			$search->compare('==', 'product.lists.type.domain', 'attribute'),
+			$search->compare('==', 'product.lists.type.code', 'default'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -295,18 +295,18 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'characteristic/attribute', array() );
+		$data = (array) $view->param('characteristic/attribute', array());
 
-		if( empty( $data ) )
+		if (empty($data))
 		{
-			foreach( $view->item->getListItems( 'attribute', 'default' ) as $listItem )
+			foreach ($view->item->getListItems('attribute', 'default') as $listItem)
 			{
 				$refItem = $listItem->getRefItem();
-				$data['attribute.label'][] = ( $refItem ? $refItem->getLabel() : '' );
+				$data['attribute.label'][] = ($refItem ? $refItem->getLabel() : '');
 
-				foreach( $listItem->toArray() as $key => $value ) {
+				foreach ($listItem->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
@@ -321,39 +321,39 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$id = $view->item->getId();
-		$map = $this->getListItems( $id );
-		$listIds = (array) $view->param( 'characteristic/attribute/product.lists.id', array() );
+		$map = $this->getListItems($id);
+		$listIds = (array) $view->param('characteristic/attribute/product.lists.id', array());
 
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			if( isset( $map[$listid] ) ) {
-				unset( $map[$listid], $listIds[$pos] );
+			if (isset($map[$listid])) {
+				unset($map[$listid], $listIds[$pos]);
 			}
 		}
 
-		$manager->deleteItems( array_keys( $map ) );
+		$manager->deleteItems(array_keys($map));
 
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'default', array(), 'attribute' )->getId() );
-		$item->setDomain( 'attribute' );
-		$item->setParentId( $id );
+		$item->setTypeId($typeManager->findItem('default', array(), 'attribute')->getId());
+		$item->setDomain('attribute');
+		$item->setParentId($id);
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			$item->setId( null );
-			$item->setRefId( $view->param( 'characteristic/attribute/product.lists.refid/' . $pos ) );
-			$item->setPosition( $pos );
+			$item->setId(null);
+			$item->setRefId($view->param('characteristic/attribute/product.lists.refid/' . $pos));
+			$item->setPosition($pos);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-characteristic-attribute' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-characteristic-attribute' => $e->getMessage() );

admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Property/Standard.php

Spacing +55 added lines, -55 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->propertyBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->propertyBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/property/template-item';
 		$default = 'product/item-characteristic-property-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->propertyBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->propertyBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic-property' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-characteristic-property' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-characteristic-property' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-characteristic-property' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/characteristic/property/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/property/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/property/' . $type, $name );
+		return $this->createSubClient('product/characteristic/property/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -273,20 +273,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of property IDs as keys and property items as values
 	 */
-	protected function getProperties( $prodid )
+	protected function getProperties($prodid)
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.property.parentid', $prodid ),
-			$search->compare( '!=', 'product.property.type.code', $excludes ),
+			$search->compare('==', 'product.property.parentid', $prodid),
+			$search->compare('!=', 'product.property.type.code', $excludes),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -297,14 +297,14 @@ 
 	 */
 	protected function getPropertyTypes()
 	{
-		$excludes = array( 'package-length', 'package-height', 'package-width', 'package-weight' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property/type' );
+		$excludes = array('package-length', 'package-height', 'package-width', 'package-weight');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '!=', 'product.property.type.code', $excludes ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->compare('!=', 'product.property.type.code', $excludes));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -313,15 +313,15 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'characteristic/property', array() );
+		$data = (array) $view->param('characteristic/property', array());
 
-		if( empty( $data ) )
+		if (empty($data))
 		{
-			foreach( $this->getProperties( $view->item->getId() ) as $item )
+			foreach ($this->getProperties($view->item->getId()) as $item)
 			{
-				foreach( $item->toArray() as $key => $value ) {
+				foreach ($item->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
@@ -337,38 +337,38 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$id = $view->item->getId();
-		$map = $this->getProperties( $id );
-		$ids = (array) $view->param( 'characteristic/property/product.property.id', array() );
+		$map = $this->getProperties($id);
+		$ids = (array) $view->param('characteristic/property/product.property.id', array());
 
 		$item = $manager->createItem();
 
-		foreach( $ids as $pos => $propertyId )
+		foreach ($ids as $pos => $propertyId)
 		{
-			if( isset( $map[$propertyId] ) )
+			if (isset($map[$propertyId]))
 			{
 				$item = $map[$propertyId];
-				unset( $map[$propertyId] );
+				unset($map[$propertyId]);
 			}
 			else
 			{
-				$item->setId( null );
-				$item->setParentId( $id );
+				$item->setId(null);
+				$item->setParentId($id);
 			}
 
-			$lang = $view->param( 'characteristic/property/product.property.languageid/' . $pos, null );
+			$lang = $view->param('characteristic/property/product.property.languageid/' . $pos, null);
 
-			$item->setLanguageId( ( $lang ? $lang : null ) );
-			$item->setTypeId( $view->param( 'characteristic/property/product.property.typeid/' . $pos, null ) );
-			$item->setValue( $view->param( 'characteristic/property/product.property.value/' . $pos, '' ) );
+			$item->setLanguageId(($lang ? $lang : null));
+			$item->setTypeId($view->param('characteristic/property/product.property.typeid/' . $pos, null));
+			$item->setValue($view->param('characteristic/property/product.property.value/' . $pos, ''));
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 
-		$manager->deleteItems( array_keys( $map ) );
+		$manager->deleteItems(array_keys($map));
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -151,14 +151,12 @@ 
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-characteristic-property' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-characteristic-property' => $e->getMessage() );
@@ -353,8 +351,7 @@ 
 			{
 				$item = $map[$propertyId];
 				unset( $map[$propertyId] );
-			}
-			else
+			} else
 			{
 				$item->setId( null );
 				$item->setParentId( $id );

admin/jqadm/src/Admin/JQAdm/Product/Characteristic/Standard.php

Spacing +24 added lines, -24 removed lines

@@ -55,7 +55,7 @@ 
 	 * @category Developer
 	 */
 	private $subPartPath = 'admin/jqadm/product/characteristic/standard/subparts';
-	private $subPartNames = array( 'attribute', 'property' );
+	private $subPartNames = array('attribute', 'property');
 
 
 	/**
@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->characteristicBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->characteristicBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/characteristic/template-item';
 		$default = 'product/item-characteristic-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,31 +137,31 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
 			$view->characteristicBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->characteristicBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-characteristic' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-characteristic' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-characteristic' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-characteristic' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -176,7 +176,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/characteristic/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -251,7 +251,7 @@ 
 		 * @see admin/jqadm/product/characteristic/decorators/excludes
 		 * @see admin/jqadm/product/characteristic/decorators/global
 		 */
-		return $this->createSubClient( 'product/characteristic/' . $type, $name );
+		return $this->createSubClient('product/characteristic/' . $type, $name);
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -271,8 +271,8 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$view->characteristicData = (array) $view->param( 'characteristic', array() );;
+		$view->characteristicData = (array) $view->param('characteristic', array()); ;
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -150,14 +150,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-characteristic' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-characteristic' => $e->getMessage() );

admin/jqadm/src/Admin/JQAdm/Product/Price/Standard.php

Spacing +67 added lines, -67 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->priceBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->priceBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/price/template-item';
 		$default = 'product/item-price-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,18 +137,18 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$textManager = \Aimeos\MShop\Factory::createManager( $context, 'text' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$textManager = \Aimeos\MShop\Factory::createManager($context, 'text');
 
 		$manager->begin();
 		$textManager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->priceBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->priceBody .= $client->save();
 			}
 
@@ -156,19 +156,19 @@ 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-price' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-price' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-price' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
@@ -185,7 +185,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/price/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -260,7 +260,7 @@ 
 		 * @see admin/jqadm/product/price/decorators/excludes
 		 * @see admin/jqadm/product/price/decorators/global
 		 */
-		return $this->createSubClient( 'product/price/' . $type, $name );
+		return $this->createSubClient('product/price/' . $type, $name);
 	}
 
 
@@ -271,7 +271,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -282,13 +282,13 @@ 
 	 */
 	protected function getPriceTypes()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price/type');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'price.type.domain', 'product' ) );
-		$search->setSortations( array( $search->sort( '+', 'price.type.label' ) ) );
+		$search->setConditions($search->compare('==', 'price.type.domain', 'product'));
+		$search->setSortations(array($search->sort('+', 'price.type.label')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -297,27 +297,27 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'price', array() );
+		$data = (array) $view->param('price', array());
 
-		if( empty( $view->priceData ) && ( $id = $view->item->getId() ) !== null )
+		if (empty($view->priceData) && ($id = $view->item->getId()) !== null)
 		{
-			foreach( $view->item->getListItems( 'price' ) as $id => $listItem )
+			foreach ($view->item->getListItems('price') as $id => $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) === null ) {
+				if (($refItem = $listItem->getRefItem()) === null) {
 					continue;
 				}
 
 				$data['product.lists.id'][] = $id;
 
-				foreach( $refItem->toArray() as $key => $value ) {
+				foreach ($refItem->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
 		}
 
-		if( !isset( $data['price.currencyid'] ) ) { // show at least one block
+		if (!isset($data['price.currencyid'])) { // show at least one block
 			$data['price.currencyid'][] = $this->getContext()->getLocale()->getCurrencyId();
 		}
 
@@ -331,40 +331,40 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$id = $view->item->getId();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$listTypeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$listTypeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
-		$listIds = (array) $view->param( 'price/product.lists.id', array() );
-		$listItems = $manager->getItem( $id, array( 'price' ) )->getListItems( 'price' );
+		$listIds = (array) $view->param('price/product.lists.id', array());
+		$listItems = $manager->getItem($id, array('price'))->getListItems('price');
 
 
 		$listItem = $listManager->createItem();
-		$listItem->setTypeId( $listTypeManager->findItem( 'default', array(), 'price' )->getId() );
-		$listItem->setDomain( 'price' );
-		$listItem->setParentId( $id );
-		$listItem->setStatus( 1 );
+		$listItem->setTypeId($listTypeManager->findItem('default', array(), 'price')->getId());
+		$listItem->setDomain('price');
+		$listItem->setParentId($id);
+		$listItem->setStatus(1);
 
 		$priceItem = $priceManager->createItem();
-		$priceItem->setDomain( 'product' );
-		$priceItem->setStatus( 1 );
+		$priceItem->setDomain('product');
+		$priceItem->setStatus(1);
 
 
-		foreach( $listIds as $idx => $listid )
+		foreach ($listIds as $idx => $listid)
 		{
-			if( !isset( $listItems[$listid] ) )
+			if (!isset($listItems[$listid]))
 			{
 				$litem = $listItem;
-				$litem->setId( null );
+				$litem->setId(null);
 
 				$item = $priceItem;
-				$item->setId( null );
+				$item->setId(null);
 			}
 			else
 			{
@@ -372,32 +372,32 @@ 
 				$item = $litem->getRefItem();
 			}
 
-			$item->setLabel( $view->param( 'price/price.label/' . $idx ) );
-			$item->setTypeId( $view->param( 'price/price.typeid/' . $idx ) );
-			$item->setCurrencyId( $view->param( 'price/price.currencyid/' . $idx ) );
-			$item->setQuantity( $view->param( 'price/price.quantity/' . $idx ) );
-			$item->setValue( $view->param( 'price/price.value/' . $idx ) );
-			$item->setCosts( $view->param( 'price/price.costs/' . $idx ) );
-			$item->setRebate( $view->param( 'price/price.rebate/' . $idx ) );
-			$item->setTaxRate( $view->param( 'price/price.taxrate/' . $idx ) );
+			$item->setLabel($view->param('price/price.label/' . $idx));
+			$item->setTypeId($view->param('price/price.typeid/' . $idx));
+			$item->setCurrencyId($view->param('price/price.currencyid/' . $idx));
+			$item->setQuantity($view->param('price/price.quantity/' . $idx));
+			$item->setValue($view->param('price/price.value/' . $idx));
+			$item->setCosts($view->param('price/price.costs/' . $idx));
+			$item->setRebate($view->param('price/price.rebate/' . $idx));
+			$item->setTaxRate($view->param('price/price.taxrate/' . $idx));
 
-			$priceManager->saveItem( $item );
+			$priceManager->saveItem($item);
 
-			$litem->setPosition( $idx );
-			$litem->setRefId( $item->getId() );
+			$litem->setPosition($idx);
+			$litem->setRefId($item->getId());
 
-			$listManager->saveItem( $litem, false );
+			$listManager->saveItem($litem, false);
 		}
 
 
 		$rmIds = array();
-		$rmListIds = array_diff( array_keys( $listItems ), $listIds );
+		$rmListIds = array_diff(array_keys($listItems), $listIds);
 
-		foreach( $rmListIds as $id ) {
+		foreach ($rmListIds as $id) {
 			$rmIds[] = $listItems[$id]->getRefId();
 		}
 
-		$listManager->deleteItems( $rmListIds  );
-		$priceManager->deleteItems( $rmIds  );
+		$listManager->deleteItems($rmListIds);
+		$priceManager->deleteItems($rmIds);
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -155,16 +155,14 @@ 
 			$textManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-price' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$textManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-price' => $e->getMessage() );
@@ -365,8 +363,7 @@ 
 
 				$item = $priceItem;
 				$item->setId( null );
-			}
-			else
+			} else
 			{
 				$litem = $listItems[$listid];
 				$item = $litem->getRefItem();

admin/jqadm/src/Admin/JQAdm/Product/Download/Standard.php

Spacing +122 added lines, -122 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -112,35 +112,35 @@ 
 	public function delete()
 	{
 		$view = $this->getView();
-		$listManager = \Aimeos\MShop\Factory::createManager( $context = $this->getContext(), 'product/lists' );
+		$listManager = \Aimeos\MShop\Factory::createManager($context = $this->getContext(), 'product/lists');
 		$search = $listManager->createSearch();
 
-		foreach( (array) $view->param( 'id' ) as $id )
+		foreach ((array) $view->param('id') as $id)
 		{
-			$listItems = $this->getListItems( $id );
-			$items = $this->getAttributeItems( $listItems );
+			$listItems = $this->getListItems($id);
+			$items = $this->getAttributeItems($listItems);
 
-			foreach( $listItems as $listid => $listItem )
+			foreach ($listItems as $listid => $listItem)
 			{
 				$refId = $listItem->getRefId();
 
 				$expr = array(
-					$search->compare( '==', 'product.lists.refid', $refId ),
-					$search->compare( '==', 'product.lists.domain', 'attribute' ),
-					$search->compare( '==', 'product.lists.type.code', 'hidden' ),
-					$search->compare( '==', 'product.lists.type.domain', 'attribute' ),
+					$search->compare('==', 'product.lists.refid', $refId),
+					$search->compare('==', 'product.lists.domain', 'attribute'),
+					$search->compare('==', 'product.lists.type.code', 'hidden'),
+					$search->compare('==', 'product.lists.type.domain', 'attribute'),
 				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
-				$result = $listManager->aggregate( $search, 'product.lists.refid' );
+				$search->setConditions($search->combine('&&', $expr));
+				$result = $listManager->aggregate($search, 'product.lists.refid');
 
-				if( isset( $items[$refId] ) && $result[$refId] == 1 ) {
-					$listItem->setRefItem( $items[$refId] );
+				if (isset($items[$refId]) && $result[$refId] == 1) {
+					$listItem->setRefItem($items[$refId]);
 				} else {
-					unset( $listItems[$id] );
+					unset($listItems[$id]);
 				}
 			}
 
-			$this->cleanupItems( $listItems, array() );
+			$this->cleanupItems($listItems, array());
 		}
 	}
 
@@ -154,17 +154,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->downloadBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->downloadBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/download/template-item';
 		$default = 'product/item-download-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -178,18 +178,18 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$attrManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$attrManager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
 
 		$manager->begin();
 		$attrManager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->downloadBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->downloadBody .= $client->save();
 			}
 
@@ -197,19 +197,19 @@ 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-download' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-download' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$attrManager->rollback();
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-download' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-download' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 
 			$attrManager->rollback();
 			$manager->rollback();
@@ -226,7 +226,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/download/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -301,7 +301,7 @@ 
 		 * @see admin/jqadm/product/download/decorators/excludes
 		 * @see admin/jqadm/product/download/decorators/global
 		 */
-		return $this->createSubClient( 'product/download/' . $type, $name );
+		return $this->createSubClient('product/download/' . $type, $name);
 	}
 
 
@@ -311,29 +311,29 @@ 
 	 * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 * @param array $listIds List of IDs of the still used list items
 	 */
-	protected function cleanupItems( array $listItems, array $listIds )
+	protected function cleanupItems(array $listItems, array $listIds)
 	{
 		$context = $this->getContext();
-		$fs = $context->getFilesystemManager()->get( 'fs-secure' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$fs = $context->getFilesystemManager()->get('fs-secure');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 
 		$rmItems = array();
-		$rmListIds = array_diff( array_keys( $listItems ), $listIds );
+		$rmListIds = array_diff(array_keys($listItems), $listIds);
 
-		foreach( $rmListIds as $rmListId )
+		foreach ($rmListIds as $rmListId)
 		{
-			if( ( $item = $listItems[$rmListId]->getRefItem() ) !== null )
+			if (($item = $listItems[$rmListId]->getRefItem()) !== null)
 			{
-				if( $item->getCode() != '' && $fs->has( $item->getCode() ) ) {
-					$fs->rm( $item->getCode() );
+				if ($item->getCode() != '' && $fs->has($item->getCode())) {
+					$fs->rm($item->getCode());
 				}
 				$rmItems[] = $item->getId();
 			}
 		}
 
-		$listManager->deleteItems( $rmListIds  );
-		$manager->deleteItems( $rmItems  );
+		$listManager->deleteItems($rmListIds);
+		$manager->deleteItems($rmItems);
 	}
 
 
@@ -345,13 +345,13 @@ 
 	protected function createItem()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'attribute/type');
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'download', array(), 'product' )->getId() );
-		$item->setDomain( 'product' );
-		$item->setStatus( 1 );
+		$item->setTypeId($typeManager->findItem('download', array(), 'product')->getId());
+		$item->setDomain('product');
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -363,17 +363,17 @@ 
 	 * @param string $id Parent ID for the new list item
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface New list item object
 	 */
-	protected function createListItem( $id )
+	protected function createListItem($id)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'hidden', array(), 'attribute' )->getId() );
-		$item->setDomain( 'attribute' );
-		$item->setParentId( $id );
-		$item->setStatus( 1 );
+		$item->setTypeId($typeManager->findItem('hidden', array(), 'attribute')->getId());
+		$item->setDomain('attribute');
+		$item->setParentId($id);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -385,27 +385,27 @@ 
 	 * @param array $listItems List of list items with IDs as key and items implementing \Aimeos\MShop\Common\Item\List\Iface as values
 	 * @return array List of attribute items with ID as key and items implementing \Aimeos\MShop\Attribute\Item\Iface as values
 	 */
-	protected function getAttributeItems( array $listItems )
+	protected function getAttributeItems(array $listItems)
 	{
 		$refIds = array();
 
-		foreach( $listItems as $item ) {
+		foreach ($listItems as $item) {
 			$refIds[] = $item->getRefId();
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.id', $refIds ),
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.type.domain', 'product' ),
-			$search->compare( '==', 'attribute.type.code', 'download' ),
+			$search->compare('==', 'attribute.id', $refIds),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.type.domain', 'product'),
+			$search->compare('==', 'attribute.type.code', 'download'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -415,20 +415,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of bundle product IDs as keys and list items as values
 	 */
-	protected function getListItems( $prodid )
+	protected function getListItems($prodid)
 	{
-		$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', $prodid ),
-			$search->compare( '==', 'product.lists.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.domain', 'attribute' ),
-			$search->compare( '==', 'product.lists.type.code', 'hidden' ),
+			$search->compare('==', 'product.lists.parentid', $prodid),
+			$search->compare('==', 'product.lists.domain', 'attribute'),
+			$search->compare('==', 'product.lists.type.domain', 'attribute'),
+			$search->compare('==', 'product.lists.type.code', 'hidden'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -439,7 +439,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -448,29 +448,29 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$view->downloadData = (array) $view->param( 'download', array() );
+		$view->downloadData = (array) $view->param('download', array());
 
-		if( !empty( $view->downloadData ) ) {
+		if (!empty($view->downloadData)) {
 			return;
 		}
 
 		$data = array();
-		$listItems = $this->getListItems( $view->item->getId() );
-		$attrItems = $this->getAttributeItems( $listItems );
+		$listItems = $this->getListItems($view->item->getId());
+		$attrItems = $this->getAttributeItems($listItems);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( !isset( $attrItems[$listItem->getRefId()] ) ) {
+			if (!isset($attrItems[$listItem->getRefId()])) {
 				continue;
 			}
 
-			foreach( $listItem->toArray() as $key => $value ) {
+			foreach ($listItem->toArray() as $key => $value) {
 				$data[$key] = $value;
 			}
 
-			foreach( $attrItems[$listItem->getRefId()]->toArray() as $key => $value ) {
+			foreach ($attrItems[$listItem->getRefId()]->toArray() as $key => $value) {
 				$data[$key] = $value;
 			}
 
@@ -478,12 +478,12 @@ 
 
 			try
 			{
-				$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+				$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-				$data['time'] = $fs->time( $data['path'] );
-				$data['size'] = $fs->size( $data['path'] );
+				$data['time'] = $fs->time($data['path']);
+				$data['size'] = $fs->size($data['path']);
 			}
-			catch( \Exception $e ) { ; }
+			catch (\Exception $e) {; }
 		}
 
 		$view->downloadData = $data;
@@ -497,22 +497,22 @@ 
 	 * @param string $path Path the file should be stored at
 	 * @return string Path to the uploaded file
 	 */
-	protected function storeFile( \Psr\Http\Message\UploadedFileInterface $file, $path )
+	protected function storeFile(\Psr\Http\Message\UploadedFileInterface $file, $path)
 	{
-		$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+		$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 
-		if( $path == null )
+		if ($path == null)
 		{
-			$ext = pathinfo( $file->getClientFilename(), PATHINFO_EXTENSION );
-			$hash = md5( $file->getClientFilename() . microtime( true ) );
-			$path = sprintf( '%s/%s/%s.%s', $hash[0], $hash[1], $hash, $ext );
+			$ext = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION);
+			$hash = md5($file->getClientFilename() . microtime(true));
+			$path = sprintf('%s/%s/%s.%s', $hash[0], $hash[1], $hash, $ext);
 
-			if( !$fs->isdir( $hash[0] . '/' . $hash[1] ) ) {
-				$fs->mkdir( $hash[0] . '/' . $hash[1] );
+			if (!$fs->isdir($hash[0] . '/' . $hash[1])) {
+				$fs->mkdir($hash[0] . '/' . $hash[1]);
 			}
 		}
 
-		$fs->writes( $path, $file->getStream()->detach() );
+		$fs->writes($path, $file->getStream()->detach());
 
 		return $path;
 	}
@@ -523,49 +523,49 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
 		$attrIds = array();
 		$id = $view->item->getId();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$attrManager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$attrManager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 
-		$listItems = $this->getListItems( $id );
-		$listId = $view->param( 'download/product.lists.id' );
+		$listItems = $this->getListItems($id);
+		$listId = $view->param('download/product.lists.id');
 
-		if( isset( $listItems[$listId] ) ) {
+		if (isset($listItems[$listId])) {
 			$litem = $listItems[$listId];
 		} else {
-			$litem = $this->createListItem( $id );
+			$litem = $this->createListItem($id);
 		}
 
-		if( ( $attrId = $view->param( 'download/attribute.id' ) ) != '' ) {
-			$item = $attrManager->getItem( $attrId );
+		if (($attrId = $view->param('download/attribute.id')) != '') {
+			$item = $attrManager->getItem($attrId);
 		} else {
 			$item = $this->createItem();
 		}
 
-		if( ( $file = $view->value( (array) $view->request()->getUploadedFiles(), 'download/file' ) ) !== null
+		if (($file = $view->value((array) $view->request()->getUploadedFiles(), 'download/file')) !== null
 			&& $file->getError() === UPLOAD_ERR_OK
 		) {
-			$path = ( $view->param( 'download/overwrite' ) == 1 ? $item->getCode() : null );
-			$item->setCode( $this->storeFile( $file, $path ) );
+			$path = ($view->param('download/overwrite') == 1 ? $item->getCode() : null);
+			$item->setCode($this->storeFile($file, $path));
 		}
 
-		if( ( $label = $view->param( 'download/attribute.label' ) ) != '' )
+		if (($label = $view->param('download/attribute.label')) != '')
 		{
-			$item->setLabel( $label );
-			$attrManager->saveItem( $item );
+			$item->setLabel($label);
+			$attrManager->saveItem($item);
 
-			$litem->setPosition( 0 );
-			$litem->setRefId( $item->getId() );
-			$litem->setStatus( $view->param( 'download/product.lists.status' ) );
-			$listManager->saveItem( $litem );
+			$litem->setPosition(0);
+			$litem->setRefId($item->getId());
+			$litem->setStatus($view->param('download/product.lists.status'));
+			$listManager->saveItem($litem);
 		}
 
-		$this->cleanupItems( $listItems, array( $listId ) );
+		$this->cleanupItems($listItems, array($listId));
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -196,16 +196,14 @@ 
 			$attrManager->commit();
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-download' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 
 			$attrManager->rollback();
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-download' => $e->getMessage() );
@@ -482,8 +480,7 @@ 
 
 				$data['time'] = $fs->time( $data['path'] );
 				$data['size'] = $fs->size( $data['path'] );
-			}
-			catch( \Exception $e ) { ; }
+			} catch( \Exception $e ) { ; }
 		}
 
 		$view->downloadData = $data;

admin/jqadm/src/Admin/JQAdm/Product/Bundle/Standard.php

Spacing +54 added lines, -54 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->bundleBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->bundleBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/bundle/template-item';
 		$default = 'product/item-bundle-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->bundleBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->bundleBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-bundle' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-bundle' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-bundle' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-bundle' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/bundle/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/bundle/decorators/excludes
 		 * @see admin/jqadm/product/bundle/decorators/global
 		 */
-		return $this->createSubClient( 'product/bundle/' . $type, $name );
+		return $this->createSubClient('product/bundle/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -273,20 +273,20 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of bundle product IDs as keys and list items as values
 	 */
-	protected function getListItems( $prodid )
+	protected function getListItems($prodid)
 	{
-		$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', $prodid ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type.code', 'default' ),
+			$search->compare('==', 'product.lists.parentid', $prodid),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.type.domain', 'product'),
+			$search->compare('==', 'product.lists.type.code', 'default'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -295,18 +295,18 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
-		$data = (array) $view->param( 'bundle', array() );
+		$data = (array) $view->param('bundle', array());
 
-		if( empty( $data ) )
+		if (empty($data))
 		{
-			foreach( $view->item->getListItems( 'product', 'default' ) as $listItem )
+			foreach ($view->item->getListItems('product', 'default') as $listItem)
 			{
 				$refItem = $listItem->getRefItem();
-				$data['product.label'][] = ( $refItem ? $refItem->getLabel() : '' );
+				$data['product.label'][] = ($refItem ? $refItem->getLabel() : '');
 
-				foreach( $listItem->toArray() as $key => $value ) {
+				foreach ($listItem->toArray() as $key => $value) {
 					$data[$key][] = $value;
 				}
 			}
@@ -321,43 +321,43 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		if( $view->item->getType() !== 'bundle' ) {
+		if ($view->item->getType() !== 'bundle') {
 			return;
 		}
 
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$typeManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
 		$id = $view->item->getId();
-		$map = $this->getListItems( $id );
-		$listIds = (array) $view->param( 'bundle/product.lists.id', array() );
+		$map = $this->getListItems($id);
+		$listIds = (array) $view->param('bundle/product.lists.id', array());
 
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			if( isset( $map[$listid] ) ) {
-				unset( $map[$listid], $listIds[$pos] );
+			if (isset($map[$listid])) {
+				unset($map[$listid], $listIds[$pos]);
 			}
 		}
 
-		$manager->deleteItems( array_keys( $map ) );
+		$manager->deleteItems(array_keys($map));
 
 
 		$item = $manager->createItem();
-		$item->setTypeId( $typeManager->findItem( 'default', array(), 'product' )->getId() );
-		$item->setDomain( 'product' );
-		$item->setParentId( $id );
+		$item->setTypeId($typeManager->findItem('default', array(), 'product')->getId());
+		$item->setDomain('product');
+		$item->setParentId($id);
 
-		foreach( $listIds as $pos => $listid )
+		foreach ($listIds as $pos => $listid)
 		{
-			$item->setId( null );
-			$item->setRefId( $view->param( 'bundle/product.lists.refid/' . $pos ) );
-			$item->setPosition( $pos );
+			$item->setId(null);
+			$item->setRefId($view->param('bundle/product.lists.refid/' . $pos));
+			$item->setPosition($pos);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-bundle' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-bundle' => $e->getMessage() );

admin/jqadm/src/Admin/JQAdm/Product/Stock/Standard.php

Spacing +45 added lines, -45 removed lines

@@ -67,17 +67,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->stockBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->stockBody .= $client->copy();
 		}
 
 		$tplconf = 'admin/jqadm/product/stock/template-item';
 		$default = 'product/item-stock-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -90,17 +90,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->stockBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->stockBody .= $client->create();
 		}
 
 		$tplconf = 'admin/jqadm/product/stock/template-item';
 		$default = 'product/item-stock-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,17 +113,17 @@ 
 	{
 		$view = $this->getView();
 
-		$this->setData( $view );
+		$this->setData($view);
 		$view->stockBody = '';
 
-		foreach( $this->getSubClients() as $client ) {
+		foreach ($this->getSubClients() as $client) {
 			$view->stockBody .= $client->get();
 		}
 
 		$tplconf = 'admin/jqadm/product/stock/template-item';
 		$default = 'product/item-stock-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -137,32 +137,32 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/stock');
 		$manager->begin();
 
 		try
 		{
-			$this->updateItems( $view );
+			$this->updateItems($view);
 			$view->stockBody = '';
 
-			foreach( $this->getSubClients() as $client ) {
+			foreach ($this->getSubClients() as $client) {
 				$view->stockBody .= $client->save();
 			}
 
 			$manager->commit();
 			return;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( 'product-item-stock' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$error = array('product-item-stock' => $context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
-			$error = array( 'product-item-stock' => $e->getMessage() );
-			$view->errors = $view->get( 'errors', array() ) + $error;
+			$context->getLogger()->log($e->getMessage() . ' - ' . $e->getTraceAsString());
+			$error = array('product-item-stock' => $e->getMessage());
+			$view->errors = $view->get('errors', array()) + $error;
 			$manager->rollback();
 		}
 
@@ -177,7 +177,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Admin\JQAdm\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** admin/jqadm/product/stock/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product JQAdm client
@@ -252,7 +252,7 @@ 
 		 * @see admin/jqadm/product/stock/decorators/excludes
 		 * @see admin/jqadm/product/stock/decorators/global
 		 */
-		return $this->createSubClient( 'product/stock/' . $type, $name );
+		return $this->createSubClient('product/stock/' . $type, $name);
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -272,28 +272,28 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function setData( \Aimeos\MW\View\Iface $view )
+	protected function setData(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
-		$whManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock/warehouse' );
+		$whManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock/warehouse');
 
-		$view->stockWarehouses = $whManager->searchItems( $whManager->createSearch() );
-		$view->stockData = (array) $view->param( 'stock', array() );
+		$view->stockWarehouses = $whManager->searchItems($whManager->createSearch());
+		$view->stockData = (array) $view->param('stock', array());
 
-		if( !empty( $view->stockData ) || ( $id = $view->item->getId() ) === null ) {
+		if (!empty($view->stockData) || ($id = $view->item->getId()) === null) {
 			return;
 		}
 
 		$data = array();
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $id ) );
-		$search->setSortations( array( $search->sort( '+', 'product.stock.warehouse.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $id));
+		$search->setSortations(array($search->sort('+', 'product.stock.warehouse.code')));
 
-		foreach( $manager->searchItems( $search ) as $item )
+		foreach ($manager->searchItems($search) as $item)
 		{
-			foreach( $item->toArray() as $key => $value ) {
+			foreach ($item->toArray() as $key => $value) {
 				$data[$key][] = $value;
 			}
 		}
@@ -307,32 +307,32 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object with helpers and assigned parameters
 	 */
-	protected function updateItems( \Aimeos\MW\View\Iface $view )
+	protected function updateItems(\Aimeos\MW\View\Iface $view)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $view->item->getId() ) );
-		$items = $manager->searchitems( $search );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $view->item->getId()));
+		$items = $manager->searchitems($search);
 
-		$list = (array) $view->param( 'stock/product.stock.id', array() );
+		$list = (array) $view->param('stock/product.stock.id', array());
 
-		foreach( $list as $idx => $id )
+		foreach ($list as $idx => $id)
 		{
-			if( !isset( $items[$id] ) ) {
+			if (!isset($items[$id])) {
 				$item = $manager->createItem();
 			} else {
 				$item = $items[$id];
 			}
 
-			$item->setParentId( $view->item->getId() );
-			$item->setWarehouseId( $view->param( 'stock/product.stock.warehouseid/' . $idx ) );
-			$item->setStocklevel( $view->param( 'stock/product.stock.stocklevel/' . $idx ) );
-			$item->setDateBack( $view->param( 'stock/product.stock.dateback/' . $idx ) );
+			$item->setParentId($view->item->getId());
+			$item->setWarehouseId($view->param('stock/product.stock.warehouseid/' . $idx));
+			$item->setStocklevel($view->param('stock/product.stock.stocklevel/' . $idx));
+			$item->setDateBack($view->param('stock/product.stock.dateback/' . $idx));
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 
-		$manager->deleteItems( array_diff( array_keys( $items ), $list ) );
+		$manager->deleteItems(array_diff(array_keys($items), $list));
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -151,14 +151,12 @@
 
 			$manager->commit();
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'product-item-stock' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', array() ) + $error;
 			$manager->rollback();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . ' - ' . $e->getTraceAsString() );
 			$error = array( 'product-item-stock' => $e->getMessage() );