aimeos / ai-controller-jobs

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

Doc Comments +1 added lines, -1 removed lines

@@ -499,7 +499,7 @@
 	 *
 	 * @param array $products List of products items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @param array $data Associative list of import data as index/value pairs
-	 * @param array $mappings Associative list of positions and domain item keys
+	 * @param array $mapping Associative list of positions and domain item keys
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor Processor object
 	 * @param boolean $strict Log columns not mapped or silently ignore them
 	 * @return integer Number of products that couldn't be imported

Indentation +4 added lines, -4 removed lines

@@ -425,7 +425,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
-		*/
+		 */
 		$location = $config->get( 'controller/jobs/product/import/csv/location', '.' );
 
 		/** controller/jobs/product/import/csv/container/type
@@ -448,7 +448,7 @@ 
 		 * @see controller/jobs/product/import/csv/location
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
-		*/
+		 */
 		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
 
 		/** controller/jobs/product/import/csv/container/content
@@ -469,7 +469,7 @@ 
 		 * @see controller/jobs/product/import/csv/location
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/options
-		*/
+		 */
 		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
 
 		/** controller/jobs/product/import/csv/container/options
@@ -487,7 +487,7 @@ 
 		 * @see controller/jobs/product/import/csv/location
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/type
-		*/
+		 */
 		$options = $config->get( 'controller/jobs/product/import/csv/container/options', array() );
 
 		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );

Spacing +68 added lines, -68 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing products from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files');
 	}
 
 
@@ -54,7 +54,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'attribute', 'media', 'price', 'product', 'text' );
+		$domains = array('attribute', 'media', 'price', 'product', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -74,7 +74,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/product/import/csv/domains', $domains);
 
 		/** controller/jobs/product/import/csv/domains
 		 * List of item domain names that should be retrieved along with the product items
@@ -94,7 +94,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/product/import/csv/domains', $domains);
 
 
 		/** controller/common/product/import/csv/mapping
@@ -122,7 +122,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/product/import/csv/mapping', $mappings);
 
 		/** controller/jobs/product/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -142,7 +142,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings);
 
 
 		/** controller/common/product/import/csv/converter
@@ -184,7 +184,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/product/import/csv/converter', array() );
+		$converters = $config->get('controller/common/product/import/csv/converter', array());
 
 		/** controller/jobs/product/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -204,7 +204,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/product/import/csv/converter', $converters);
 
 
 		/** controller/common/product/import/csv/max-size
@@ -224,7 +224,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/product/import/csv/skip-lines
@@ -246,7 +246,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/product/import/csv/strict
@@ -270,7 +270,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true);
 
 
 		/** controller/jobs/product/import/csv/backup
@@ -303,74 +303,74 @@ 
 		 * @see controller/jobs/product/import/csv/strict
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/product/import/csv/backup' );
+		$backup = $config->get('controller/jobs/product/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 );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
-			$msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started product 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 ) ) !== array() )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== array())
 				{
-					$data = $this->convertData( $convlist, $data );
-					$products = $this->getProducts( array_keys( $data ), $domains );
-					$errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$products = $this->getProducts(array_keys($data), $domains);
+					$errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported product 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( $products, $data );
+					unset($products, $data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Product import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Product 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 product 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 product lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid product 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'));
 		}
 	}
 
@@ -382,16 +382,16 @@ 
 	 * @return integer Position of the "product.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.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 === 'product.code' ) {
+			if ($key === 'product.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found'));
 	}
 
 
@@ -426,7 +426,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		*/
-		$location = $config->get( 'controller/jobs/product/import/csv/location', '.' );
+		$location = $config->get('controller/jobs/product/import/csv/location', '.');
 
 		/** controller/jobs/product/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -449,7 +449,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		*/
-		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/product/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -470,7 +470,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/options
 		*/
-		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/product/import/csv/container/options
 		 * List of file container options for the product import files
@@ -488,9 +488,9 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/type
 		*/
-		$options = $config->get( 'controller/jobs/product/import/csv/container/options', array() );
+		$options = $config->get('controller/jobs/product/import/csv/container/options', array());
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -505,14 +505,14 @@ 
 	 * @return integer Number of products that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $products, array $data, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array $products, array $data, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$remaining = array();
 
@@ -520,36 +520,36 @@ 
 
 			try
 			{
-				if( isset( $products[$code] ) ) {
+				if (isset($products[$code])) {
 					$product = $products[$code];
 				} else {
 					$product = $manager->createItem();
 				}
 
-				$map = $this->getMappedData( $mapping, $list );
+				$map = $this->getMappedData($mapping, $list);
 
-				$typecode = ( isset( $map['product.type'] ) ? $map['product.type'] : 'default' );
-				$map['product.typeid'] = $this->getTypeId( 'product/type', 'product', $typecode );
+				$typecode = (isset($map['product.type']) ? $map['product.type'] : 'default');
+				$map['product.typeid'] = $this->getTypeId('product/type', 'product', $typecode);
 
-				$product->fromArray( $this->addItemDefaults( $map ) );
-				$manager->saveItem( $product );
+				$product->fromArray($this->addItemDefaults($map));
+				$manager->saveItem($product);
 
-				$remaining = $processor->process( $product, $list );
+				$remaining = $processor->process($product, $list);
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $remaining ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $remaining, true ) );
+			if ($strict && !empty($remaining)) {
+				$context->getLogger()->log('Not imported: ' . print_r($remaining, true));
 			}
 		}
 
@@ -563,9 +563,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['product.status'] ) ) {
+		if (!isset($list['product.status'])) {
 			$list['product.status'] = 1;
 		}
 

Braces +2 added lines, -4 removed lines

@@ -351,8 +351,7 @@ 
 			}
 
 			$container->close();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Product import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -537,8 +536,7 @@ 
 				$remaining = $processor->process( $product, $list );
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

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

Spacing +25 added lines, -25 removed lines

@@ -42,12 +42,12 @@ 
 	 * @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);
 
-		$this->cache = $this->getCache( 'warehouse' );
+		$this->cache = $this->getCache('warehouse');
 	}
 
 
@@ -58,55 +58,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)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 		$manager->begin();
 
 		try
 		{
 			$pos = 0;
 			$delete = array();
-			$map = $this->getMappedChunk( $data );
-			$items = $this->getStockItems( $product->getId() );
+			$map = $this->getMappedChunk($data);
+			$items = $this->getStockItems($product->getId());
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !array_key_exists( 'product.stock.stocklevel', $list ) ) {
+				if (!array_key_exists('product.stock.stocklevel', $list)) {
 					continue;
 				}
 
-				$whcode = ( isset( $list['product.stock.warehouse'] ) ? $list['product.stock.warehouse'] : 'default' );
+				$whcode = (isset($list['product.stock.warehouse']) ? $list['product.stock.warehouse'] : 'default');
 
-				if( !isset( $list['product.stock.warehouseid'] ) ) {
-					$list['product.stock.warehouseid'] = $this->cache->get( $whcode );
+				if (!isset($list['product.stock.warehouseid'])) {
+					$list['product.stock.warehouseid'] = $this->cache->get($whcode);
 				}
 
-				if( isset( $list['product.stock.dateback'] ) && $list['product.stock.dateback'] === '' ) {
+				if (isset($list['product.stock.dateback']) && $list['product.stock.dateback'] === '') {
 					$list['product.stock.dateback'] = null;
 				}
 
-				if( $list['product.stock.stocklevel'] === '' ) {
+				if ($list['product.stock.stocklevel'] === '') {
 					$list['product.stock.stocklevel'] = null;
 				}
 
 				$list['product.stock.parentid'] = $product->getId();
 
-				if( ( $item = array_pop( $items ) ) === null ) {
+				if (($item = array_pop($items)) === null) {
 					$item = $manager->createItem();
 				}
 
-				$item->fromArray( $list );
-				$manager->saveItem( $item );
+				$item->fromArray($list);
+				$manager->saveItem($item);
 			}
 
-			$manager->deleteItems( array_keys( $items ) );
+			$manager->deleteItems(array_keys($items));
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -122,13 +122,13 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of product stock items
 	 */
-	protected function getStockItems( $prodid )
+	protected function getStockItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $prodid ) );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $prodid));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -105,8 +105,7 @@
 			$remaining = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
 	 * @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 $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null)
 	{
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @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)
 	{
 		return $data;
 	}

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Attribute/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/attribute/listtypes
 		 * Names of the product list types for attributes that are updated or removed
@@ -67,9 +67,9 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/attribute/listtypes');
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/attribute/listtypes');
 
-		$this->cache = $this->getCache( 'attribute' );
+		$this->cache = $this->getCache('attribute');
 	}
 
 
@@ -80,12 +80,12 @@ 
 	 * @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\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
@@ -93,25 +93,25 @@ 
 		{
 			$pos = 0;
 			$delete = $attrcodes = array();
-			$map = $this->getMappedChunk( $data );
-			$listItems = $product->getListItems( 'attribute', $this->listTypes );
+			$map = $this->getMappedChunk($data);
+			$listItems = $product->getListItems('attribute', $this->listTypes);
 
-			foreach( $listItems as $listId => $listItem )
+			foreach ($listItems as $listId => $listItem)
 			{
-				if( isset( $map[$pos] ) )
+				if (isset($map[$pos]))
 				{
-					if( !isset( $map[$pos]['attribute.code'] ) || !isset( $map[$pos]['attribute.type'] ) )
+					if (!isset($map[$pos]['attribute.code']) || !isset($map[$pos]['attribute.type']))
 					{
-						unset( $map[$pos] );
+						unset($map[$pos]);
 						continue;
 					}
 
 					$refItem = $listItem->getRefItem();
 
-					if( $refItem !== null && $map[$pos]['attribute.code'] === $refItem->getCode()
+					if ($refItem !== null && $map[$pos]['attribute.code'] === $refItem->getCode()
 						&& $map[$pos]['attribute.type'] === $refItem->getType()
-						&& ( !isset( $map[$pos]['product.lists.type'] ) || isset( $map[$pos]['product.lists.type'] )
-						&& $map[$pos]['product.lists.type'] === $listItem->getType() )
+						&& (!isset($map[$pos]['product.lists.type']) || isset($map[$pos]['product.lists.type'])
+						&& $map[$pos]['product.lists.type'] === $listItem->getType())
 					) {
 						$pos++;
 						continue;
@@ -123,46 +123,46 @@ 
 				$pos++;
 			}
 
-			$listManager->deleteItems( $delete );
+			$listManager->deleteItems($delete);
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !isset( $list['attribute.code'] ) || $list['attribute.code'] === '' || $list['attribute.type'] === ''
-					|| isset( $list['product.lists.type'] ) && $this->listTypes !== null
-					&& !in_array( $list['product.lists.type'], (array) $this->listTypes )
+				if (!isset($list['attribute.code']) || $list['attribute.code'] === '' || $list['attribute.type'] === ''
+					|| isset($list['product.lists.type']) && $this->listTypes !== null
+					&& !in_array($list['product.lists.type'], (array) $this->listTypes)
 				) {
 					continue;
 				}
 
-				$codes = explode( $separator, $list['attribute.code'] );
+				$codes = explode($separator, $list['attribute.code']);
 
-				foreach( $codes as $code )
+				foreach ($codes as $code)
 				{
-					$attrItem = $this->getAttributeItem( $code, $list['attribute.type'] );
-					$attrItem->fromArray( $list );
-					$attrItem->setCode( $code );
-					$manager->saveItem( $attrItem );
+					$attrItem = $this->getAttributeItem($code, $list['attribute.type']);
+					$attrItem->fromArray($list);
+					$attrItem->setCode($code);
+					$manager->saveItem($attrItem);
 
-					if( ( $listItem = array_shift( $listItems ) ) === null ) {
+					if (($listItem = array_shift($listItems)) === null) {
 						$listItem = $listManager->createItem();
 					}
 
-					$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
-					$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'attribute', $typecode );
+					$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
+					$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'attribute', $typecode);
 					$list['product.lists.refid'] = $attrItem->getId();
 					$list['product.lists.parentid'] = $product->getId();
 					$list['product.lists.domain'] = 'attribute';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -179,21 +179,21 @@ 
 	 * @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\Factory::createManager( $this->getContext(), 'attribute' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 			$item = $manager->createItem();
-			$item->setTypeId( $this->getTypeId( 'attribute/type', 'product', $type ) );
-			$item->setCode( $code );
-			$item->setLabel( $type . ' ' . $code );
-			$item->setStatus( 1 );
+			$item->setTypeId($this->getTypeId('attribute/type', 'product', $type));
+			$item->setCode($code);
+			$item->setLabel($type . ' ' . $code);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 
-			$this->cache->set( $item );
+			$this->cache->set($item);
 		}
 
 		return $item;

Braces +1 added lines, -2 removed lines

@@ -161,8 +161,7 @@
 			$remaining = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 	 * @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 $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null);
 
 
 	/**
@@ -37,5 +37,5 @@ 
 	 * @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);
 }
\ No newline at end of file

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Catalog/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/catalog/listtypes
 		 * Names of the catalog list types that are updated or removed
@@ -67,9 +67,9 @@ 
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/catalog/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/catalog/listtypes');
 
-		$this->cache = $this->getCache( 'catalog' );
+		$this->cache = $this->getCache('catalog');
 	}
 
 
@@ -80,11 +80,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\Factory::createManager( $context, 'catalog' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
 
 		/** controller/common/product/import/csv/separator
 		 * Single separator character for multiple entries in one field of the import file
@@ -104,54 +104,54 @@ 
 		 * @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();
 
 		try
 		{
 			$prodid = $product->getId();
-			$map = $this->getMappedChunk( $data );
-			$listItems = $this->getListItemPool( $product, $map );
+			$map = $this->getMappedChunk($data);
+			$listItems = $this->getListItemPool($product, $map);
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !isset( $list['catalog.code'] ) || $list['catalog.code'] === '' || isset( $list['catalog.lists.type'] )
-					&& $this->listTypes !== null && !in_array( $list['catalog.lists.type'], (array) $this->listTypes )
+				if (!isset($list['catalog.code']) || $list['catalog.code'] === '' || isset($list['catalog.lists.type'])
+					&& $this->listTypes !== null && !in_array($list['catalog.lists.type'], (array) $this->listTypes)
 				) {
 					continue;
 				}
 
-				$codes = explode( $separator, $list['catalog.code'] );
-				$type = ( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' );
+				$codes = explode($separator, $list['catalog.code']);
+				$type = (isset($list['catalog.lists.type']) ? $list['catalog.lists.type'] : 'default');
 
-				foreach( $codes as $code )
+				foreach ($codes as $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()));
 					}
 
-					if( ( $listItem = array_shift( $listItems ) ) === null ) {
+					if (($listItem = array_shift($listItems)) === null) {
 						$listItem = $listManager->createItem();
 					}
 
-					$list['catalog.lists.typeid'] = $this->getTypeId( 'catalog/lists/type', 'product', $type );
+					$list['catalog.lists.typeid'] = $this->getTypeId('catalog/lists/type', 'product', $type);
 					$list['catalog.lists.parentid'] = $catid;
 					$list['catalog.lists.refid'] = $prodid;
 					$list['catalog.lists.domain'] = 'product';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -168,13 +168,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;
 		}
 
@@ -189,25 +189,25 @@ 
 	 * @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\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($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.code', $types );
+		if ($types !== null) {
+			$expr[] = $search->compare('==', 'catalog.lists.type.code', $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);
 	}
 
 
@@ -218,16 +218,16 @@ 
 	 * @param array $map List of associative arrays containing the chunked properties
 	 * @return array List of list items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItemPool( \Aimeos\MShop\Product\Item\Iface $product, array $map )
+	protected function getListItemPool(\Aimeos\MShop\Product\Item\Iface $product, array $map)
 	{
 		$pos = 0;
 		$delete = array();
-		$listItems = $this->getListItems( $product->getId(), $this->listTypes );
+		$listItems = $this->getListItems($product->getId(), $this->listTypes);
 
-		foreach( $listItems as $listId => $listItem )
+		foreach ($listItems as $listId => $listItem)
 		{
-			if( isset( $map[$pos] ) && ( !isset( $map[$pos]['catalog.code'] )
-				|| $this->cache->get( $map[$pos]['catalog.code'] ) == $listItem->getParentId() )
+			if (isset($map[$pos]) && (!isset($map[$pos]['catalog.code'])
+				|| $this->cache->get($map[$pos]['catalog.code']) == $listItem->getParentId())
 			) {
 				$pos++;
 				continue;
@@ -238,8 +238,8 @@ 
 			$pos++;
 		}
 
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
-		$listManager->deleteItems( $delete );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
+		$listManager->deleteItems($delete);
 
 		return $listItems;
 	}

Braces +1 added lines, -2 removed lines

@@ -150,8 +150,7 @@
 			$remaining = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +34 added lines, -34 removed lines

@@ -42,10 +42,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
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/media/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/media/listtypes');
 	}
 
 
@@ -77,71 +77,71 @@ 
 	 * @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\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
 		try
 		{
-			$map = $this->getMappedChunk( $data );
-			$listItems = $product->getListItems( 'media' );
+			$map = $this->getMappedChunk($data);
+			$listItems = $product->getListItems('media');
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !isset( $list['media.url'] ) || $list['media.url'] === '' || isset( $list['product.lists.type'] )
-					&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+				if (!isset($list['media.url']) || $list['media.url'] === '' || isset($list['product.lists.type'])
+					&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 				) {
 					continue;
 				}
 
-				$urls = explode( $separator, $list['media.url'] );
-				$type = ( isset( $list['media.type'] ) ? $list['media.type'] : 'default' );
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
-				$langid = ( isset( $list['media.languageid'] ) && $list['media.languageid'] !== '' ? $list['media.languageid'] : null );
+				$urls = explode($separator, $list['media.url']);
+				$type = (isset($list['media.type']) ? $list['media.type'] : 'default');
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
+				$langid = (isset($list['media.languageid']) && $list['media.languageid'] !== '' ? $list['media.languageid'] : null);
 
-				foreach( $urls as $url )
+				foreach ($urls as $url)
 				{
-					if( ( $listItem = array_shift( $listItems ) ) !== null ) {
+					if (($listItem = array_shift($listItems)) !== null) {
 						$refItem = $listItem->getRefItem();
 					} else {
 						$listItem = $listManager->createItem();
 						$refItem = $manager->createItem();
 					}
 
-					$list['media.typeid'] = $this->getTypeId( 'media/type', 'product', $type );
+					$list['media.typeid'] = $this->getTypeId('media/type', 'product', $type);
 					$list['media.languageid'] = $langid;
 					$list['media.domain'] = 'product';
 					$list['media.url'] = $url;
 
-					$refItem->fromArray( $this->addItemDefaults( $list ) );
-					$manager->saveItem( $refItem );
+					$refItem->fromArray($this->addItemDefaults($list));
+					$manager->saveItem($refItem);
 
-					$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'media', $typecode );
+					$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'media', $typecode);
 					$list['product.lists.parentid'] = $product->getId();
 					$list['product.lists.refid'] = $refItem->getId();
 					$list['product.lists.domain'] = 'media';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$manager->deleteItem( $listItem->getRefItem()->getId() );
-				$listManager->deleteItem( $listItem->getId() );
+				$manager->deleteItem($listItem->getRefItem()->getId());
+				$listManager->deleteItem($listItem->getId());
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -157,17 +157,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "media.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['media.label'] ) ) {
+		if (!isset($list['media.label'])) {
 			$list['media.label'] = $list['media.url'];
 		}
 
-		if( !isset( $list['media.preview'] ) ) {
+		if (!isset($list['media.preview'])) {
 			$list['media.preview'] = $list['media.url'];
 		}
 
-		if( !isset( $list['media.status'] ) ) {
+		if (!isset($list['media.status'])) {
 			$list['media.status'] = 1;
 		}
 

Braces +1 added lines, -2 removed lines

@@ -140,8 +140,7 @@
 			$remaining = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +30 added lines, -30 removed lines

@@ -42,10 +42,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
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/price/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/price/listtypes');
 	}
 
 
@@ -77,60 +77,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)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price');
 		$manager->begin();
 
 		try
 		{
-			$listItems = $product->getListItems( 'price' );
-			$map = $this->getMappedChunk( $data );
+			$listItems = $product->getListItems('price');
+			$map = $this->getMappedChunk($data);
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !isset( $list['price.value'] ) || $list['price.value'] === '' || isset( $list['product.lists.type'] )
-					&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+				if (!isset($list['price.value']) || $list['price.value'] === '' || isset($list['product.lists.type'])
+					&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 				) {
 					continue;
 				}
 
-				if( ( $listItem = array_shift( $listItems ) ) !== null ) {
+				if (($listItem = array_shift($listItems)) !== null) {
 					$refItem = $listItem->getRefItem();
 				} else {
 					$listItem = $listManager->createItem();
 					$refItem = $manager->createItem();
 				}
 
-				$typecode = ( isset( $list['price.type'] ) ? $list['price.type'] : 'default' );
-				$list['price.typeid'] = $this->getTypeId( 'price/type', 'product', $typecode );
+				$typecode = (isset($list['price.type']) ? $list['price.type'] : 'default');
+				$list['price.typeid'] = $this->getTypeId('price/type', 'product', $typecode);
 				$list['price.domain'] = 'product';
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$manager->saveItem( $refItem );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$manager->saveItem($refItem);
 
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'price', $typecode );
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'price', $typecode);
 				$list['product.lists.parentid'] = $product->getId();
 				$list['product.lists.refid'] = $refItem->getId();
 				$list['product.lists.domain'] = 'price';
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-				$listManager->saveItem( $listItem );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
+				$listManager->saveItem($listItem);
 			}
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$manager->deleteItem( $listItem->getRefItem()->getId() );
-				$listManager->deleteItem( $listItem->getId() );
+				$manager->deleteItem($listItem->getRefItem()->getId());
+				$listManager->deleteItem($listItem->getId());
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -146,17 +146,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "price.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['price.currencyid'] ) ) {
+		if (!isset($list['price.currencyid'])) {
 			$list['price.currencyid'] = $this->getContext()->getLocale()->getCurrencyId();
 		}
 
-		if( !isset( $list['price.label'] ) ) {
+		if (!isset($list['price.label'])) {
 			$list['price.label'] = $list['price.currencyid'] . ' ' . $list['price.value'];
 		}
 
-		if( !isset( $list['price.status'] ) ) {
+		if (!isset($list['price.status'])) {
 			$list['price.status'] = 1;
 		}
 

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
 			$remaining = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +24 added lines, -24 removed lines

@@ -40,32 +40,32 @@ 
 	 * @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\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 		$manager->begin();
 
 		try
 		{
 			$pos = 0;
 			$delete = array();
-			$map = $this->getMappedChunk( $data );
-			$items = $this->getPropertyItems( $product->getId() );
+			$map = $this->getMappedChunk($data);
+			$items = $this->getPropertyItems($product->getId());
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				if( isset( $map[$pos] ) )
+				if (isset($map[$pos]))
 				{
-					if( !isset( $map[$pos]['product.property.type'] ) || !isset( $map[$pos]['product.property.value'] ) )
+					if (!isset($map[$pos]['product.property.type']) || !isset($map[$pos]['product.property.value']))
 					{
-						unset( $map[$pos] );
+						unset($map[$pos]);
 						continue;
 					}
 
-					if( $map[$pos]['product.property.type'] === $item->getType()
+					if ($map[$pos]['product.property.type'] === $item->getType()
 						&& $map[$pos]['product.property.value'] === $item->getValue()
-						&& ( !isset( $map[$pos]['product.property.languageid'] )
-							|| isset( $map[$pos]['product.property.languageid'] )
+						&& (!isset($map[$pos]['product.property.languageid'])
+							|| isset($map[$pos]['product.property.languageid'])
 							&& $map[$pos]['product.property.languageid'] === $item->getLanguageId()
 						)
 					) {
@@ -79,31 +79,31 @@ 
 				$pos++;
 			}
 
-			$manager->deleteItems( $delete );
+			$manager->deleteItems($delete);
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $list['product.property.type'] == '' || $list['product.property.value'] == '' ) {
+				if ($list['product.property.type'] == '' || $list['product.property.value'] == '') {
 					continue;
 				}
 
 				$typecode = $list['product.property.type'];
-				$list['product.property.typeid'] = $this->getTypeId( 'product/property/type', 'product', $typecode );
+				$list['product.property.typeid'] = $this->getTypeId('product/property/type', 'product', $typecode);
 				$list['product.property.parentid'] = $product->getId();
 
-				if( ( $item = array_shift( $items ) ) === null ) {
+				if (($item = array_shift($items)) === null) {
 					$item = $manager->createItem();
 				}
 
-				$item->fromArray( $list );
-				$manager->saveItem( $item );
+				$item->fromArray($list);
+				$manager->saveItem($item);
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -119,13 +119,13 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of product property items
 	 */
-	protected function getPropertyItems( $prodid )
+	protected function getPropertyItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodid ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodid));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 			$remaining = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;