aimeos / ai-controller-jobs

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

Spacing +58 added lines, -58 removed lines

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

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

Spacing +21 added lines, -21 removed lines

@@ -40,52 +40,52 @@ 
 	 * @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
 		{
 			$propMap = [];
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$items = $this->getPropertyItems( $product->getId() );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$items = $this->getPropertyItems($product->getId());
 
-			foreach( $items as $item ) {
-				$propMap[ $item->getValue() ][ $item->getType() ] = $item;
+			foreach ($items as $item) {
+				$propMap[$item->getValue()][$item->getType()] = $item;
 			}
 
-			foreach( $map as $list )
+			foreach ($map as $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( isset( $propMap[ $list['product.property.value'] ][$typecode] ) )
+				if (isset($propMap[$list['product.property.value']][$typecode]))
 				{
-					$item = $propMap[ $list['product.property.value'] ][$typecode];
-					unset( $items[ $item->getId() ] );
+					$item = $propMap[$list['product.property.value']][$typecode];
+					unset($items[$item->getId()]);
 				}
 				else
 				{
 					$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));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -101,13 +101,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);
 	}
 }

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

Spacing +44 added lines, -44 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,7 +104,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();
 
@@ -112,56 +112,56 @@ 
 		{
 			$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, $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()));
 					}
 
-					$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';
 
-					if( isset( $listMap[$catid][$type] ) )
+					if (isset($listMap[$catid][$type]))
 					{
 						$listItem = $listMap[$catid][$type];
-						unset( $listItems[ $listItem->getId() ] );
+						unset($listItems[$listItem->getId()]);
 					}
 					else
 					{
 						$listItem = $listManager->createItem();
 					}
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			$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;
@@ -178,13 +178,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;
 		}
 
@@ -198,10 +198,10 @@ 
 	 * @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( !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)
 		) {
 			return false;
 		}
@@ -217,24 +217,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\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);
 	}
 }

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

Spacing +31 added lines, -31 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/product/listtypes
 		 * Names of the product list types that are updated or removed
@@ -73,11 +73,11 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$default = array( 'default', 'suggestion' );
+		$default = array('default', 'suggestion');
 		$key = 'controller/common/product/import/csv/processor/product/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key, $default );
+		$this->listTypes = $context->getConfig()->get($key, $default);
 
-		$this->cache = $this->getCache( 'product' );
+		$this->cache = $this->getCache('product');
 	}
 
 
@@ -88,13 +88,13 @@ 
 	 * @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, 'product' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
-		$this->cache->set( $product );
+		$this->cache->set($product);
 
 		$manager->begin();
 
@@ -102,37 +102,37 @@ 
 		{
 			$types = [];
 
-			foreach( $this->getMappedChunk( $data, $this->getMapping() ) as $list )
+			foreach ($this->getMappedChunk($data, $this->getMapping()) as $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
 				$listMap = [];
-				$type = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+				$type = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 				$types[] = $type;
 
-				foreach( explode( $separator, $list['product.code'] ) as $code )
+				foreach (explode($separator, $list['product.code']) as $code)
 				{
-					if( ( $prodid = $this->cache->get( $code ) ) === null )
+					if (($prodid = $this->cache->get($code)) === null)
 					{
 						$msg = 'No product 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()));
 					}
 
 					$listMap[$prodid] = $list;
 				}
 
-				$manager->updateListItems( $product, $listMap, 'product', $type );
+				$manager->updateListItems($product, $listMap, 'product', $type);
 			}
 
-			$this->deleteListItems( $product->getId(), $types );
+			$this->deleteListItems($product->getId(), $types);
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -148,10 +148,10 @@ 
 	 * @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( !isset( $list['product.code'] ) || $list['product.code'] === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+		if (!isset($list['product.code']) || $list['product.code'] === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}
@@ -166,19 +166,19 @@ 
 	 * @param string $prodId Unique product ID
 	 * @param array $types List of types that have been updated
 	 */
-	protected function deleteListItems( $prodId, array $types )
+	protected function deleteListItems($prodId, array $types)
 	{
-		$codes = array_diff( $this->listTypes, $types );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$codes = array_diff($this->listTypes, $types);
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $prodId ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type.code', $codes ),
+			$search->compare('==', 'product.lists.parentid', $prodId),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.type.code', $codes),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$manager->deleteItems( array_keys( $manager->searchItems( $search ) ) );
+		$manager->deleteItems(array_keys($manager->searchItems($search)));
 	}
 }

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

Spacing +38 added lines, -38 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/text/listtypes
 		 * Names of the product list types for texts 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/product/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,39 +77,39 @@ 
 	 * @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(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 		$manager->begin();
 
 		try
 		{
 			$delete = $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 = ( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+				$type = (isset($list['text.type']) ? $list['text.type'] : 'name');
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-				if( isset( $listMap[ $list['text.content'] ][$type][$typecode] ) )
+				if (isset($listMap[$list['text.content']][$type][$typecode]))
 				{
-					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
+					$listItem = $listMap[$list['text.content']][$type][$typecode];
 					$refItem = $listItem->getRefItem();
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
@@ -117,33 +117,33 @@ 
 					$refItem = $manager->createItem();
 				}
 
-				$list['text.typeid'] = $this->getTypeId( 'text/type', 'product', $type );
+				$list['text.typeid'] = $this->getTypeId('text/type', 'product', $type);
 				$list['text.domain'] = 'product';
 
-				$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', 'text', $typecode );
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'text', $typecode);
 				$list['product.lists.parentid'] = $product->getId();
 				$list['product.lists.refid'] = $refItem->getId();
 				$list['product.lists.domain'] = 'text';
 
-				$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) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -159,17 +159,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.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['text.label'] ) ) {
-			$list['text.label'] = mb_strcut( $list['text.content'], 0, 255 );
+		if (!isset($list['text.label'])) {
+			$list['text.label'] = mb_strcut($list['text.content'], 0, 255);
 		}
 
-		if( !isset( $list['text.languageid'] ) ) {
+		if (!isset($list['text.languageid'])) {
 			$list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId();
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -183,10 +183,10 @@ 
 	 * @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( !isset( $list['text.content'] ) || $list['text.content'] === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+		if (!isset($list['text.content']) || $list['text.content'] === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

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,71 +80,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, '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();
 
 		try
 		{
 			$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, $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);
 
-					$typecode = $this->getValue( $list, 'product.lists.type', 'default' );
-					$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'attribute', $typecode );
+					$typecode = $this->getValue($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';
 
-					if( isset( $listMap[$code][$typecode] ) )
+					if (isset($listMap[$code][$typecode]))
 					{
 						$listItem = $listMap[$code][$typecode];
-						unset( $listItems[ $listItem->getId() ] );
+						unset($listItems[$listItem->getId()]);
 					}
 					else
 					{
 						$listItem = $listManager->createItem();
 					}
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -160,11 +160,11 @@ 
 	 * @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( !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)
 		) {
 			return false;
 		}
@@ -180,22 +180,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\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->setDomain( 'product' );
-			$item->setLabel( $type . ' ' . $code );
-			$item->setCode( $code );
-			$item->setStatus( 1 );
+			$item->setTypeId($this->getTypeId('attribute/type', 'product', $type));
+			$item->setDomain('product');
+			$item->setLabel($type . ' ' . $code);
+			$item->setCode($code);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 
-			$this->cache->set( $item );
+			$this->cache->set($item);
 		}
 
 		return $item;

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

Spacing +37 added lines, -37 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,40 +77,40 @@ 
 	 * @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
 		{
 			$delete = $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 = ( isset( $list['price.value'] ) ? $list['price.value'] : '0.00' );
-				$type = ( isset( $list['price.type'] ) ? $list['price.type'] : 'default' );
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+				$value = (isset($list['price.value']) ? $list['price.value'] : '0.00');
+				$type = (isset($list['price.type']) ? $list['price.type'] : 'default');
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-				if( isset( $listMap[$value][$type][$typecode] ) )
+				if (isset($listMap[$value][$type][$typecode]))
 				{
 					$listItem = $listMap[$value][$type][$typecode];
 					$refItem = $listItem->getRefItem();
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
@@ -118,33 +118,33 @@ 
 					$refItem = $manager->createItem();
 				}
 
-				$list['price.typeid'] = $this->getTypeId( 'price/type', 'product', $type );
+				$list['price.typeid'] = $this->getTypeId('price/type', 'product', $type);
 				$list['price.domain'] = 'product';
 
-				$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', 'price', $typecode );
+				$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) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -160,17 +160,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;
 		}
 
@@ -184,10 +184,10 @@ 
 	 * @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( !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)
 		) {
 			return false;
 		}

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

Spacing +39 added lines, -39 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,45 +77,45 @@ 
 	 * @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
 		{
 			$delete = $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;
 				}
 
-				$urls = explode( $separator, $list['media.url'] );
-				$type = $this->getValue( $list, 'media.type', 'default' );
-				$typecode = $this->getValue( $list, 'product.lists.type', 'default' );
+				$urls = explode($separator, $list['media.url']);
+				$type = $this->getValue($list, 'media.type', 'default');
+				$typecode = $this->getValue($list, 'product.lists.type', 'default');
 
-				foreach( $urls as $url )
+				foreach ($urls as $url)
 				{
-					if( isset( $listMap[$url][$type][$typecode] ) )
+					if (isset($listMap[$url][$type][$typecode]))
 					{
 						$listItem = $listMap[$url][$type][$typecode];
 						$refItem = $listItem->getRefItem();
-						unset( $listItems[ $listItem->getId() ] );
+						unset($listItems[$listItem->getId()]);
 					}
 					else
 					{
@@ -123,35 +123,35 @@ 
 						$refItem = $manager->createItem();
 					}
 
-					$list['media.typeid'] = $this->getTypeId( 'media/type', 'product', $type );
+					$list['media.typeid'] = $this->getTypeId('media/type', 'product', $type);
 					$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) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -167,17 +167,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;
 		}
 
@@ -191,10 +191,10 @@ 
 	 * @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( !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)
 		) {
 			return false;
 		}

controller/common/tests/Controller/Common/Product/Import/Csv/BaseTest.php

Spacing +29 added lines, -29 removed lines

@@ -14,92 +14,92 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$context = \TestHelperCntl::getContext();
 		$aimeos = \TestHelperCntl::getAimeos();
 
-		$this->object = new TestAbstract( $context, $aimeos );
+		$this->object = new TestAbstract($context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testGetCache()
 	{
-		$cache = $this->object->getCachePublic( 'attribute' );
+		$cache = $this->object->getCachePublic('attribute');
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache);
 	}
 
 
 	public function testGetCacheInvalidType()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetCacheInvalidInterface()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'attribute', 'unknown' );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('attribute', 'unknown');
 	}
 
 
 	public function testGetProcessors()
 	{
-		$processor = $this->object->getProcessorsPublic( array( 'attribute' => [] ) );
+		$processor = $this->object->getProcessorsPublic(array('attribute' => []));
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor);
 	}
 
 
 	public function testGetProcessorsInvalidType()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetTypeId()
 	{
-		$typeid = $this->object->getTypeIdPublic( 'attribute/type', 'product', 'color' );
+		$typeid = $this->object->getTypeIdPublic('attribute/type', 'product', 'color');
 
-		$this->assertNotEquals( null, $typeid );
+		$this->assertNotEquals(null, $typeid);
 	}
 
 
 	public function testGetTypeIdUnknown()
 	{
-		$this->expectException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getTypeIdPublic( 'attribute/type', 'product', 'unknown' );
+		$this->expectException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getTypeIdPublic('attribute/type', 'product', 'unknown');
 	}
 }
 
@@ -107,21 +107,21 @@ 
 class TestAbstract
 	extends \Aimeos\Controller\Common\Product\Import\Csv\Base
 {
-	public function getCachePublic( $type, $name = null )
+	public function getCachePublic($type, $name = null)
 	{
-		return $this->getCache( $type, $name );
+		return $this->getCache($type, $name);
 	}
 
 
-	public function getProcessorsPublic( array $mappings )
+	public function getProcessorsPublic(array $mappings)
 	{
-		return $this->getProcessors( $mappings );
+		return $this->getProcessors($mappings);
 	}
 
 
-	public function getTypeIdPublic( $path, $domain, $code )
+	public function getTypeIdPublic($path, $domain, $code)
 	{
-		return $this->getTypeId( $path, $domain, $code );
+		return $this->getTypeId($path, $domain, $code);
 	}
 }