aimeos / ai-controller-jobs

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

Spacing +50 added lines, -50 removed lines

@@ -30,14 +30,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]);
 				}
 			}
 		}
@@ -53,36 +53,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;
 	}
@@ -94,12 +94,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;
@@ -114,15 +114,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();
 		}
 
@@ -178,21 +178,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]);
 			}
 		}
 
@@ -206,37 +206,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;
@@ -251,23 +251,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/tests/Controller/Common/Product/Import/Csv/TraitsTest.php

Spacing +29 added lines, -29 removed lines

@@ -16,92 +16,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->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetCacheInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'attribute', 'unknown' );
+		$this->setExpectedException('\\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->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\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->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getTypeIdPublic( 'attribute/type', 'product', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getTypeIdPublic('attribute/type', 'product', 'unknown');
 	}
 }
 
@@ -115,21 +115,21 @@ 
 		return \TestHelperCntl::getContext();
 	}
 
-	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);
 	}
 }
 

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

Spacing +56 added lines, -56 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,36 +53,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;
 	}
@@ -94,12 +94,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;
@@ -114,15 +114,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();
 		}
 
@@ -221,21 +221,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]);
 			}
 		}
 
@@ -249,37 +249,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;
@@ -293,17 +293,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;
@@ -318,23 +318,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/jobs/src/Controller/Jobs/Subscription/Process/End/Standard.php

Spacing +21 added lines, -21 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process end' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process end');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Terminates expired subscriptions' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Terminates expired subscriptions');
 	}
 
 
@@ -65,51 +65,51 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<', 'subscription.dateend', date( 'Y-m-d' ) ),
+			$search->compare('<', 'subscription.dateend', date('Y-m-d')),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					foreach( $processors as $processor ) {
-						$processor->end( $item );
+					foreach ($processors as $processor) {
+						$processor->end($item);
 					}
 
-					if( ( $reason = $item->getReason() ) === null ) {
+					if (($reason = $item->getReason()) === null) {
 						$reason = \Aimeos\MShop\Subscription\Item\Iface::REASON_END;
 					}
 
-					$manager->saveItem( $item->setReason( $reason )->setStatus( 0 ) );
+					$manager->saveItem($item->setReason($reason)->setStatus(0));
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

controller/jobs/tests/Controller/Jobs/Subscription/Process/Begin/StanardTest.php

Spacing +29 added lines, -29 removed lines

@@ -20,49 +20,49 @@ 
 		$aimeos = \TestHelperJobs::getAimeos();
 		$this->context = \TestHelperJobs::getContext();
 
-		$this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Begin\Standard( $this->context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Begin\Standard($this->context, $aimeos);
 
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Subscription process start', $this->object->getName() );
+		$this->assertEquals('Subscription process start', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
-		$this->assertEquals( 'Process subscriptions initially', $this->object->getDescription() );
+		$this->assertEquals('Process subscriptions initially', $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] );
+		$this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']);
 		$item = $this->getSubscription();
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['searchItems', 'saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['searchItems', 'saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [$item] ) );
+		$managerStub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([$item]));
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' );
+		$managerStub->expects($this->once())->method('saveItem');
 
 		$this->object->run();
 	}
@@ -70,21 +70,21 @@ 
 
 	public function testRunException()
 	{
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] );
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processor/cgroup/groupids', ['1'] );
+		$this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']);
+		$this->context->getConfig()->set('controller/common/subscription/process/processor/cgroup/groupids', ['1']);
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['searchItems', 'saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['searchItems', 'saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [$managerStub->createItem()] ) );
+		$managerStub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([$managerStub->createItem()]));
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->throwException( new \Exception() ) );
+		$managerStub->expects($this->once())->method('saveItem')
+			->will($this->throwException(new \Exception()));
 
 		$this->object->run();
 	}
@@ -92,17 +92,17 @@ 
 
 	protected function getSubscription()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

controller/common/tests/Controller/Common/Catalog/Import/Csv/Processor/Text/StandardTest.php

Spacing +62 added lines, -62 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -49,31 +49,31 @@ 
 			4 => 1,
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'text', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('text', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'name', $refItem->getType() );
-		$this->assertEquals( 'test text', $refItem->getLabel() );
-		$this->assertEquals( 'Job CSV test', $refItem->getContent() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('name', $refItem->getType());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -101,27 +101,27 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
 		$expected = array(
-			0 => array( 'name', 'Job CSV test' ),
-			1 => array( 'short', 'Short: Job CSV test' ),
-			2 => array( 'long', 'Long: Job CSV test' ),
-			3 => array( 'long', 'Long: Job CSV test 2' ),
+			0 => array('name', 'Job CSV test'),
+			1 => array('short', 'Short: Job CSV test'),
+			2 => array('long', 'Long: Job CSV test'),
+			3 => array('long', 'Long: Job CSV test 2'),
 		);
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() );
+			$this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent());
 			$pos++;
 		}
 	}
@@ -144,21 +144,21 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
-		$object->process( $catalog, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
+		$object->process($catalog, $dataUpdate);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent());
 	}
 
 
@@ -174,18 +174,18 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, [], $this->endpoint );
-		$object->process( $catalog, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, [], $this->endpoint);
+		$object->process($catalog, []);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -205,15 +205,15 @@ 
 			3 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -237,35 +237,35 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/catalog/import/csv/processor/text/listtypes', array('default'));
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'test short', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('test short', $listItem->getRefItem()->getContent());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
 		return $item;
 	}

controller/common/tests/Controller/Common/Catalog/Import/Csv/Processor/Media/StandardTest.php

Spacing +64 added lines, -64 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -51,32 +51,32 @@ 
 			5 => 1,
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'media', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('media', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$this->assertEquals( 'test image', $refItem->getLabel() );
-		$this->assertEquals( 'image/jpeg', $refItem->getMimetype() );
-		$this->assertEquals( 'path/to/preview', $refItem->getPreview() );
-		$this->assertEquals( 'path/to/file', $refItem->getUrl() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('default', $refItem->getType());
+		$this->assertEquals('test image', $refItem->getLabel());
+		$this->assertEquals('image/jpeg', $refItem->getMimetype());
+		$this->assertEquals('path/to/preview', $refItem->getPreview());
+		$this->assertEquals('path/to/file', $refItem->getUrl());
+		$this->assertEquals('de', $refItem->getLanguageId());
 	}
 
 
@@ -90,21 +90,21 @@ 
 			0 => "path/to/0\npath/to/1\npath/to/2\npath/to/3",
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
-		$expected = array( 'path/to/0', 'path/to/1', 'path/to/2', 'path/to/3' );
+		$expected = array('path/to/0', 'path/to/1', 'path/to/2', 'path/to/3');
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($expected[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -126,20 +126,20 @@ 
 			3 => 'path/to/3',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $data[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($data[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -162,21 +162,21 @@ 
 			1 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
-		$object->process( $catalog, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
+		$object->process($catalog, $dataUpdate);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'path/to/new', $listItem->getRefItem()->getUrl() );
-		$this->assertEquals( null, $listItem->getRefItem()->getLanguageId() );
+		$this->assertEquals('path/to/new', $listItem->getRefItem()->getUrl());
+		$this->assertEquals(null, $listItem->getRefItem()->getLanguageId());
 	}
 
 
@@ -190,18 +190,18 @@ 
 			0 => '/path/to/file',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, [], $this->endpoint );
-		$object->process( $catalog, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, [], $this->endpoint);
+		$object->process($catalog, []);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -217,15 +217,15 @@ 
 			1 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -245,34 +245,34 @@ 
 			3 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/media/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/catalog/import/csv/processor/media/listtypes', array('default'));
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'path/to/file2', $listItem->getRefItem()->getUrl() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('path/to/file2', $listItem->getRefItem()->getUrl());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
 		return $item;
 	}

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

Spacing +89 added lines, -89 removed lines

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

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

Spacing +33 added lines, -33 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\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/text/listtypes
 		 * Names of the catalog list types for texts that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/catalog/import/csv/processor/price/listtypes
 		 * @see controller/common/catalog/import/csv/processor/catalog/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/catalog/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,53 +77,53 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $catalog->getListItems( 'text', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $catalog->getListItems('text', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$content = trim( $list['text.content'] );
-			$type = trim( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-			$typecode = trim( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' );
+			$content = trim($list['text.content']);
+			$type = trim(isset($list['text.type']) ? $list['text.type'] : 'name');
+			$typecode = trim(isset($list['catalog.lists.type']) ? $list['catalog.lists.type'] : 'default');
 
-			if( isset( $listMap[$content][$type][$typecode] ) )
+			if (isset($listMap[$content][$type][$typecode]))
 			{
 				$listItem = $listMap[$content][$type][$typecode];
 				$refItem = $listItem->getRefItem();
-				unset( $listItems[ $listItem->getId() ] );
+				unset($listItems[$listItem->getId()]);
 			}
 			else
 			{
-				$listItem = $listManager->createItem( $typecode, 'text' );
-				$refItem = $manager->createItem( $type, 'catalog' );
+				$listItem = $listManager->createItem($typecode, 'text');
+				$refItem = $manager->createItem($type, 'catalog');
 			}
 
-			$refItem->fromArray( $this->addItemDefaults( $list ) );
-			$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
+			$refItem->fromArray($this->addItemDefaults($list));
+			$listItem->fromArray($this->addListItemDefaults($list, $pos));
 
-			$catalog->addListItem( 'text', $listItem, $refItem );
+			$catalog->addListItem('text', $listItem, $refItem);
 		}
 
-		$catalog->deleteListItems( $listItems, true );
+		$catalog->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $catalog, $data );
+		return $this->getObject()->process($catalog, $data);
 	}
 
 
@@ -133,13 +133,13 @@ 
 	 * @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( trim( $list['text.content'] ), 0, 255 );
+		if (!isset($list['text.label'])) {
+			$list['text.label'] = mb_strcut(trim($list['text.content']), 0, 255);
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -153,10 +153,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'] ) || trim( $list['text.content'] ) === '' || isset( $list['catalog.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['catalog.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['catalog.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['catalog.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}