aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Media/Scale/Standard.php

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rescale product images' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rescale product images');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rescales product images to the new sizes' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rescales product images to the new sizes');
 	}
 
 
@@ -50,33 +50,33 @@ 
 	 */
 	public function run()
 	{
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $this->getContext() );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'media' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($this->getContext());
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'media');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.domain', 'product' ),
-			$search->compare( '=~', 'media.mimetype', 'image/' ),
+			$search->compare('==', 'media.domain', 'product'),
+			$search->compare('=~', 'media.mimetype', 'image/'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'media.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'media.id')));
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$cntl->scale( $item, 'fs-media' );
-				$manager->saveItem( $item );
+				$cntl->scale($item, 'fs-media');
+				$manager->saveItem($item);
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

controller/jobs/tests/Controller/Jobs/Media/Scale/StandardTest.php

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Media\Scale\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Media\Scale\Standard($context, $aimeos);
 	}
 
 
@@ -31,14 +31,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Rescale product images', $this->object->getName() );
+		$this->assertEquals('Rescale product images', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Rescales product images to the new sizes';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -49,31 +49,31 @@ 
 
 
 		$name = 'ControllerJobsMediaScaleStandardRun';
-		$context->getConfig()->set( 'mshop/media/manager/name', $name );
-		$context->getConfig()->set( 'controller/common/media/name', $name );
+		$context->getConfig()->set('mshop/media/manager/name', $name);
+		$context->getConfig()->set('controller/common/media/name', $name);
 
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Media\\Manager\\Standard' )
-			->setMethods( array( 'saveItem' ) )
-			->setConstructorArgs( array( $context ) )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Media\\Manager\\Standard')
+			->setMethods(array('saveItem'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Media\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Media\\Manager\\' . $name, $managerStub );
+		\Aimeos\MShop\Media\Manager\Factory::injectManager('\\Aimeos\\MShop\\Media\\Manager\\' . $name, $managerStub);
 
-		$managerStub->expects( $this->atLeast( 1 ) )->method( 'saveItem' );
+		$managerStub->expects($this->atLeast(1))->method('saveItem');
 
 
-		$cntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Media\\Standard' )
-			->setMethods( array( 'scale' ) )
-			->setConstructorArgs( array( $context ) )
+		$cntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Media\\Standard')
+			->setMethods(array('scale'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Media\Factory::injectController( '\\Aimeos\\Controller\\Common\\Media\\' . $name, $cntlStub );
+		\Aimeos\Controller\Common\Media\Factory::injectController('\\Aimeos\\Controller\\Common\\Media\\' . $name, $cntlStub);
 
-		$cntlStub->expects( $this->atLeast( 1 ) )->method( 'scale' );
+		$cntlStub->expects($this->atLeast(1))->method('scale');
 
 
-		$object = new \Aimeos\Controller\Jobs\Media\Scale\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Media\Scale\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Stock/StandardTest.php

Spacing +63 added lines, -63 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\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -43,21 +43,21 @@ 
 			1 => '2000-01-01 00:00:00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getCode() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getCode());
+		$this->delete($product);
 
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( 100, $item->getStocklevel() );
-			$this->assertEquals( '2000-01-01 00:00:00', $item->getDateBack() );
+			$this->assertEquals(100, $item->getStocklevel());
+			$this->assertEquals('2000-01-01 00:00:00', $item->getDateBack());
 		}
 	}
 
@@ -78,19 +78,19 @@ 
 			3 => '200',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getCode() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getCode());
+		$this->delete($product);
 
 
-		$this->assertEquals( 2, count( $items ) );
+		$this->assertEquals(2, count($items));
 
-		foreach( $items as $item ) {
-			$this->assertEquals( 200, $item->getStocklevel() );
+		foreach ($items as $item) {
+			$this->assertEquals(200, $item->getStocklevel());
 		}
 	}
 
@@ -109,21 +109,21 @@ 
 			0 => '20',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
 
-		$object->process( $product, $data );
-		$object->process( $product, $dataUpdate );
+		$object->process($product, $data);
+		$object->process($product, $dataUpdate);
 
-		$items = $this->getStockItems( $product->getCode() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getCode());
+		$this->delete($product);
 
 
-		$item = reset( $items );
+		$item = reset($items);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertEquals( 20, $item->getStocklevel() );
+		$this->assertEquals(1, count($items));
+		$this->assertEquals(20, $item->getStocklevel());
 	}
 
 
@@ -137,19 +137,19 @@ 
 			0 => 50,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, array(), $this->endpoint );
-		$object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, array(), $this->endpoint);
+		$object->process($product, array());
 
-		$items = $this->getStockItems( $product->getCode() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getCode());
+		$this->delete($product);
 
 
-		$this->assertEquals( 0, count( $items ) );
+		$this->assertEquals(0, count($items));
 	}
 
 
@@ -167,20 +167,20 @@ 
 			2 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getCode() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getCode());
+		$this->delete($product);
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( null, $item->getStocklevel() );
-			$this->assertEquals( null, $item->getDateBack() );
+			$this->assertEquals(null, $item->getStocklevel());
+			$this->assertEquals(null, $item->getDateBack());
 		}
 	}
 
@@ -188,43 +188,43 @@ 
 	/**
 	 * @param string $code
 	 */
-	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 \RuntimeException( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \RuntimeException('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)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$manager->deleteItem( $product->getId() );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function getStockItems( $code )
+	protected function getStockItems($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'stock.productcode', $code ) );
+		$search->setConditions($search->compare('==', 'stock.productcode', $code));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

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

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 	 *
 	 * @param array $list Associative list of key/value pairs
 	 * @param string $key Key for the value to retrieve
-	 * @param mixed $default Default value if key isn't found
+	 * @param string $default Default value if key isn't found
 	 * @param mixed Value for the key in the list of the default value
 	 */
 	protected function getValue( array $list, $key, $default )

Spacing +9 added lines, -9 removed lines

@@ -32,8 +32,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;
@@ -48,13 +48,13 @@ 
 	 * @param integer $pos Computed position of the list item in the associated list of items
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addListItemDefaults( array $list, $pos )
+	protected function addListItemDefaults(array $list, $pos)
 	{
-		if( !isset( $list['product.lists.position'] ) ) {
+		if (!isset($list['product.lists.position'])) {
 			$list['product.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['product.lists.status'] ) ) {
+		if (!isset($list['product.lists.status'])) {
 			$list['product.lists.status'] = 1;
 		}
 
@@ -92,8 +92,8 @@ 
 	 */
 	protected function getObject()
 	{
-		if( $this->object === null ) {
-			throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' );
+		if ($this->object === null) {
+			throw new \Aimeos\Controller\Jobs\Exception('No processor object available');
 		}
 
 		return $this->object;
@@ -108,8 +108,8 @@ 
 	 * @param mixed $default Default value if key isn't found
 	 * @param mixed Value for the key in the list of the default value
 	 */
-	protected function getValue( array $list, $key, $default )
+	protected function getValue(array $list, $key, $default)
 	{
-		return ( isset( $list[$key] ) ? $list[$key] : $default );
+		return (isset($list[$key]) ? $list[$key] : $default);
 	}
 }

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

Spacing +39 added lines, -39 removed lines

@@ -42,10 +42,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/media/listtypes
 		 * Names of the product list types for media that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/media/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/media/listtypes');
 	}
 
 
@@ -77,45 +77,45 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
 		try
 		{
 			$delete = $listMap = array();
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $product->getListItems( 'media', $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $product->getListItems('media', $this->listTypes);
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-					$listMap[ $refItem->getUrl() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+				if (($refItem = $listItem->getRefItem()) !== null) {
+					$listMap[$refItem->getUrl()][$refItem->getType()][$listItem->getType()] = $listItem;
 				}
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$urls = explode( $separator, $list['media.url'] );
-				$type = $this->getValue( $list, 'media.type', 'default' );
-				$typecode = $this->getValue( $list, 'product.lists.type', 'default' );
+				$urls = explode($separator, $list['media.url']);
+				$type = $this->getValue($list, 'media.type', 'default');
+				$typecode = $this->getValue($list, 'product.lists.type', 'default');
 
-				foreach( $urls as $url )
+				foreach ($urls as $url)
 				{
-					if( isset( $listMap[$url][$type][$typecode] ) )
+					if (isset($listMap[$url][$type][$typecode]))
 					{
 						$listItem = $listMap[$url][$type][$typecode];
 						$refItem = $listItem->getRefItem();
-						unset( $listItems[ $listItem->getId() ] );
+						unset($listItems[$listItem->getId()]);
 					}
 					else
 					{
@@ -123,35 +123,35 @@ 
 						$refItem = $manager->createItem();
 					}
 
-					$list['media.typeid'] = $this->getTypeId( 'media/type', 'product', $type );
+					$list['media.typeid'] = $this->getTypeId('media/type', 'product', $type);
 					$list['media.domain'] = 'product';
 					$list['media.url'] = $url;
 
-					$refItem->fromArray( $this->addItemDefaults( $list ) );
-					$manager->saveItem( $refItem );
+					$refItem->fromArray($this->addItemDefaults($list));
+					$manager->saveItem($refItem);
 
-					$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'media', $typecode );
+					$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'media', $typecode);
 					$list['product.lists.parentid'] = $product->getId();
 					$list['product.lists.refid'] = $refItem->getId();
 					$list['product.lists.domain'] = 'media';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			foreach( $listItems as $listItem ) {
+			foreach ($listItems as $listItem) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -167,17 +167,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "media.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['media.label'] ) ) {
+		if (!isset($list['media.label'])) {
 			$list['media.label'] = $list['media.url'];
 		}
 
-		if( !isset( $list['media.preview'] ) ) {
+		if (!isset($list['media.preview'])) {
 			$list['media.preview'] = $list['media.url'];
 		}
 
-		if( !isset( $list['media.status'] ) ) {
+		if (!isset($list['media.status'])) {
 			$list['media.status'] = 1;
 		}
 
@@ -191,10 +191,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['media.url'] ) || $list['media.url'] === '' || isset( $list['product.lists.type'] )
-				&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+		if (!isset($list['media.url']) || $list['media.url'] === '' || isset($list['product.lists.type'])
+				&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
 						$listItem = $listMap[$url][$type][$typecode];
 						$refItem = $listItem->getRefItem();
 						unset( $listItems[ $listItem->getId() ] );
-					}
-					else
+					} else
 					{
 						$listItem = $listManager->createItem();
 						$refItem = $manager->createItem();
@@ -150,8 +149,7 @@ 
 			$data = $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/Catalog/Standard.php

Spacing +44 added lines, -44 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -145,8 +145,7 @@ 
 					{
 						$listItem = $listMap[$catid][$type];
 						unset( $listItems[ $listItem->getId() ] );
-					}
-					else
+					} else
 					{
 						$listItem = $listManager->createItem();
 					}
@@ -160,8 +159,7 @@ 
 			$data = $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/Text/Standard.php

Spacing +38 added lines, -38 removed lines

@@ -42,10 +42,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/text/listtypes
 		 * Names of the product list types for texts that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,39 +77,39 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 		$manager->begin();
 
 		try
 		{
 			$delete = $listMap = array();
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $product->getListItems( 'text', $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $product->getListItems('text', $this->listTypes);
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-					$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+				if (($refItem = $listItem->getRefItem()) !== null) {
+					$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
 				}
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$type = ( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+				$type = (isset($list['text.type']) ? $list['text.type'] : 'name');
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-				if( isset( $listMap[ $list['text.content'] ][$type][$typecode] ) )
+				if (isset($listMap[$list['text.content']][$type][$typecode]))
 				{
-					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
+					$listItem = $listMap[$list['text.content']][$type][$typecode];
 					$refItem = $listItem->getRefItem();
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
@@ -117,33 +117,33 @@ 
 					$refItem = $manager->createItem();
 				}
 
-				$list['text.typeid'] = $this->getTypeId( 'text/type', 'product', $type );
+				$list['text.typeid'] = $this->getTypeId('text/type', 'product', $type);
 				$list['text.domain'] = 'product';
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$manager->saveItem( $refItem );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$manager->saveItem($refItem);
 
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'text', $typecode );
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'text', $typecode);
 				$list['product.lists.parentid'] = $product->getId();
 				$list['product.lists.refid'] = $refItem->getId();
 				$list['product.lists.domain'] = 'text';
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-				$listManager->saveItem( $listItem );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
+				$listManager->saveItem($listItem);
 			}
 
-			foreach( $listItems as $listItem ) {
+			foreach ($listItems as $listItem) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -159,17 +159,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['text.label'] ) ) {
-			$list['text.label'] = mb_strcut( $list['text.content'], 0, 255 );
+		if (!isset($list['text.label'])) {
+			$list['text.label'] = mb_strcut($list['text.content'], 0, 255);
 		}
 
-		if( !isset( $list['text.languageid'] ) ) {
+		if (!isset($list['text.languageid'])) {
 			$list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId();
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -183,10 +183,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['text.content'] ) || $list['text.content'] === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+		if (!isset($list['text.content']) || $list['text.content'] === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +2 added lines, -4 removed lines

@@ -110,8 +110,7 @@ 
 					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem();
 					$refItem = $manager->createItem();
@@ -142,8 +141,7 @@ 
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +37 added lines, -37 removed lines

@@ -42,10 +42,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/price/listtypes
 		 * Names of the product list types for prices that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/price/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/price/listtypes');
 	}
 
 
@@ -77,40 +77,40 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price');
 		$manager->begin();
 
 		try
 		{
 			$delete = $listMap = array();
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $product->getListItems( 'price', $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $product->getListItems('price', $this->listTypes);
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-					$listMap[ $refItem->getValue() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+				if (($refItem = $listItem->getRefItem()) !== null) {
+					$listMap[$refItem->getValue()][$refItem->getType()][$listItem->getType()] = $listItem;
 				}
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$value = ( isset( $list['price.value'] ) ? $list['price.value'] : '0.00' );
-				$type = ( isset( $list['price.type'] ) ? $list['price.type'] : 'default' );
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+				$value = (isset($list['price.value']) ? $list['price.value'] : '0.00');
+				$type = (isset($list['price.type']) ? $list['price.type'] : 'default');
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-				if( isset( $listMap[$value][$type][$typecode] ) )
+				if (isset($listMap[$value][$type][$typecode]))
 				{
 					$listItem = $listMap[$value][$type][$typecode];
 					$refItem = $listItem->getRefItem();
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
@@ -118,33 +118,33 @@ 
 					$refItem = $manager->createItem();
 				}
 
-				$list['price.typeid'] = $this->getTypeId( 'price/type', 'product', $type );
+				$list['price.typeid'] = $this->getTypeId('price/type', 'product', $type);
 				$list['price.domain'] = 'product';
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$manager->saveItem( $refItem );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$manager->saveItem($refItem);
 
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'price', $typecode );
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'price', $typecode);
 				$list['product.lists.parentid'] = $product->getId();
 				$list['product.lists.refid'] = $refItem->getId();
 				$list['product.lists.domain'] = 'price';
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-				$listManager->saveItem( $listItem );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
+				$listManager->saveItem($listItem);
 			}
 
-			foreach( $listItems as $listItem ) {
+			foreach ($listItems as $listItem) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -160,17 +160,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "price.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['price.currencyid'] ) ) {
+		if (!isset($list['price.currencyid'])) {
 			$list['price.currencyid'] = $this->getContext()->getLocale()->getCurrencyId();
 		}
 
-		if( !isset( $list['price.label'] ) ) {
+		if (!isset($list['price.label'])) {
 			$list['price.label'] = $list['price.currencyid'] . ' ' . $list['price.value'];
 		}
 
-		if( !isset( $list['price.status'] ) ) {
+		if (!isset($list['price.status'])) {
 			$list['price.status'] = 1;
 		}
 
@@ -184,10 +184,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['price.value'] ) || $list['price.value'] === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+		if (!isset($list['price.value']) || $list['price.value'] === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +2 added lines, -4 removed lines

@@ -111,8 +111,7 @@ 
 					$listItem = $listMap[$value][$type][$typecode];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem();
 					$refItem = $manager->createItem();
@@ -143,8 +142,7 @@ 
 			$data = $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/Attribute/Standard.php

Spacing +45 added lines, -45 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -127,8 +127,7 @@ 
 					{
 						$listItem = $listMap[$code][$typecode];
 						unset( $listItems[ $listItem->getId() ] );
-					}
-					else
+					} else
 					{
 						$listItem = $listManager->createItem();
 					}
@@ -143,8 +142,7 @@ 
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;