aimeos / ai-controller-jobs

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Catalog/Standard.php

Spacing +53 added lines, -53 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/catalog/listtypes
 		 * Names of the catalog list types that are updated or removed
@@ -68,26 +68,26 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/catalog/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key );
+		$this->listTypes = $context->getConfig()->get($key);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'catalog/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'catalog/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'catalog.lists.type.domain', 'product' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'catalog.lists.type.domain', 'product'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
-		$this->cache = $this->getCache( 'catalog' );
+		$this->cache = $this->getCache('catalog');
 	}
 
 
@@ -98,11 +98,11 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'catalog' );
-		$listManager = \Aimeos\MShop::create( $context, 'catalog/lists' );
+		$manager = \Aimeos\MShop::create($context, 'catalog');
+		$listManager = \Aimeos\MShop::create($context, 'catalog/lists');
 
 		/** controller/common/product/import/csv/separator
 		 * Single separator character for multiple entries in one field of the import file
@@ -122,7 +122,7 @@ 
 		 * @category Developer
 		 * @see controller/common/product/import/csv/domains
 		 */
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
@@ -130,57 +130,57 @@ 
 		{
 			$listMap = [];
 			$prodid = $product->getId();
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $this->getListItems( $prodid, $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $this->getListItems($prodid, $this->listTypes);
 
-			foreach( $listItems as $listItem ) {
-				$listMap[ $listItem->getParentId() ][ $listItem->getType() ] = $listItem;
+			foreach ($listItems as $listItem) {
+				$listMap[$listItem->getParentId()][$listItem->getType()] = $listItem;
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$codes = explode( $separator, $this->getValue( $list, 'catalog.code', '' ) );
-				$listtype = $this->getValue( $list, 'catalog.lists.type', 'default' );
+				$codes = explode($separator, $this->getValue($list, 'catalog.code', ''));
+				$listtype = $this->getValue($list, 'catalog.lists.type', 'default');
 
-				foreach( $codes as $code )
+				foreach ($codes as $code)
 				{
-					$code = trim( $code );
+					$code = trim($code);
 
-					if( ( $catid = $this->cache->get( $code ) ) === null )
+					if (($catid = $this->cache->get($code)) === null)
 					{
 						$msg = 'No category for code "%1$s" available when importing product with code "%2$s"';
-						throw new \Aimeos\Controller\Jobs\Exception( sprintf( $msg, $code, $product->getCode() ) );
+						throw new \Aimeos\Controller\Jobs\Exception(sprintf($msg, $code, $product->getCode()));
 					}
 
 					$list['catalog.lists.parentid'] = $catid;
 					$list['catalog.lists.refid'] = $prodid;
 					$list['catalog.lists.domain'] = 'product';
 
-					if( isset( $listMap[$catid][$listtype] ) )
+					if (isset($listMap[$catid][$listtype]))
 					{
 						$listItem = $listMap[$catid][$listtype];
-						unset( $listItems[ $listItem->getId() ] );
+						unset($listItems[$listItem->getId()]);
 					}
 					else
 					{
-						$listItem = $listManager->createItem()->setType( $listtype );
+						$listItem = $listManager->createItem()->setType($listtype);
 					}
 
-					$listItem = $listItem->setPosition( $pos++ )->fromArray( $list );
-					$listManager->saveItem( $listItem, false );
+					$listItem = $listItem->setPosition($pos++)->fromArray($list);
+					$listManager->saveItem($listItem, false);
 				}
 			}
 
-			$listManager->deleteItems( array_keys( $listItems ) );
-			$data = $this->getObject()->process( $product, $data );
+			$listManager->deleteItems(array_keys($listItems));
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -197,13 +197,13 @@ 
 	 * @param integer $pos Computed position of the list item in the associated list of items
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addListItemDefaults( array $list, $pos )
+	protected function addListItemDefaults(array $list, $pos)
 	{
-		if( !isset( $list['catalog.lists.position'] ) ) {
+		if (!isset($list['catalog.lists.position'])) {
 			$list['catalog.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['catalog.lists.status'] ) ) {
+		if (!isset($list['catalog.lists.status'])) {
 			$list['catalog.lists.status'] = 1;
 		}
 
@@ -217,16 +217,16 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapped data
 	 * @return boolean True if the entry is valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'catalog.code' ) === null ) {
+		if ($this->getValue($list, 'catalog.code') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'catalog.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'catalog.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'catalog list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'catalog list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;
@@ -240,24 +240,24 @@ 
 	 * @param array|null $types List of catalog list types
 	 * @return array List of catalog list items
 	 */
-	protected function getListItems( $prodid, $types )
+	protected function getListItems($prodid, $types)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'catalog/lists');
 		$search = $manager->createSearch();
 
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 		);
 
-		if( $types !== null ) {
-			$expr[] = $search->compare( '==', 'catalog.lists.type', $types );
+		if ($types !== null) {
+			$expr[] = $search->compare('==', 'catalog.lists.type', $types);
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'catalog.lists.position' ) ) );
-		$search->setSlice( 0, 0x7FFFFFFF );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'catalog.lists.position')));
+		$search->setSlice(0, 0x7FFFFFFF);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Media/Standard.php

Spacing +47 added lines, -47 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/media/listtypes
 		 * Names of the product list types for media that are updated or removed
@@ -68,32 +68,32 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/media/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key );
+		$this->listTypes = $context->getConfig()->get($key);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'product/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'product.lists.type.domain', 'media' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'product.lists.type.domain', 'media'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
 
-		$manager = \Aimeos\MShop::create( $context, 'media/type' );
+		$manager = \Aimeos\MShop::create($context, 'media/type');
 
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'media.type.domain', 'product' ) );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'product'));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -106,60 +106,60 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'media' );
-		$listManager = \Aimeos\MShop::create( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop::create($context, 'media');
+		$listManager = \Aimeos\MShop::create($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $product->getListItems( 'media', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $product->getListItems('media', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getUrl() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getUrl()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$type = $this->getValue( $list, 'media.type', 'default' );
-			$listtype = $this->getValue( $list, 'product.lists.type', 'default' );
-			$urls = explode( $separator, $this->getValue( $list, 'media.url', '' ) );
+			$type = $this->getValue($list, 'media.type', 'default');
+			$listtype = $this->getValue($list, 'product.lists.type', 'default');
+			$urls = explode($separator, $this->getValue($list, 'media.url', ''));
 
-			foreach( $urls as $url )
+			foreach ($urls as $url)
 			{
-				$url = trim( $url );
+				$url = trim($url);
 
-				if( isset( $listMap[$url][$type][$listtype] ) )
+				if (isset($listMap[$url][$type][$listtype]))
 				{
 					$listItem = $listMap[$url][$type][$listtype];
 					$refItem = $listItem->getRefItem();
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
-					$listItem = $listManager->createItem()->setType( $listtype );
-					$refItem = $manager->createItem()->setType( $type );
+					$listItem = $listManager->createItem()->setType($listtype);
+					$refItem = $manager->createItem()->setType($type);
 				}
 
-				$listItem = $listItem->setPosition( $pos++ )->fromArray( $list );
-				$refItem = $refItem->setLabel( $url )->setPreview( $url )->fromArray( $list )->setUrl( $url );
+				$listItem = $listItem->setPosition($pos++)->fromArray($list);
+				$refItem = $refItem->setLabel($url)->setPreview($url)->fromArray($list)->setUrl($url);
 
-				$product->addListItem( 'media', $listItem, $refItem );
+				$product->addListItem('media', $listItem, $refItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -169,22 +169,22 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'media.url' ) === null ) {
+		if ($this->getValue($list, 'media.url') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'product.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'product.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
-		if( ( $type = $this->getValue( $list, 'media.type' ) ) && !isset( $this->types[$type] ) )
+		if (($type = $this->getValue($list, 'media.type')) && !isset($this->types[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'media' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'media');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Price/Standard.php

Spacing +45 added lines, -45 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/price/listtypes
 		 * Names of the product list types for prices that are updated or removed
@@ -68,32 +68,32 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/price/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key );
+		$this->listTypes = $context->getConfig()->get($key);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'product/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'product.lists.type.domain', 'price' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'product.lists.type.domain', 'price'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
 
-		$manager = \Aimeos\MShop::create( $context, 'price/type' );
+		$manager = \Aimeos\MShop::create($context, 'price/type');
 
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'price.type.domain', 'product' ) );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'price.type.domain', 'product'));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -106,55 +106,55 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$listManager = \Aimeos\MShop::create( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'price' );
+		$listManager = \Aimeos\MShop::create($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop::create($this->getContext(), 'price');
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $product->getListItems( 'price', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $product->getListItems('price', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getValue() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getValue()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$value = $this->getValue( $list, 'price.value', '0.00' );
-			$type = $this->getValue( $list, 'price.type', 'default' );
-			$listtype = $this->getValue( $list, 'product.lists.type', 'default' );
+			$value = $this->getValue($list, 'price.value', '0.00');
+			$type = $this->getValue($list, 'price.type', 'default');
+			$listtype = $this->getValue($list, 'product.lists.type', 'default');
 
-			if( isset( $listMap[$value][$type][$listtype] ) )
+			if (isset($listMap[$value][$type][$listtype]))
 			{
 				$listItem = $listMap[$value][$type][$listtype];
 				$refItem = $listItem->getRefItem();
-				unset( $listItems[ $listItem->getId() ] );
+				unset($listItems[$listItem->getId()]);
 			}
 			else
 			{
-				$listItem = $listManager->createItem()->setType( $listtype );
-				$refItem = $manager->createItem()->setType( $type );
+				$listItem = $listManager->createItem()->setType($listtype);
+				$refItem = $manager->createItem()->setType($type);
 			}
 
-			$listItem = $listItem->setPosition( $pos )->fromArray( $list );
+			$listItem = $listItem->setPosition($pos)->fromArray($list);
 
-			$label = $this->getValue( $list, 'price.currencyid', '' ) . ' ' . $this->getValue( $list, 'price.value', '' );
-			$refItem = $refItem->setLabel( $label )->fromArray( $list );
+			$label = $this->getValue($list, 'price.currencyid', '') . ' ' . $this->getValue($list, 'price.value', '');
+			$refItem = $refItem->setLabel($label)->fromArray($list);
 
-			$product->addListItem( 'price', $listItem, $refItem );
+			$product->addListItem('price', $listItem, $refItem);
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -164,22 +164,22 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'price.value' ) === null ) {
+		if ($this->getValue($list, 'price.value') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'product.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'product.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
-		if( ( $type = $this->getValue( $list, 'price.type' ) ) && !isset( $this->types[$type] ) )
+		if (($type = $this->getValue($list, 'price.type')) && !isset($this->types[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'price' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'price');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Text/Standard.php

Spacing +45 added lines, -45 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/text/listtypes
 		 * Names of the product list types for texts that are updated or removed
@@ -68,32 +68,32 @@ 
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/text/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key );
+		$this->listTypes = $context->getConfig()->get($key);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'product/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'product.lists.type.domain', 'text' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'product.lists.type.domain', 'text'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
 
-		$manager = \Aimeos\MShop::create( $context, 'text/type' );
+		$manager = \Aimeos\MShop::create($context, 'text/type');
 
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'text.type.domain', 'product' ) );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'text.type.domain', 'product'));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -106,55 +106,55 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$listManager = \Aimeos\MShop::create( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop::create($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop::create($this->getContext(), 'text');
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $product->getListItems( 'text', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $product->getListItems('text', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$type = $this->getValue( $list, 'text.type', 'name' );
-			$listtype = $this->getValue( $list, 'product.lists.type', 'default' );
-			$content = $this->getValue( $list, 'text.content', '' );
+			$type = $this->getValue($list, 'text.type', 'name');
+			$listtype = $this->getValue($list, 'product.lists.type', 'default');
+			$content = $this->getValue($list, 'text.content', '');
 
-			if( isset( $listMap[$content][$type][$listtype] ) )
+			if (isset($listMap[$content][$type][$listtype]))
 			{
 				$listItem = $listMap[$content][$type][$listtype];
 				$refItem = $listItem->getRefItem();
-				unset( $listItems[ $listItem->getId() ] );
+				unset($listItems[$listItem->getId()]);
 			}
 			else
 			{
-				$listItem = $listManager->createItem()->setType( $listtype );
-				$refItem = $manager->createItem()->setType( $type );
+				$listItem = $listManager->createItem()->setType($listtype);
+				$refItem = $manager->createItem()->setType($type);
 			}
 
-			$listItem = $listItem->setPosition( $pos )->fromArray( $list );
+			$listItem = $listItem->setPosition($pos)->fromArray($list);
 
-			$label = mb_strcut( $this->getValue( $list, 'text.content', '' ), 0, 255 );
-			$refItem = $refItem->setLabel( $label )->fromArray( $list );
+			$label = mb_strcut($this->getValue($list, 'text.content', ''), 0, 255);
+			$refItem = $refItem->setLabel($label)->fromArray($list);
 
-			$product->addListItem( 'text', $listItem, $refItem );
+			$product->addListItem('text', $listItem, $refItem);
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -164,22 +164,22 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'text.content' ) === null ) {
+		if ($this->getValue($list, 'text.content') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'product.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'product.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
-		if( ( $type = $this->getValue( $list, 'text.type' ) ) && !isset( $this->types[$type] ) )
+		if (($type = $this->getValue($list, 'text.type')) && !isset($this->types[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'text' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'text');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Stock/Standard.php

Spacing +27 added lines, -27 removed lines

@@ -42,15 +42,15 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
-		$manager = \Aimeos\MShop::create( $context, 'stock/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop::create($context, 'stock/type');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -63,47 +63,47 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'stock' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'stock');
 		$manager->begin();
 
 		try
 		{
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$items = $this->getStockItems( $product->getCode() );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$items = $this->getStockItems($product->getCode());
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !array_key_exists( 'stock.stocklevel', $list ) ) {
+				if (!array_key_exists('stock.stocklevel', $list)) {
 					continue;
 				}
 
 				$list['stock.productcode'] = $product->getCode();
-				$list['stock.dateback'] = $this->getValue( $list, 'stock.dateback' );
-				$list['stock.stocklevel'] = $this->getValue( $list, 'stock.stocklevel' );
-				$list['stock.type'] = $this->getValue( $list, 'stock.type', 'default' );
+				$list['stock.dateback'] = $this->getValue($list, 'stock.dateback');
+				$list['stock.stocklevel'] = $this->getValue($list, 'stock.stocklevel');
+				$list['stock.type'] = $this->getValue($list, 'stock.type', 'default');
 
-				if( !in_array( $list['stock.type'], $this->types ) )
+				if (!in_array($list['stock.type'], $this->types))
 				{
-					$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $list['stock.type'], 'stock' );
-					throw new \Aimeos\Controller\Common\Exception( $msg );
+					$msg = sprintf('Invalid type "%1$s" (%2$s)', $list['stock.type'], 'stock');
+					throw new \Aimeos\Controller\Common\Exception($msg);
 				}
 
-				if( ( $item = array_pop( $items ) ) === null ) {
+				if (($item = array_pop($items)) === null) {
 					$item = $manager->createItem();
 				}
 
-				$manager->saveItem( $item->fromArray( $list ), false );
+				$manager->saveItem($item->fromArray($list), false);
 			}
 
-			$manager->deleteItems( array_keys( $items ) );
+			$manager->deleteItems(array_keys($items));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -119,13 +119,13 @@ 
 	 * @param string $code Unique product code
 	 * @return \Aimeos\MShop\Stock\Item\Iface[] Associative list of stock items
 	 */
-	protected function getStockItems( $code )
+	protected function getStockItems($code)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'stock' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'stock.productcode', $code ) );
+		$search->setConditions($search->compare('==', 'stock.productcode', $code));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Attribute/Standard.php

Spacing +56 added lines, -56 removed lines

@@ -44,10 +44,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/attribute/listtypes
 		 * Names of the product list types for attributes that are updated or removed
@@ -69,37 +69,37 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/attribute/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key );
+		$this->listTypes = $context->getConfig()->get($key);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'product/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'product.lists.type.domain', 'attribute' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'product.lists.type.domain', 'attribute'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
 
-		$manager = \Aimeos\MShop::create( $context, 'attribute/type' );
+		$manager = \Aimeos\MShop::create($context, 'attribute/type');
 
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-		$search->setConditions( $search->compare( '==', 'attribute.type.domain', 'product' ) );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'attribute.type.domain', 'product'));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 
 
-		$this->cache = $this->getCache( 'attribute' );
+		$this->cache = $this->getCache('attribute');
 	}
 
 
@@ -110,58 +110,58 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$listManager = \Aimeos\MShop::create( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$listManager = \Aimeos\MShop::create($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $product->getListItems( 'attribute', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $product->getListItems('attribute', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getCode() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getCode()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$codes = explode( $separator, $this->getValue( $list, 'attribute.code', '' ) );
+			$codes = explode($separator, $this->getValue($list, 'attribute.code', ''));
 
-			foreach( $codes as $code )
+			foreach ($codes as $code)
 			{
-				$code = trim( $code );
-				$listtype = $this->getValue( $list, 'product.lists.type', 'default' );
+				$code = trim($code);
+				$listtype = $this->getValue($list, 'product.lists.type', 'default');
 
-				if( isset( $listMap[$code][$listtype] ) )
+				if (isset($listMap[$code][$listtype]))
 				{
 					$listItem = $listMap[$code][$listtype];
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
-					$listItem = $listManager->createItem()->setType( $listtype );
+					$listItem = $listManager->createItem()->setType($listtype);
 				}
 
-				$listItem = $listItem->setPosition( $pos )->fromArray( $list );
+				$listItem = $listItem->setPosition($pos)->fromArray($list);
 
-				$attrItem = $this->getAttributeItem( $code, $this->getValue( $list, 'attribute.type' ) );
-				$attrItem = $attrItem->setCode( $code )->fromArray( $list );
+				$attrItem = $this->getAttributeItem($code, $this->getValue($list, 'attribute.type'));
+				$attrItem = $attrItem->setCode($code)->fromArray($list);
 
-				$product->addListItem( 'attribute', $listItem, $attrItem );
+				$product->addListItem('attribute', $listItem, $attrItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems );
+		$product->deleteListItems($listItems);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -171,22 +171,22 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapped data
 	 * @return boolean True if the entry is valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'attribute.code' ) === null ) {
+		if ($this->getValue($list, 'attribute.code') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'product.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'product.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
-		if( ( $type = $this->getValue( $list, 'attribute.type' ) ) && !isset( $this->types[$type] ) )
+		if (($type = $this->getValue($list, 'attribute.type')) && !isset($this->types[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'attribute' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'attribute');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;
@@ -200,22 +200,22 @@ 
 	 * @param string $type Attribute type
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item object
 	 */
-	protected function getAttributeItem( $code, $type )
+	protected function getAttributeItem($code, $type)
 	{
-		if( ( $item = $this->cache->get( $code, $type ) ) === null )
+		if (($item = $this->cache->get($code, $type)) === null)
 		{
-			$manager = \Aimeos\MShop::create( $this->getContext(), 'attribute' );
+			$manager = \Aimeos\MShop::create($this->getContext(), 'attribute');
 
 			$item = $manager->createItem();
-			$item->setType( $type );
-			$item->setDomain( 'product' );
-			$item->setLabel( $code );
-			$item->setCode( $code );
-			$item->setStatus( 1 );
+			$item->setType($type);
+			$item->setDomain('product');
+			$item->setLabel($code);
+			$item->setCode($code);
+			$item->setStatus(1);
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
-			$this->cache->set( $item );
+			$this->cache->set($item);
 		}
 
 		return $item;

controller/common/src/Controller/Common/Product/Import/Csv/Base.php

Spacing +47 added lines, -47 removed lines

@@ -27,14 +27,14 @@ 
 	 * @param array $data Associative list of product codes and lists of CSV field indexes and their data
 	 * @return array Associative list of CSV field indexes and their converted data
 	 */
-	protected function convertData( array $convlist, array $data )
+	protected function convertData(array $convlist, array $data)
 	{
-		foreach( $convlist as $idx => $converter )
+		foreach ($convlist as $idx => $converter)
 		{
-			foreach( $data as $code => $list )
+			foreach ($data as $code => $list)
 			{
-				if( isset( $list[$idx] ) ) {
-					$data[$code][$idx] = $converter->translate( $list[$idx] );
+				if (isset($list[$idx])) {
+					$data[$code][$idx] = $converter->translate($list[$idx]);
 				}
 			}
 		}
@@ -50,36 +50,36 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		if( $name === null ) {
-			$name = $config->get( 'controller/common/product/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/product/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type . '\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 		}
 
-		$object = new $classname( $context );
+		$object = new $classname($context);
 
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $object );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $object);
 
 		return $object;
 	}
@@ -91,12 +91,12 @@ 
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
 	 * @return array Associative list of positions and converter objects
 	 */
-	protected function getConverterList( array $convmap )
+	protected function getConverterList(array $convmap)
 	{
 		$convlist = [];
 
-		foreach( $convmap as $idx => $name ) {
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
+		foreach ($convmap as $idx => $name) {
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
 		}
 
 		return $convlist;
@@ -111,15 +111,15 @@ 
 	 * @param integer $codePos Column position which contains the unique product code (starting from 0)
 	 * @return array List of arrays with product codes as keys and list of values from the CSV file
 	 */
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
 	{
 		$count = 0;
 		$data = [];
 
-		while( $content->valid() && $count++ < $maxcnt )
+		while ($content->valid() && $count++ < $maxcnt)
 		{
 			$row = $content->current();
-			$data[ $row[$codePos] ] = $row;
+			$data[$row[$codePos]] = $row;
 			$content->next();
 		}
 
@@ -218,21 +218,21 @@ 
 	 * @param array $mapping List of domain item keys with the CSV field position as key
 	 * @return array List of associative arrays containing the chunked properties
 	 */
-	protected function getMappedChunk( array &$data, array $mapping )
+	protected function getMappedChunk(array &$data, array $mapping)
 	{
 		$idx = 0;
 		$map = [];
 
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( isset( $map[$idx][$key] ) ) {
+			if (isset($map[$idx][$key])) {
 				$idx++;
 			}
 
-			if( isset( $data[$pos] ) )
+			if (isset($data[$pos]))
 			{
 				$map[$idx][$key] = $data[$pos];
-				unset( $data[$pos] );
+				unset($data[$pos]);
 			}
 		}
 
@@ -246,37 +246,37 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($context, []);
 
-		foreach( $mappings as $type => $mapping )
+		foreach ($mappings as $type => $mapping)
 		{
-			if( ctype_alnum( $type ) === false )
+			if (ctype_alnum($type) === false)
 			{
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$name = $config->get( 'controller/common/product/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/product/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type . '\\' . $name : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$object = new $classname( $context, $mapping, $object );
+			$object = new $classname($context, $mapping, $object);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;
@@ -290,17 +290,17 @@ 
 	 * @param array $domains List of domains whose items should be fetched too
 	 * @return array Associative list of product codes as key and product items as value
 	 */
-	protected function getProducts( array $codes, array $domains )
+	protected function getProducts(array $codes, array $domains)
 	{
 		$result = [];
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $codes ) );
-		$search->setSlice( 0, count( $codes ) );
+		$search->setConditions($search->compare('==', 'product.code', $codes));
+		$search->setSlice(0, count($codes));
 
-		foreach( $manager->searchItems( $search, $domains ) as $item ) {
-			$result[ $item->getCode() ] = $item;
+		foreach ($manager->searchItems($search, $domains) as $item) {
+			$result[$item->getCode()] = $item;
 		}
 
 		return $result;

controller/common/src/Controller/Common/Subscription/Process/Processor/Cgroup/Standard.php

Spacing +19 added lines, -19 removed lines

@@ -40,9 +40,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
 		$config = $context->getConfig();
 
@@ -57,7 +57,7 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		$this->groupIds = (array) $config->get( 'controller/common/subscription/process/processor/cgroup/groupids', [] );
+		$this->groupIds = (array) $config->get('controller/common/subscription/process/processor/cgroup/groupids', []);
 	}
 
 
@@ -66,22 +66,22 @@ 
 	 *
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 */
-	public function begin( \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	public function begin(\Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
-		if( empty( $this->groupIds ) ) {
+		if (empty($this->groupIds)) {
 			return;
 		}
 
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'customer' );
-		$baseManager = \Aimeos\MShop::create( $context, 'order/base' );
+		$manager = \Aimeos\MShop::create($context, 'customer');
+		$baseManager = \Aimeos\MShop::create($context, 'order/base');
 
-		$baseItem = $baseManager->getItem( $subscription->getOrderBaseId() );
-		$item = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+		$baseItem = $baseManager->getItem($subscription->getOrderBaseId());
+		$item = $manager->getItem($baseItem->getCustomerId(), ['customer/group']);
 
-		$item->setGroups( array_unique( array_merge( $item->getGroups(), $this->groupIds ) ) );
-		$manager->saveItem( $item );
+		$item->setGroups(array_unique(array_merge($item->getGroups(), $this->groupIds)));
+		$manager->saveItem($item);
 	}
 
 
@@ -90,21 +90,21 @@ 
 	 *
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 */
-	public function end( \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	public function end(\Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
-		if( empty( $this->groupIds ) ) {
+		if (empty($this->groupIds)) {
 			return;
 		}
 
 		$context = $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'customer' );
-		$baseManager = \Aimeos\MShop::create( $context, 'order/base' );
+		$manager = \Aimeos\MShop::create($context, 'customer');
+		$baseManager = \Aimeos\MShop::create($context, 'order/base');
 
-		$baseItem = $baseManager->getItem( $subscription->getOrderBaseId() );
-		$item = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+		$baseItem = $baseManager->getItem($subscription->getOrderBaseId());
+		$item = $manager->getItem($baseItem->getCustomerId(), ['customer/group']);
 
-		$item->setGroups( array_diff( $item->getGroups(), $this->groupIds ) );
-		$manager->saveItem( $item );
+		$item->setGroups(array_diff($item->getGroups(), $this->groupIds));
+		$manager->saveItem($item);
 	}
 }

controller/common/src/Controller/Common/Coupon/Import/Csv/Processor/Code/Standard.php

Spacing +7 added lines, -7 removed lines

@@ -40,20 +40,20 @@
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data )
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'coupon/code' );
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'coupon/code');
+		$map = $this->getMappedChunk($data, $this->getMapping());
 
-		foreach( $map as $list )
+		foreach ($map as $list)
 		{
-			if( trim( $list['coupon.code.code'] ) == '' ) {
+			if (trim($list['coupon.code.code']) == '') {
 				continue;
 			}
 
-			$item = $manager->saveItem( $item->fromArray( $list ) );
+			$item = $manager->saveItem($item->fromArray($list));
 		}
 
-		return $this->getObject()->process( $item, $data );
+		return $this->getObject()->process($item, $data);
 	}
 }