aimeos / ai-controller-jobs

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

Braces +3 added lines, -6 removed lines

@@ -81,8 +81,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -164,8 +163,7 @@ 
 					{
 						$listItem = $listMap[$catid][$listtype];
 						unset( $listItems[ $listItem->getId() ] );
-					}
-					else
+					} else
 					{
 						$listItem = $listManager->createItem()->setType( $listtype );
 					}
@@ -179,8 +177,7 @@ 
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Braces +2 added lines, -4 removed lines

@@ -81,8 +81,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -143,8 +142,7 @@ 
 					$listItem = $listMap[$url][$type][$listtype];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem()->setType( $listtype );
 					$refItem = $manager->createItem()->setType( $type );

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

Braces +2 added lines, -4 removed lines

@@ -81,8 +81,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -137,8 +136,7 @@ 
 				$listItem = $listMap[$value][$type][$listtype];
 				$refItem = $listItem->getRefItem();
 				unset( $listItems[ $listItem->getId() ] );
-			}
-			else
+			} else
 			{
 				$listItem = $listManager->createItem()->setType( $listtype );
 				$refItem = $manager->createItem()->setType( $type );

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

Braces +2 added lines, -4 removed lines

@@ -81,8 +81,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -137,8 +136,7 @@ 
 				$listItem = $listMap[$content][$type][$listtype];
 				$refItem = $listItem->getRefItem();
 				unset( $listItems[ $listItem->getId() ] );
-			}
-			else
+			} else
 			{
 				$listItem = $listManager->createItem()->setType( $listtype );
 				$refItem = $manager->createItem()->setType( $type );

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/Attribute/Standard.php

Braces +2 added lines, -4 removed lines

@@ -82,8 +82,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -144,8 +143,7 @@ 
 				{
 					$listItem = $listMap[$code][$listtype];
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem()->setType( $listtype );
 				}

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/Catalog/Import/Csv/Processor/Media/Standard.php

Braces +2 added lines, -4 removed lines

@@ -81,8 +81,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -143,8 +142,7 @@ 
 					$listItem = $listMap[$url][$type][$listtype];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem()->setType( $listtype );
 					$refItem = $manager->createItem()->setType( $type );

Spacing +46 added lines, -46 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\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/media/listtypes
 		 * Names of the catalog list types for media that are updated or removed
@@ -68,32 +68,32 @@ 
 		 * @see controller/common/catalog/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/catalog/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, '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', 'media' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'catalog.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', 'catalog' ) );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'media.type.domain', 'catalog'));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -106,58 +106,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\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'media' );
-		$listManager = \Aimeos\MShop::create( $context, 'catalog/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/catalog/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop::create($context, 'media');
+		$listManager = \Aimeos\MShop::create($context, 'catalog/lists');
+		$separator = $context->getConfig()->get('controller/common/catalog/import/csv/separator', "\n");
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $catalog->getListItems( 'media', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $catalog->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, 'catalog.lists.type', 'default' );
-			$urls = explode( $separator, $this->getValue( $list, 'media.url', '' ) );
+			$type = $this->getValue($list, 'media.type', 'default');
+			$listtype = $this->getValue($list, 'catalog.lists.type', 'default');
+			$urls = explode($separator, $this->getValue($list, 'media.url', ''));
 
-			foreach( $urls as $url )
+			foreach ($urls as $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);
 
-				$catalog->addListItem( 'media', $listItem, $refItem );
+				$catalog->addListItem('media', $listItem, $refItem);
 			}
 		}
 
-		$catalog->deleteListItems( $listItems, true );
+		$catalog->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $catalog, $data );
+		return $this->getObject()->process($catalog, $data);
 	}
 
 
@@ -167,22 +167,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, '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);
 		}
 
-		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/Catalog/Import/Csv/Processor/Text/Standard.php

Braces +2 added lines, -4 removed lines

@@ -81,8 +81,7 @@ 
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}
@@ -137,8 +136,7 @@ 
 				$listItem = $listMap[$content][$type][$listtype];
 				$refItem = $listItem->getRefItem();
 				unset( $listItems[ $listItem->getId() ] );
-			}
-			else
+			} else
 			{
 				$listItem = $listManager->createItem()->setType( $listtype );
 				$refItem = $manager->createItem()->setType( $type );

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\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/text/listtypes
 		 * Names of the catalog list types for texts that are updated or removed
@@ -68,32 +68,32 @@ 
 		 * @see controller/common/catalog/import/csv/processor/catalog/listtypes
 		 */
 		$key = 'controller/common/catalog/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, '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', 'text' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'catalog.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', 'catalog' ) );
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+		$search->setConditions($search->compare('==', 'text.type.domain', 'catalog'));
 
-		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\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
-		$listManager = \Aimeos\MShop::create( $this->getContext(), 'catalog/lists' );
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop::create($this->getContext(), 'catalog/lists');
+		$manager = \Aimeos\MShop::create($this->getContext(), 'text');
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $catalog->getListItems( 'text', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $catalog->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, 'catalog.lists.type', 'default' );
-			$content = $this->getValue( $list, 'text.content', '' );
+			$type = $this->getValue($list, 'text.type', 'name');
+			$listtype = $this->getValue($list, 'catalog.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);
 
-			$catalog->addListItem( 'text', $listItem, $refItem );
+			$catalog->addListItem('text', $listItem, $refItem);
 		}
 
-		$catalog->deleteListItems( $listItems, true );
+		$catalog->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $catalog, $data );
+		return $this->getObject()->process($catalog, $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, '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);
 		}
 
-		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/Catalog/Import/Csv/Processor/Base.php

Spacing +4 added lines, -4 removed lines

@@ -32,8 +32,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;
@@ -71,8 +71,8 @@ 
 	 */
 	protected function getObject()
 	{
-		if( $this->object === null ) {
-			throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' );
+		if ($this->object === null) {
+			throw new \Aimeos\Controller\Jobs\Exception('No processor object available');
 		}
 
 		return $this->object;

controller/jobs/src/Controller/Jobs/Catalog/Import/Csv/Standard.php

Braces +3 added lines, -6 removed lines

@@ -349,8 +349,7 @@ 
 			}
 
 			$container->close();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Catalog import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -590,8 +589,7 @@ 
 					{
 						$manager->moveItem( $item->getId(), $item->getParentId(), $parentid );
 						$item = $manager->saveItem( $item );
-					}
-					else
+					} else
 					{
 						$item = $manager->insertItem( $item, $parentid );
 					}
@@ -603,8 +601,7 @@ 
 				}
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

Spacing +87 added lines, -87 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Catalog import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Catalog import CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing categories from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing categories from CSV files');
 	}
 
 
@@ -54,7 +54,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'media', 'text' );
+		$domains = array('media', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -74,7 +74,7 @@ 
 		 * @see controller/common/catalog/import/csv/converter
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/catalog/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/catalog/import/csv/domains', $domains);
 
 		/** controller/jobs/catalog/import/csv/domains
 		 * List of item domain names that should be retrieved along with the catalog items
@@ -94,7 +94,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/catalog/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/catalog/import/csv/domains', $domains);
 
 
 		/** controller/common/catalog/import/csv/mapping
@@ -119,7 +119,7 @@ 
 		 * @see controller/common/catalog/import/csv/converter
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/catalog/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/catalog/import/csv/mapping', $mappings);
 
 		/** controller/jobs/catalog/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -139,7 +139,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/catalog/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/catalog/import/csv/mapping', $mappings);
 
 
 		/** controller/common/catalog/import/csv/converter
@@ -181,7 +181,7 @@ 
 		 * @see controller/common/catalog/import/csv/mapping
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/catalog/import/csv/converter', [] );
+		$converters = $config->get('controller/common/catalog/import/csv/converter', []);
 
 		/** controller/jobs/catalog/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -201,7 +201,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/catalog/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/catalog/import/csv/converter', $converters);
 
 
 		/** controller/common/catalog/import/csv/max-size
@@ -221,7 +221,7 @@ 
 		 * @see controller/common/catalog/import/csv/mapping
 		 * @see controller/common/catalog/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/catalog/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/catalog/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/catalog/import/csv/skip-lines
@@ -243,7 +243,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/catalog/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/catalog/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/catalog/import/csv/strict
@@ -267,7 +267,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/catalog/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/catalog/import/csv/strict', true);
 
 
 		/** controller/jobs/catalog/import/csv/backup
@@ -300,75 +300,75 @@ 
 		 * @see controller/jobs/catalog/import/csv/strict
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/catalog/import/csv/backup' );
+		$backup = $config->get('controller/jobs/catalog/import/csv/backup');
 
 
-		if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) )
+		if (!isset($mappings['item']) || !is_array($mappings['item']))
 		{
-			$msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		try
 		{
 			$procMappings = $mappings;
-			unset( $procMappings['item'] );
+			unset($procMappings['item']);
 
-			$codePos = $this->getCodePosition( $mappings['item'] );
-			$convlist = $this->getConverterList( $converters );
-			$processor = $this->getProcessors( $procMappings );
-			$catalogMap = $this->getCatalogMap( $domains );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
+			$catalogMap = $this->getCatalogMap($domains);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
 
-			$msg = sprintf( 'Started catalog import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started catalog import from "%1$s" (%2$s)', $path, __CLASS__);
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-			foreach( $container as $content )
+			foreach ($container as $content)
 			{
 				$name = $content->getName();
 
-				for( $i = 0; $i < $skiplines; $i++ ) {
+				for ($i = 0; $i < $skiplines; $i++) {
 					$content->next();
 				}
 
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
 				{
-					$data = $this->convertData( $convlist, $data );
-					$errcnt = $this->import( $catalogMap, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$errcnt = $this->import($catalogMap, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported catalog lines from "%1$s": %2$d/%3$d (%4$s)';
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 					$errors += $errcnt;
 					$total += $chunkcnt;
-					unset( $data );
+					unset($data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Catalog import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Catalog import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
 		}
 
 		$msg = 'Finished catalog import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
-		if( $errors > 0 )
+		if ($errors > 0)
 		{
-			$msg = sprintf( 'Invalid catalog lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid catalog lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
 		}
 	}
 
@@ -380,16 +380,16 @@ 
 	 * @return integer Position of the "catalog.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "catalog.code" is found
 	 */
-	protected function getCodePosition( array $mapping )
+	protected function getCodePosition(array $mapping)
 	{
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( $key === 'catalog.code' ) {
+			if ($key === 'catalog.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "catalog.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "catalog.code" column in CSV mapping found'));
 	}
 
 
@@ -424,7 +424,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/content
 		 * @see controller/jobs/catalog/import/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/catalog/import/csv/location' );
+		$location = $config->get('controller/jobs/catalog/import/csv/location');
 
 		/** controller/jobs/catalog/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -447,7 +447,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/content
 		 * @see controller/jobs/catalog/import/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/catalog/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/catalog/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/catalog/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -468,7 +468,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/type
 		 * @see controller/jobs/catalog/import/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/catalog/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/catalog/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/catalog/import/csv/container/options
 		 * List of file container options for the catalog import files
@@ -486,15 +486,15 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/content
 		 * @see controller/jobs/catalog/import/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/catalog/import/csv/container/options', [] );
+		$options = $config->get('controller/jobs/catalog/import/csv/container/options', []);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/catalog/import/csv/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/catalog/import/csv/location');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -504,13 +504,13 @@ 
 	 * @param array $domains List of domain names whose items should be fetched too
 	 * @return array Associative list of catalog codes as keys and items implementing \Aimeos\MShop\Catalog\Item\Iface as values
 	 */
-	protected function getCatalogMap( array $domains )
+	protected function getCatalogMap(array $domains)
 	{
 		$map = [];
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'catalog' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'catalog');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search, $domains ) as $item ) {
+		foreach ($manager->searchItems($search, $domains) as $item) {
 			$map[$item->getCode()] = $item;
 		}
 
@@ -526,23 +526,23 @@ 
 	 * @param string $code Catalog item code of the parent category
 	 * @return string|null ID of the parent category or null for top level nodes
 	 */
-	protected function getParentId( array $catalogMap, array $map, $code )
+	protected function getParentId(array $catalogMap, array $map, $code)
 	{
-		if( !isset( $map['catalog.parent'] ) )
+		if (!isset($map['catalog.parent']))
 		{
-			$msg = sprintf( 'Required column "%1$s" not found for code "%2$s"', 'catalog.parent', $code );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required column "%1$s" not found for code "%2$s"', 'catalog.parent', $code);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		$parent = trim( $map['catalog.parent'] );
+		$parent = trim($map['catalog.parent']);
 
-		if( $parent != '' && !isset( $catalogMap[$parent] ) )
+		if ($parent != '' && !isset($catalogMap[$parent]))
 		{
-			$msg = sprintf( 'Parent node for code "%1$s" not found', $parent );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Parent node for code "%1$s" not found', $parent);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return ( $parent != '' ? $catalogMap[$parent]->getId() : null );
+		return ($parent != '' ? $catalogMap[$parent]->getId() : null);
 	}
 
 
@@ -557,65 +557,65 @@ 
 	 * @return integer Number of catalogs that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array &$catalogMap, array $data, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array &$catalogMap, array $data, array $mapping,
+		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'catalog' );
+		$manager = \Aimeos\MShop::create($context, 'catalog');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( isset( $catalogMap[$code] )  ) {
+				if (isset($catalogMap[$code])) {
 					$item = $catalogMap[$code];
 				} else {
 					$item = $manager->createItem();
 				}
 
-				$map = $this->getMappedChunk( $list, $mapping );
+				$map = $this->getMappedChunk($list, $mapping);
 
-				if( isset( $map[0] ) )
+				if (isset($map[0]))
 				{
 					$map = $map[0]; // there can only be one chunk for the base catalog data
-					$parentid = $this->getParentId( $catalogMap, $map, $code );
-					$item->fromArray( $map );
+					$parentid = $this->getParentId($catalogMap, $map, $code);
+					$item->fromArray($map);
 
-					if( isset( $catalogMap[$code] ) )
+					if (isset($catalogMap[$code]))
 					{
-						$manager->moveItem( $item->getId(), $item->getParentId(), $parentid );
-						$item = $manager->saveItem( $item );
+						$manager->moveItem($item->getId(), $item->getParentId(), $parentid);
+						$item = $manager->saveItem($item);
 					}
 					else
 					{
-						$item = $manager->insertItem( $item, $parentid );
+						$item = $manager->insertItem($item, $parentid);
 					}
 
-					$list = $processor->process( $item, $list );
+					$list = $processor->process($item, $list);
 					$catalogMap[$code] = $item;
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 				}
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import catalog with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import catalog with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $list ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) );
+			if ($strict && !empty($list)) {
+				$context->getLogger()->log('Not imported: ' . print_r($list, true));
 			}
 		}