aimeos / ai-controller-jobs

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

Spacing +41 added lines, -41 removed lines

@@ -27,14 +27,14 @@ 
 	 * @param array $data Associative list of catalog codes and lists of CSV field indexes and their data
 	 * @return array Associative list of CSV field indexes and their converted data
 	 */
-	protected function convertData( array $convlist, array $data )
+	protected function convertData(array $convlist, array $data)
 	{
-		foreach( $convlist as $idx => $converter )
+		foreach ($convlist as $idx => $converter)
 		{
-			foreach( $data as $code => $list )
+			foreach ($data as $code => $list)
 			{
-				if( isset( $list[$idx] ) ) {
-					$data[$code][$idx] = $converter->translate( $list[$idx] );
+				if (isset($list[$idx])) {
+					$data[$code][$idx] = $converter->translate($list[$idx]);
 				}
 			}
 		}
@@ -50,36 +50,36 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Catalog\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\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/catalog/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/catalog/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\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\\Catalog\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 		}
 
-		$object = new $classname( $context );
+		$object = new $classname($context);
 
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\Iface', $object );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\Iface', $object);
 
 		return $object;
 	}
@@ -91,12 +91,12 @@ 
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
 	 * @return array Associative list of positions and converter objects
 	 */
-	protected function getConverterList( array $convmap )
+	protected function getConverterList(array $convmap)
 	{
 		$convlist = [];
 
-		foreach( $convmap as $idx => $name ) {
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
+		foreach ($convmap as $idx => $name) {
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
 		}
 
 		return $convlist;
@@ -111,15 +111,15 @@ 
 	 * @param integer $codePos Column position which contains the unique catalog code (starting from 0)
 	 * @return array List of arrays with catalog 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();
 		}
 
@@ -175,21 +175,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]);
 			}
 		}
 
@@ -203,37 +203,37 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\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\\Catalog\\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/catalog/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/catalog/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\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\\Catalog\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$object = new $classname( $context, $mapping, $object );
+			$object = new $classname($context, $mapping, $object);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;

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

Spacing +7 added lines, -7 removed lines

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

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

Spacing +17 added lines, -17 removed lines

@@ -40,15 +40,15 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$result = $manager->searchItems( $manager->createSearch() );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$result = $manager->searchItems($manager->createSearch());
 
-		foreach( $result as $id => $item ) {
-			$this->attributes[ $item->getCode() ][ $item->getType() ] = $item;
+		foreach ($result as $id => $item) {
+			$this->attributes[$item->getCode()][$item->getType()] = $item;
 		}
 	}
 
@@ -60,24 +60,24 @@ 
 	 * @param string|null $type Attribute type
 	 * @return \Aimeos\MShop\Attribute\Item\Iface|null Attribute object or null if not found
 	 */
-	public function get( $code, $type = null )
+	public function get($code, $type = null)
 	{
-		if( isset( $this->attributes[$code] ) && isset( $this->attributes[$code][$type] ) ) {
+		if (isset($this->attributes[$code]) && isset($this->attributes[$code][$type])) {
 			return $this->attributes[$code][$type];
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', $code ),
-			$search->compare( '==', 'attribute.type', $type ),
+			$search->compare('==', 'attribute.code', $code),
+			$search->compare('==', 'attribute.type', $type),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) !== false )
+		if (($item = reset($result)) !== false)
 		{
 			$this->attributes[$code][$type] = $item;
 			return $item;
@@ -90,14 +90,14 @@ 
 	 *
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Attribute object
 	 */
-	public function set( \Aimeos\MShop\Common\Item\Iface $item )
+	public function set(\Aimeos\MShop\Common\Item\Iface $item)
 	{
 		$code = $item->getCode();
 
-		if( !isset( $this->attributes[$code] ) || !is_array( $this->attributes[$code] ) ) {
+		if (!isset($this->attributes[$code]) || !is_array($this->attributes[$code])) {
 			$this->attributes[$code] = [];
 		}
 
-		$this->attributes[$code][ $item->getType() ] = $item;
+		$this->attributes[$code][$item->getType()] = $item;
 	}
 }
\ No newline at end of file

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

Spacing +47 added lines, -47 removed lines

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

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

Spacing +7 added lines, -7 removed lines

@@ -32,8 +32,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\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)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;
@@ -48,13 +48,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['product.lists.position'] ) ) {
+		if (!isset($list['product.lists.position'])) {
 			$list['product.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['product.lists.status'] ) ) {
+		if (!isset($list['product.lists.status'])) {
 			$list['product.lists.status'] = 1;
 		}
 
@@ -92,8 +92,8 @@ 
 	 */
 	protected function getObject()
 	{
-		if( $this->object === null ) {
-			throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' );
+		if ($this->object === null) {
+			throw new \Aimeos\Controller\Jobs\Exception('No processor object available');
 		}
 
 		return $this->object;

controller/jobs/templates/product/export/items-body-standard.php

Spacing +13 added lines, -13 removed lines

@@ -9,10 +9,10 @@ 
 
 ?>
 <productlist>
-    <?php foreach( $this->get( 'exportItems', [] ) as $id => $item ) : ?>
+    <?php foreach ($this->get('exportItems', []) as $id => $item) : ?>
 
-        <product-content id="<?php echo $enc->attr( $id ); ?>" >
-            <productitem id="<?php echo $enc->attr( $id ); ?>" siteid="<?php echo $enc->attr( $item->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $item->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $item->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $item->getEditor() ); ?>">
+        <product-content id="<?php echo $enc->attr($id); ?>" >
+            <productitem id="<?php echo $enc->attr($id); ?>" siteid="<?php echo $enc->attr($item->getSiteId()); ?>" ctime="<?php echo $enc->attr($item->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($item->getTimeModified()); ?>" editor="<?php echo $enc->attr($item->getEditor()); ?>">
                 <type><![CDATA[<?php echo $item->getType(); ?>]]></type>
                 <code><![CDATA[<?php echo $item->getCode(); ?>]]></code>
                 <label><![CDATA[<?php echo $item->getCode(); ?>]]></label>
@@ -22,10 +22,10 @@ 
             </productitem>
             <list>
                 <text>
-                    <?php foreach( $item->getListItems( 'text' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('text') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <textitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.domain="<?php echo $enc->attr( $listItem->getDomain() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <textitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.domain="<?php echo $enc->attr($listItem->getDomain()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <languageid><![CDATA[<?php echo $refItem->getLanguageId(); ?>]]></languageid>
                                 <label><![CDATA[<?php echo $refItem->getLabel(); ?>]]></label>
@@ -37,10 +37,10 @@ 
 
                 </text>
                 <media>
-                    <?php foreach( $item->getListItems( 'media' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('media') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <mediaitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <mediaitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <languageid><![CDATA[<?php echo $refItem->getLanguageId(); ?>]]></languageid>
                                 <label><![CDATA[<?php echo $refItem->getLabel(); ?>]]></label>
@@ -54,10 +54,10 @@ 
 
                 </media>
                 <price>
-                    <?php foreach( $item->getListItems( 'price' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('price') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <priceitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <priceitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <currencyid><![CDATA[<?php echo $refItem->getCurrencyId(); ?>]]></currencyid>
                                 <quantity><![CDATA[<?php echo $refItem->getQuantity(); ?>]]></quantity>
@@ -73,10 +73,10 @@ 
 
                 </price>
                 <attribute>
-                    <?php foreach( $item->getListItems( 'attribute' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('attribute') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <attributeitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <attributeitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <code><![CDATA[<?php echo $refItem->getCode(); ?>]]></code>
                                 <label><![CDATA[<?php echo $refItem->getLabel(); ?>]]></label>
@@ -88,10 +88,10 @@ 
 
                 </attribute>
                 <product>
-                    <?php foreach( $item->getListItems( 'product' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('product') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <productitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <productitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $item->getType(); ?>]]></type>
                                 <code><![CDATA[<?php echo $item->getCode(); ?>]]></code>
                                 <label><![CDATA[<?php echo $item->getCode(); ?>]]></label>

controller/jobs/tests/Controller/Jobs/Product/Import/Csv/StandardTest.php

Spacing +94 added lines, -94 removed lines

@@ -18,119 +18,119 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 1 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 1);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
 
-		if( file_exists( 'tmp/import.zip' ) ) {
-			unlink( 'tmp/import.zip' );
+		if (file_exists('tmp/import.zip')) {
+			unlink('tmp/import.zip');
 		}
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product import CSV', $this->object->getName() );
+		$this->assertEquals('Product import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing products from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$convert = array(
 			1 => 'Text/LatinUTF8',
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/converter', $convert );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/converter', $convert);
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunUpdate()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$this->object->run();
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$config = $this->context->getConfig();
-		$mapping = $config->set( 'controller/jobs/product/import/csv/mapping', [] );
-		$mapping['item'] = array( 0 => 'product.label', 1 => 'product.code' );
+		$mapping = $config->set('controller/jobs/product/import/csv/mapping', []);
+		$mapping['item'] = array(0 => 'product.label', 1 => 'product.code');
 
-		$config->set( 'controller/jobs/product/import/csv/mapping', $mapping );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position' );
+		$config->set('controller/jobs/product/import/csv/mapping', $mapping);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position');
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
+		$this->assertEquals(2, count($result));
 	}
 
 
 	public function testRunProcessorInvalidPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
 
 		$mapping = array(
 			'item' => array(
@@ -150,11 +150,11 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$this->object->run();
 
-		$this->delete( $prodcodes, array( 'text', 'media' ), [] );
+		$this->delete($prodcodes, array('text', 'media'), []);
 	}
 
 
@@ -166,9 +166,9 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -208,15 +208,15 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 0 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 0);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -224,104 +224,104 @@ 
 	public function testRunBackup()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('Unable to copy test file');
 		}
 
 		$this->object->run();
 
-		$filename = strftime( 'tmp/test-%Y-%m-%d.zip' );
-		$this->assertTrue( file_exists( $filename ) );
+		$filename = strftime('tmp/test-%Y-%m-%d.zip');
+		$this->assertTrue(file_exists($filename));
 
-		unlink( $filename );
+		unlink($filename);
 	}
 
 
 	public function testRunBackupInvalid()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('Unable to copy test file');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
 
-	protected function delete( array $prodcodes, array $delete, array $nondelete )
+	protected function delete(array $prodcodes, array $delete, array $nondelete)
 	{
-		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context )->getSubmanager( 'lists' );
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $productManager->getSubManager( 'lists' );
+		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context)->getSubmanager('lists');
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $productManager->getSubManager('lists');
 
-		foreach( $this->get( $prodcodes, $delete + $nondelete ) as $id => $product )
+		foreach ($this->get($prodcodes, $delete + $nondelete) as $id => $product)
 		{
-			foreach( $delete as $domain )
+			foreach ($delete as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
+				$manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
 
-				foreach( $product->getListItems( $domain ) as $listItem )
+				foreach ($product->getListItems($domain) as $listItem)
 				{
-					$manager->deleteItem( $listItem->getRefItem()->getId() );
-					$listManager->deleteItem( $listItem->getId() );
+					$manager->deleteItem($listItem->getRefItem()->getId());
+					$listManager->deleteItem($listItem->getId());
 				}
 			}
 
-			foreach( $nondelete as $domain )
+			foreach ($nondelete as $domain)
 			{
-				$ids = array_keys( $product->getListItems( $domain ) );
-				$listManager->deleteItems( $ids );
+				$ids = array_keys($product->getListItems($domain));
+				$listManager->deleteItems($ids);
 			}
 
-			$productManager->deleteItem( $product->getId() );
+			$productManager->deleteItem($product->getId());
 
 			$search = $catListManager->createSearch();
-			$search->setConditions( $search->compare( '==', 'catalog.lists.refid', $id ) );
-			$result = $catListManager->searchItems( $search );
+			$search->setConditions($search->compare('==', 'catalog.lists.refid', $id));
+			$result = $catListManager->searchItems($search);
 
-			$catListManager->deleteItems( array_keys( $result ) );
+			$catListManager->deleteItems(array_keys($result));
 		}
 
 
-		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
+		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
 
 		$search = $attrManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', 'import-test' ) );
+		$search->setConditions($search->compare('==', 'attribute.code', 'import-test'));
 
-		$result = $attrManager->searchItems( $search );
+		$result = $attrManager->searchItems($search);
 
-		$attrManager->deleteItems( array_keys( $result ) );
+		$attrManager->deleteItems(array_keys($result));
 	}
 
 
-	protected function get( array $prodcodes, array $domains )
+	protected function get(array $prodcodes, array $domains)
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $prodcodes ) );
+		$search->setConditions($search->compare('==', 'product.code', $prodcodes));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
-	protected function getProperties( array $prodids )
+	protected function getProperties(array $prodids)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context )->getSubManager( 'property' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context)->getSubManager('property');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodids ) );
-		$search->setSortations( array( $search->sort( '+', 'product.property.type' ) ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodids));
+		$search->setSortations(array($search->sort('+', 'product.property.type')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

controller/jobs/src/Controller/Jobs/Product/Bought/Standard.php

Spacing +63 added lines, -63 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Products bought together' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Products bought together');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates bought together product suggestions' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates bought together product suggestions');
 	}
 
 
@@ -72,7 +72,7 @@ 
 		 * @see controller/jobs/product/bought/min-confidence
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$maxItems = $config->get( 'controller/jobs/product/bought/max-items', 5 );
+		$maxItems = $config->get('controller/jobs/product/bought/max-items', 5);
 
 		/** controller/jobs/product/bought/min-support
 		 * Minimum support value to sort out all irrelevant combinations
@@ -101,7 +101,7 @@ 
 		 * @see controller/jobs/product/bought/min-confidence
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$minSupport = $config->get( 'controller/jobs/product/bought/min-support', 0.02 );
+		$minSupport = $config->get('controller/jobs/product/bought/min-support', 0.02);
 
 		/** controller/jobs/product/bought/min-confidence
 		 * Minimum confidence value for high quality suggestions
@@ -126,7 +126,7 @@ 
 		 * @see controller/jobs/product/bought/min-support
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$minConfidence = $config->get( 'controller/jobs/product/bought/min-confidence', 0.66 );
+		$minConfidence = $config->get('controller/jobs/product/bought/min-confidence', 0.66);
 
 		/** controller/jobs/product/bought/limit-days
 		 * Only use orders placed in the past within the configured number of days for calculating bought together products
@@ -150,43 +150,43 @@ 
 		 * @see controller/jobs/product/bought/min-support
 		 * @see controller/jobs/product/bought/min-confidence
 		 */
-		$days = $config->get( 'controller/jobs/product/bought/limit-days', 180 );
-		$date = date( 'Y-m-d H:i:s', time() - $days * 86400 );
+		$days = $config->get('controller/jobs/product/bought/limit-days', 180);
+		$date = date('Y-m-d H:i:s', time() - $days * 86400);
 
 
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 		$search = $baseManager->createSearch();
-		$search->setConditions( $search->compare( '>', 'order.base.ctime', $date ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->compare('>', 'order.base.ctime', $date));
+		$search->setSlice(0, 0);
 		$totalOrders = 0;
-		$baseManager->searchItems( $search, [], $totalOrders );
+		$baseManager->searchItems($search, [], $totalOrders);
 
-		$baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product');
 		$search = $baseProductManager->createSearch();
-		$search->setConditions( $search->compare( '>', 'order.base.product.ctime', $date ) );
+		$search->setConditions($search->compare('>', 'order.base.product.ctime', $date));
 		$start = 0;
 
 		do
 		{
-			$totalCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' );
-			$prodIds = array_keys( $totalCounts );
+			$totalCounts = $baseProductManager->aggregate($search, 'order.base.product.productid');
+			$prodIds = array_keys($totalCounts);
 
-			foreach( $totalCounts as $id => $count )
+			foreach ($totalCounts as $id => $count)
 			{
-				$this->removeListItems( $id );
+				$this->removeListItems($id);
 
-				if( $count / $totalOrders > $minSupport )
+				if ($count / $totalOrders > $minSupport)
 				{
-					$productIds = $this->getSuggestions( $id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date );
-					$this->addListItems( $id, $productIds );
+					$productIds = $this->getSuggestions($id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date);
+					$this->addListItems($id, $productIds);
 				}
 			}
 
-			$count = count( $totalCounts );
+			$count = count($totalCounts);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 
 
@@ -203,59 +203,59 @@ 
 	 * @param string $date Date in YYYY-MM-DD HH:mm:ss format after which orders should be used for calculations
 	 * @return array List of suggested product IDs as key and their confidence as value
 	 */
-	protected function getSuggestions( $id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date )
+	protected function getSuggestions($id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date)
 	{
 		$refIds = [];
 		$context = $this->getContext();
 
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
-		$baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
+		$baseProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product');
 
 
 		$search = $baseProductManager->createSearch();
-		$func = $search->createFunction( 'order.base.product.count', array( (string) $id ) );
+		$func = $search->createFunction('order.base.product.count', array((string) $id));
 		$expr = array(
-			$search->compare( '==', 'order.base.product.productid', $prodIds ),
-			$search->compare( '>', 'order.base.product.ctime', $date ),
-			$search->compare( '==', $func, 1 ),
+			$search->compare('==', 'order.base.product.productid', $prodIds),
+			$search->compare('>', 'order.base.product.ctime', $date),
+			$search->compare('==', $func, 1),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$relativeCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' );
+		$relativeCounts = $baseProductManager->aggregate($search, 'order.base.product.productid');
 
 
 		$search = $catalogListManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.refid', array_keys( $relativeCounts ) ),
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
+			$search->compare('==', 'catalog.lists.refid', array_keys($relativeCounts)),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		foreach( $catalogListManager->searchItems( $search ) as $listItem ) {
+		foreach ($catalogListManager->searchItems($search) as $listItem) {
 			$refIds[$listItem->getRefId()] = true;
 		}
 
 
-		unset( $relativeCounts[$id] );
+		unset($relativeCounts[$id]);
 		$supportA = $count / $total;
 		$products = [];
 
-		foreach( $relativeCounts as $prodId => $relCnt )
+		foreach ($relativeCounts as $prodId => $relCnt)
 		{
-			if( !isset( $refIds[$prodId] ) ) {
+			if (!isset($refIds[$prodId])) {
 				continue;
 			}
 
 			$supportAB = $relCnt / $total;
 
-			if( $supportAB > $minSupport && ( $conf = ( $supportAB / $supportA ) ) > $minConfidence ) {
+			if ($supportAB > $minSupport && ($conf = ($supportAB / $supportA)) > $minConfidence) {
 				$products[$prodId] = $conf;
 			}
 		}
 
-		arsort( $products );
+		arsort($products);
 
-		return array_keys( array_slice( $products, 0, $maxItems, true ) );
+		return array_keys(array_slice($products, 0, $maxItems, true));
 	}
 
 
@@ -265,26 +265,26 @@ 
 	 * @param string $productId Unique ID of the product the given products should be referenced to
 	 * @param array $productIds List of position as key and product ID as value
 	 */
-	protected function addListItems( $productId, array $productIds )
+	protected function addListItems($productId, array $productIds)
 	{
-		if( empty( $productIds ) ) {
+		if (empty($productIds)) {
 			return;
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 		$item = $manager->createItem();
 
-		foreach( $productIds as $pos => $refid )
+		foreach ($productIds as $pos => $refid)
 		{
-			$item->setId( null );
-			$item->setParentId( $productId );
-			$item->setDomain( 'product' );
-			$item->setType( 'bought-together' );
-			$item->setPosition( $pos );
-			$item->setRefId( $refid );
-			$item->setStatus( 1 );
-
-			$manager->saveItem( $item, false );
+			$item->setId(null);
+			$item->setParentId($productId);
+			$item->setDomain('product');
+			$item->setType('bought-together');
+			$item->setPosition($pos);
+			$item->setRefId($refid);
+			$item->setStatus(1);
+
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -294,20 +294,20 @@ 
 	 *
 	 * @param string $productId Unique ID of the product the references should be removed from
 	 */
-	protected function removeListItems( $productId )
+	protected function removeListItems($productId)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $productId ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type', 'bought-together' ),
+			$search->compare('==', 'product.lists.parentid', $productId),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.type', 'bought-together'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$listItems = $manager->searchItems( $search );
+		$listItems = $manager->searchItems($search);
 
-		$manager->deleteItems( array_keys( $listItems ) );
+		$manager->deleteItems(array_keys($listItems));
 	}
 }

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

Spacing +50 added lines, -50 removed lines

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

Braces +2 added lines, -4 removed lines

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