aimeos / ai-controller-jobs

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

Doc Comments +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
 	/**
 	 * Returns the processor object for saving the product related information
 	 *
-	 * @param array $mapping Associative list of processor types as keys and index/data mappings as values
+	 * @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 )

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,38 +53,38 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface';
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		if( $name === null ) {
-			$name = $config->get( 'controller/common/product/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/product/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type . '\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 		}
 
-		$object = new $classname( $context );
+		$object = new $classname($context);
 
-		if( !( $object instanceof $iface ) ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+		if (!($object instanceof $iface)) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 		}
 
 		return $object;
@@ -97,12 +97,12 @@ 
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
 	 * @return array Associative list of positions and converter objects
 	 */
-	protected function getConverterList( array $convmap )
+	protected function getConverterList(array $convmap)
 	{
 		$convlist = array();
 
-		foreach( $convmap as $idx => $name ) {
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
+		foreach ($convmap as $idx => $name) {
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
 		}
 
 		return $convlist;
@@ -117,15 +117,15 @@ 
 	 * @param integer $codePos Column position which contains the unique product code (starting from 0)
 	 * @return array List of arrays with product codes as keys and list of values from the CSV file
 	 */
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
 	{
 		$count = 0;
 		$data = array();
 
-		while( $content->valid() && $count++ < $maxcnt )
+		while ($content->valid() && $count++ < $maxcnt)
 		{
 			$row = $content->current();
-			$data[ $row[$codePos] ] = $row;
+			$data[$row[$codePos]] = $row;
 			$content->next();
 		}
 
@@ -222,13 +222,13 @@ 
 	 * @param array $list List of CSV fields with the CSV field position as key
 	 * @return Associative list of domain item keys and the converted values
 	 */
-	protected function getMappedData( array $mapping, array $list )
+	protected function getMappedData(array $mapping, array $list)
 	{
 		$map = array();
 
-		foreach( $mapping as $idx => $key )
+		foreach ($mapping as $idx => $key)
 		{
-			if( !isset( $list[$idx] ) ) {
+			if (!isset($list[$idx])) {
 				break;
 			}
 
@@ -245,39 +245,39 @@ 
 	 * @param array $mapping Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface';
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $context, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($context, array());
 
-		foreach( $mappings as $type => $mapping )
+		foreach ($mappings as $type => $mapping)
 		{
-			if( ctype_alnum( $type ) === false )
+			if (ctype_alnum($type) === false)
 			{
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$name = $config->get( 'controller/common/product/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/product/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type . '\\' . $name : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$object = new $classname( $context, $mapping, $object );
+			$object = new $classname($context, $mapping, $object);
 
-			if( !( $object instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($object instanceof $iface)) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -292,17 +292,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 = array();
-		$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;
@@ -317,23 +317,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/Processor/Text/StandardTest.php

Doc Comments +6 added lines

@@ -291,6 +291,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function create( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
@@ -330,6 +333,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function get( $code )
 	{
 		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );

Spacing +98 added lines, -98 removed lines

@@ -21,10 +21,10 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -59,35 +59,35 @@ 
 			4 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->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( 'product', $refItem->getDomain() );
-		$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('product', $refItem->getDomain());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -115,30 +115,30 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->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++;
 		}
 	}
@@ -161,27 +161,27 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$result = $object->process( $product, $dataUpdate );
+		$result = $object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->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());
 	}
 
 
@@ -197,23 +197,23 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, array(), $this->endpoint );
-		$result = $object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, array(), $this->endpoint);
+		$result = $object->process($product, array());
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -233,18 +233,18 @@ 
 			3 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -268,79 +268,79 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/text/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$result = $object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$result = $object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->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());
 	}
 
 
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('text') as $listItem )
+		foreach ($product->getListItems('text') as $listItem)
 		{
-			$textManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$textManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('text') );
+		$result = $manager->searchItems($search, array('text'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/jobs/src/Controller/Jobs/Customer/Email/Account/Standard.php

Doc Comments -3 removed lines

@@ -98,9 +98,6 @@
 	 * Sends the account creation e-mail to the e-mail address of the customer
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
-	 * @param \Aimeos\MShop\Common\Item\Address\Iface $address Payment address item of the customer
-	 * @param string $code Customer login name
-	 * @param string $password Customer clear text password
 	 */
 	protected function sendEmail( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $item )
 	{

Spacing +22 added lines, -22 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Customer account e-mails' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Customer account e-mails');
 	}
 
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends e-mails for new customer accounts' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends e-mails for new customer accounts');
 	}
 
 
@@ -54,24 +54,24 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$queue = $context->getMessageQueue( 'mq-email', 'customer/email/account' );
-		$custManager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$queue = $context->getMessageQueue('mq-email', 'customer/email/account');
+		$custManager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
-		while( ( $msg = $queue->get() ) !== null )
+		while (($msg = $queue->get()) !== null)
 		{
-			if( ( $list = json_decode( $msg->getBody(), true ) ) !== null )
+			if (($list = json_decode($msg->getBody(), true)) !== null)
 			{
 				$item = $custManager->createItem();
-				$item->fromArray( $list );
+				$item->fromArray($list);
 
-				$this->sendEmail( $context, $item );
+				$this->sendEmail($context, $item);
 			}
 			else
 			{
-				$context->getLogger()->log( sprintf( 'Invalid JSON encode message: %1$s', $msg->getBody() ) );
+				$context->getLogger()->log(sprintf('Invalid JSON encode message: %1$s', $msg->getBody()));
 			}
 
-			$queue->del( $msg );
+			$queue->del($msg);
 		}
 	}
 
@@ -82,12 +82,12 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return \Aimeos\Client\Html\Iface Product notification e-mail client
 	 */
-	protected function getClient( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getClient(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( !isset( $this->client ) )
+		if (!isset($this->client))
 		{
-			$templatePaths = $this->getAimeos()->getCustomPaths( 'client/html' );
-			$this->client = \Aimeos\Client\Html\Email\Account\Factory::createClient( $context, $templatePaths );
+			$templatePaths = $this->getAimeos()->getCustomPaths('client/html');
+			$this->client = \Aimeos\Client\Html\Email\Account\Factory::createClient($context, $templatePaths);
 		}
 
 		return $this->client;
@@ -102,7 +102,7 @@ 
 	 * @param string $code Customer login name
 	 * @param string $password Customer clear text password
 	 */
-	protected function sendEmail( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $item )
+	protected function sendEmail(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $item)
 	{
 		$address = $item->getPaymentAddress();
 
@@ -111,20 +111,20 @@ 
 		$view->extAccountCode = $item->getCode();
 		$view->extAccountPassword = $item->getPassword();
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $context->getI18n( $address->getLanguageId() ) );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $context->getI18n($address->getLanguageId()));
+		$view->addHelper('translate', $helper);
 
 		$mailer = $context->getMail();
 		$message = $mailer->createMessage();
 
-		$helper = new \Aimeos\MW\View\Helper\Mail\Standard( $view, $message );
-		$view->addHelper( 'mail', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Mail\Standard($view, $message);
+		$view->addHelper('mail', $helper);
 
-		$client = $this->getClient( $context );
-		$client->setView( $view );
+		$client = $this->getClient($context);
+		$client->setView($view);
 		$client->getHeader();
 		$client->getBody();
 
-		$mailer->send( $message );
+		$mailer->send($message);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 				$item->fromArray( $list );
 
 				$this->sendEmail( $context, $item );
-			}
-			else
+			} else
 			{
 				$context->getLogger()->log( sprintf( 'Invalid JSON encode message: %1$s', $msg->getBody() ) );
 			}

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +4 added lines, -4 removed lines

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

Spacing +68 added lines, -68 removed lines

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

Braces +2 added lines, -4 removed lines

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

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

Spacing +25 added lines, -25 removed lines

@@ -42,12 +42,12 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
-		$this->cache = $this->getCache( 'warehouse' );
+		$this->cache = $this->getCache('warehouse');
 	}
 
 
@@ -58,55 +58,55 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 		$manager->begin();
 
 		try
 		{
 			$pos = 0;
 			$delete = array();
-			$map = $this->getMappedChunk( $data );
-			$items = $this->getStockItems( $product->getId() );
+			$map = $this->getMappedChunk($data);
+			$items = $this->getStockItems($product->getId());
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !array_key_exists( 'product.stock.stocklevel', $list ) ) {
+				if (!array_key_exists('product.stock.stocklevel', $list)) {
 					continue;
 				}
 
-				$whcode = ( isset( $list['product.stock.warehouse'] ) ? $list['product.stock.warehouse'] : 'default' );
+				$whcode = (isset($list['product.stock.warehouse']) ? $list['product.stock.warehouse'] : 'default');
 
-				if( !isset( $list['product.stock.warehouseid'] ) ) {
-					$list['product.stock.warehouseid'] = $this->cache->get( $whcode );
+				if (!isset($list['product.stock.warehouseid'])) {
+					$list['product.stock.warehouseid'] = $this->cache->get($whcode);
 				}
 
-				if( isset( $list['product.stock.dateback'] ) && $list['product.stock.dateback'] === '' ) {
+				if (isset($list['product.stock.dateback']) && $list['product.stock.dateback'] === '') {
 					$list['product.stock.dateback'] = null;
 				}
 
-				if( $list['product.stock.stocklevel'] === '' ) {
+				if ($list['product.stock.stocklevel'] === '') {
 					$list['product.stock.stocklevel'] = null;
 				}
 
 				$list['product.stock.parentid'] = $product->getId();
 
-				if( ( $item = array_pop( $items ) ) === null ) {
+				if (($item = array_pop($items)) === null) {
 					$item = $manager->createItem();
 				}
 
-				$item->fromArray( $list );
-				$manager->saveItem( $item );
+				$item->fromArray($list);
+				$manager->saveItem($item);
 			}
 
-			$manager->deleteItems( array_keys( $items ) );
+			$manager->deleteItems(array_keys($items));
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -122,13 +122,13 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of product stock items
 	 */
-	protected function getStockItems( $prodid )
+	protected function getStockItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $prodid ) );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $prodid));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

Braces +1 added lines, -2 removed lines

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

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

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null)
 	{
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		return $data;
 	}

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

Spacing +45 added lines, -45 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/attribute/listtypes
 		 * Names of the product list types for attributes that are updated or removed
@@ -67,9 +67,9 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/attribute/listtypes');
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/attribute/listtypes');
 
-		$this->cache = $this->getCache( 'attribute' );
+		$this->cache = $this->getCache('attribute');
 	}
 
 
@@ -80,12 +80,12 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'attribute' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'attribute');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
@@ -93,25 +93,25 @@ 
 		{
 			$pos = 0;
 			$delete = $attrcodes = array();
-			$map = $this->getMappedChunk( $data );
-			$listItems = $product->getListItems( 'attribute', $this->listTypes );
+			$map = $this->getMappedChunk($data);
+			$listItems = $product->getListItems('attribute', $this->listTypes);
 
-			foreach( $listItems as $listId => $listItem )
+			foreach ($listItems as $listId => $listItem)
 			{
-				if( isset( $map[$pos] ) )
+				if (isset($map[$pos]))
 				{
-					if( !isset( $map[$pos]['attribute.code'] ) || !isset( $map[$pos]['attribute.type'] ) )
+					if (!isset($map[$pos]['attribute.code']) || !isset($map[$pos]['attribute.type']))
 					{
-						unset( $map[$pos] );
+						unset($map[$pos]);
 						continue;
 					}
 
 					$refItem = $listItem->getRefItem();
 
-					if( $refItem !== null && $map[$pos]['attribute.code'] === $refItem->getCode()
+					if ($refItem !== null && $map[$pos]['attribute.code'] === $refItem->getCode()
 						&& $map[$pos]['attribute.type'] === $refItem->getType()
-						&& ( !isset( $map[$pos]['product.lists.type'] ) || isset( $map[$pos]['product.lists.type'] )
-						&& $map[$pos]['product.lists.type'] === $listItem->getType() )
+						&& (!isset($map[$pos]['product.lists.type']) || isset($map[$pos]['product.lists.type'])
+						&& $map[$pos]['product.lists.type'] === $listItem->getType())
 					) {
 						$pos++;
 						continue;
@@ -123,46 +123,46 @@ 
 				$pos++;
 			}
 
-			$listManager->deleteItems( $delete );
+			$listManager->deleteItems($delete);
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !isset( $list['attribute.code'] ) || $list['attribute.code'] === '' || $list['attribute.type'] === ''
-					|| isset( $list['product.lists.type'] ) && $this->listTypes !== null
-					&& !in_array( $list['product.lists.type'], (array) $this->listTypes )
+				if (!isset($list['attribute.code']) || $list['attribute.code'] === '' || $list['attribute.type'] === ''
+					|| isset($list['product.lists.type']) && $this->listTypes !== null
+					&& !in_array($list['product.lists.type'], (array) $this->listTypes)
 				) {
 					continue;
 				}
 
-				$codes = explode( $separator, $list['attribute.code'] );
+				$codes = explode($separator, $list['attribute.code']);
 
-				foreach( $codes as $code )
+				foreach ($codes as $code)
 				{
-					$attrItem = $this->getAttributeItem( $code, $list['attribute.type'] );
-					$attrItem->fromArray( $list );
-					$attrItem->setCode( $code );
-					$manager->saveItem( $attrItem );
+					$attrItem = $this->getAttributeItem($code, $list['attribute.type']);
+					$attrItem->fromArray($list);
+					$attrItem->setCode($code);
+					$manager->saveItem($attrItem);
 
-					if( ( $listItem = array_shift( $listItems ) ) === null ) {
+					if (($listItem = array_shift($listItems)) === null) {
 						$listItem = $listManager->createItem();
 					}
 
-					$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
-					$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'attribute', $typecode );
+					$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
+					$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'attribute', $typecode);
 					$list['product.lists.refid'] = $attrItem->getId();
 					$list['product.lists.parentid'] = $product->getId();
 					$list['product.lists.domain'] = 'attribute';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -179,21 +179,21 @@ 
 	 * @param string $type Attribute type
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item object
 	 */
-	protected function getAttributeItem( $code, $type )
+	protected function getAttributeItem($code, $type)
 	{
-		if( ( $item = $this->cache->get( $code, $type ) ) === null )
+		if (($item = $this->cache->get($code, $type)) === null)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 			$item = $manager->createItem();
-			$item->setTypeId( $this->getTypeId( 'attribute/type', 'product', $type ) );
-			$item->setCode( $code );
-			$item->setLabel( $type . ' ' . $code );
-			$item->setStatus( 1 );
+			$item->setTypeId($this->getTypeId('attribute/type', 'product', $type));
+			$item->setCode($code);
+			$item->setLabel($type . ' ' . $code);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 
-			$this->cache->set( $item );
+			$this->cache->set($item);
 		}
 
 		return $item;

Braces +1 added lines, -2 removed lines

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

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

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor = null);
 
 
 	/**
@@ -37,5 +37,5 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data );
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data);
 }
\ No newline at end of file

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

Spacing +45 added lines, -45 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/catalog/listtypes
 		 * Names of the catalog list types that are updated or removed
@@ -67,9 +67,9 @@ 
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/catalog/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/catalog/listtypes');
 
-		$this->cache = $this->getCache( 'catalog' );
+		$this->cache = $this->getCache('catalog');
 	}
 
 
@@ -80,11 +80,11 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
 
 		/** controller/common/product/import/csv/separator
 		 * Single separator character for multiple entries in one field of the import file
@@ -104,54 +104,54 @@ 
 		 * @category Developer
 		 * @see controller/common/product/import/csv/domains
 		 */
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
 		try
 		{
 			$prodid = $product->getId();
-			$map = $this->getMappedChunk( $data );
-			$listItems = $this->getListItemPool( $product, $map );
+			$map = $this->getMappedChunk($data);
+			$listItems = $this->getListItemPool($product, $map);
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !isset( $list['catalog.code'] ) || $list['catalog.code'] === '' || isset( $list['catalog.lists.type'] )
-					&& $this->listTypes !== null && !in_array( $list['catalog.lists.type'], (array) $this->listTypes )
+				if (!isset($list['catalog.code']) || $list['catalog.code'] === '' || isset($list['catalog.lists.type'])
+					&& $this->listTypes !== null && !in_array($list['catalog.lists.type'], (array) $this->listTypes)
 				) {
 					continue;
 				}
 
-				$codes = explode( $separator, $list['catalog.code'] );
-				$type = ( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' );
+				$codes = explode($separator, $list['catalog.code']);
+				$type = (isset($list['catalog.lists.type']) ? $list['catalog.lists.type'] : 'default');
 
-				foreach( $codes as $code )
+				foreach ($codes as $code)
 				{
-					if( ( $catid = $this->cache->get( $code ) ) === null )
+					if (($catid = $this->cache->get($code)) === null)
 					{
 						$msg = 'No category for code "%1$s" available when importing product with code "%2$s"';
-						throw new \Aimeos\Controller\Jobs\Exception( sprintf( $msg, $code, $product->getCode() ) );
+						throw new \Aimeos\Controller\Jobs\Exception(sprintf($msg, $code, $product->getCode()));
 					}
 
-					if( ( $listItem = array_shift( $listItems ) ) === null ) {
+					if (($listItem = array_shift($listItems)) === null) {
 						$listItem = $listManager->createItem();
 					}
 
-					$list['catalog.lists.typeid'] = $this->getTypeId( 'catalog/lists/type', 'product', $type );
+					$list['catalog.lists.typeid'] = $this->getTypeId('catalog/lists/type', 'product', $type);
 					$list['catalog.lists.parentid'] = $catid;
 					$list['catalog.lists.refid'] = $prodid;
 					$list['catalog.lists.domain'] = 'product';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -168,13 +168,13 @@ 
 	 * @param integer $pos Computed position of the list item in the associated list of items
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addListItemDefaults( array $list, $pos )
+	protected function addListItemDefaults(array $list, $pos)
 	{
-		if( !isset( $list['catalog.lists.position'] ) ) {
+		if (!isset($list['catalog.lists.position'])) {
 			$list['catalog.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['catalog.lists.status'] ) ) {
+		if (!isset($list['catalog.lists.status'])) {
 			$list['catalog.lists.status'] = 1;
 		}
 
@@ -189,25 +189,25 @@ 
 	 * @param array|null $types List of catalog list types
 	 * @return array List of catalog list items
 	 */
-	protected function getListItems( $prodid, $types )
+	protected function getListItems($prodid, $types)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 		$search = $manager->createSearch();
 
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 		);
 
-		if( $types !== null ) {
-			$expr[] = $search->compare( '==', 'catalog.lists.type.code', $types );
+		if ($types !== null) {
+			$expr[] = $search->compare('==', 'catalog.lists.type.code', $types);
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'catalog.lists.position' ) ) );
-		$search->setSlice( 0, 0x7FFFFFFF );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'catalog.lists.position')));
+		$search->setSlice(0, 0x7FFFFFFF);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -218,16 +218,16 @@ 
 	 * @param array $map List of associative arrays containing the chunked properties
 	 * @return array List of list items implementing \Aimeos\MShop\Common\Item\Lists\Iface
 	 */
-	protected function getListItemPool( \Aimeos\MShop\Product\Item\Iface $product, array $map )
+	protected function getListItemPool(\Aimeos\MShop\Product\Item\Iface $product, array $map)
 	{
 		$pos = 0;
 		$delete = array();
-		$listItems = $this->getListItems( $product->getId(), $this->listTypes );
+		$listItems = $this->getListItems($product->getId(), $this->listTypes);
 
-		foreach( $listItems as $listId => $listItem )
+		foreach ($listItems as $listId => $listItem)
 		{
-			if( isset( $map[$pos] ) && ( !isset( $map[$pos]['catalog.code'] )
-				|| $this->cache->get( $map[$pos]['catalog.code'] ) == $listItem->getParentId() )
+			if (isset($map[$pos]) && (!isset($map[$pos]['catalog.code'])
+				|| $this->cache->get($map[$pos]['catalog.code']) == $listItem->getParentId())
 			) {
 				$pos++;
 				continue;
@@ -238,8 +238,8 @@ 
 			$pos++;
 		}
 
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
-		$listManager->deleteItems( $delete );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
+		$listManager->deleteItems($delete);
 
 		return $listItems;
 	}

Braces +1 added lines, -2 removed lines

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