aimeos / ai-controller-jobs

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

Spacing +94 added lines, -94 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, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -57,38 +57,38 @@ 
 			8 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$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( 'price', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('price', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$this->assertEquals( 'product', $refItem->getDomain() );
-		$this->assertEquals( 'EUR 1.00', $refItem->getLabel() );
-		$this->assertEquals( 5, $refItem->getQuantity() );
-		$this->assertEquals( '1.00', $refItem->getValue() );
-		$this->assertEquals( '0.20', $refItem->getCosts() );
-		$this->assertEquals( '0.10', $refItem->getRebate() );
-		$this->assertEquals( '20.00', $refItem->getTaxrate() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('default', $refItem->getType());
+		$this->assertEquals('product', $refItem->getDomain());
+		$this->assertEquals('EUR 1.00', $refItem->getLabel());
+		$this->assertEquals(5, $refItem->getQuantity());
+		$this->assertEquals('1.00', $refItem->getValue());
+		$this->assertEquals('0.20', $refItem->getCosts());
+		$this->assertEquals('0.10', $refItem->getRebate());
+		$this->assertEquals('20.00', $refItem->getTaxrate());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -108,23 +108,23 @@ 
 			3 => '4.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$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();
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $data[$pos], $listItem->getRefItem()->getValue() );
+			$this->assertEquals($data[$pos], $listItem->getRefItem()->getValue());
 			$pos++;
 		}
 	}
@@ -144,26 +144,26 @@ 
 			0 => '2.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object->process( $product, $dataUpdate );
+		$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( '2.00', $listItem->getRefItem()->getValue() );
+		$this->assertEquals('2.00', $listItem->getRefItem()->getValue());
 	}
 
 
@@ -177,23 +177,23 @@ 
 			0 => '1.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$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\Price\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
-		$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));
 	}
 
 
@@ -209,18 +209,18 @@ 
 			1 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$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));
 	}
 
 
@@ -240,82 +240,82 @@ 
 			3 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/price/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/price/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$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( '2.00', $listItem->getRefItem()->getValue() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('2.00', $listItem->getRefItem()->getValue());
 	}
 
 
 	/**
 	 * @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);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$priceManager = \Aimeos\MShop\Price\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$priceManager = \Aimeos\MShop\Price\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('price') as $listItem )
+		foreach ($product->getListItems('price') as $listItem)
 		{
-			$priceManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$priceManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	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('price') );
+		$result = $manager->searchItems($search, array('price'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/src/Controller/Common/Catalog/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\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/media/listtypes
 		 * Names of the catalog list types for media that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/catalog/import/csv/processor/price/listtypes
 		 * @see controller/common/catalog/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/media/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/catalog/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\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/catalog/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
+		$separator = $context->getConfig()->get('controller/common/catalog/import/csv/separator', "\n");
 
 		$manager->begin();
 
 		try
 		{
 			$delete = $listMap = [];
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $catalog->getListItems( 'media', $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $catalog->getListItems('media', $this->listTypes);
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-					$listMap[ $refItem->getUrl() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+				if (($refItem = $listItem->getRefItem()) !== null) {
+					$listMap[$refItem->getUrl()][$refItem->getType()][$listItem->getType()] = $listItem;
 				}
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$urls = explode( $separator, $list['media.url'] );
-				$type = $this->getValue( $list, 'media.type', 'default' );
-				$typecode = $this->getValue( $list, 'catalog.lists.type', 'default' );
+				$urls = explode($separator, $list['media.url']);
+				$type = $this->getValue($list, 'media.type', 'default');
+				$typecode = $this->getValue($list, 'catalog.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', 'catalog', $type );
+					$list['media.typeid'] = $this->getTypeId('media/type', 'catalog', $type);
 					$list['media.domain'] = 'catalog';
 					$list['media.url'] = $url;
 
-					$refItem->fromArray( $this->addItemDefaults( $list ) );
-					$refItem = $manager->saveItem( $refItem );
+					$refItem->fromArray($this->addItemDefaults($list));
+					$refItem = $manager->saveItem($refItem);
 
-					$list['catalog.lists.typeid'] = $this->getTypeId( 'catalog/lists/type', 'media', $typecode );
+					$list['catalog.lists.typeid'] = $this->getTypeId('catalog/lists/type', 'media', $typecode);
 					$list['catalog.lists.parentid'] = $catalog->getId();
 					$list['catalog.lists.refid'] = $refItem->getId();
 					$list['catalog.lists.domain'] = 'media';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem, false );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem, false);
 				}
 			}
 
-			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( $catalog, $data );
+			$data = $this->getObject()->process($catalog, $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['catalog.lists.type'] )
-				&& $this->listTypes !== null && !in_array( $list['catalog.lists.type'], (array) $this->listTypes )
+		if (!isset($list['media.url']) || $list['media.url'] === '' || isset($list['catalog.lists.type'])
+				&& $this->listTypes !== null && !in_array($list['catalog.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

controller/common/src/Controller/Common/Catalog/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\Catalog\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Catalog\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\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
 		return $data;
 	}

controller/common/src/Controller/Common/Catalog/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\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/text/listtypes
 		 * Names of the catalog list types for texts that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/catalog/import/csv/processor/price/listtypes
 		 * @see controller/common/catalog/import/csv/processor/catalog/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/catalog/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,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\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 		$manager->begin();
 
 		try
 		{
 			$delete = $listMap = [];
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $catalog->getListItems( 'text', $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $catalog->getListItems('text', $this->listTypes);
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-					$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+				if (($refItem = $listItem->getRefItem()) !== null) {
+					$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
 				}
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$type = ( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-				$typecode = ( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' );
+				$type = (isset($list['text.type']) ? $list['text.type'] : 'name');
+				$typecode = (isset($list['catalog.lists.type']) ? $list['catalog.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', 'catalog', $type );
+				$list['text.typeid'] = $this->getTypeId('text/type', 'catalog', $type);
 				$list['text.domain'] = 'catalog';
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$refItem = $manager->saveItem( $refItem );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$refItem = $manager->saveItem($refItem);
 
-				$list['catalog.lists.typeid'] = $this->getTypeId( 'catalog/lists/type', 'text', $typecode );
+				$list['catalog.lists.typeid'] = $this->getTypeId('catalog/lists/type', 'text', $typecode);
 				$list['catalog.lists.parentid'] = $catalog->getId();
 				$list['catalog.lists.refid'] = $refItem->getId();
 				$list['catalog.lists.domain'] = 'text';
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-				$listManager->saveItem( $listItem, false );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
+				$listManager->saveItem($listItem, false);
 			}
 
-			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( $catalog, $data );
+			$data = $this->getObject()->process($catalog, $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['catalog.lists.type'] )
-			&& $this->listTypes !== null && !in_array( $list['catalog.lists.type'], (array) $this->listTypes )
+		if (!isset($list['text.content']) || $list['text.content'] === '' || isset($list['catalog.lists.type'])
+			&& $this->listTypes !== null && !in_array($list['catalog.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

controller/common/src/Controller/Common/Catalog/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\Catalog\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor = null );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Catalog\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\Catalog\Item\Iface $catalog, array $data );
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data);
 }
\ No newline at end of file

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

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\Catalog\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;
@@ -48,13 +48,13 @@ 
 	 * @param integer $pos Computed position of the list item in the associated list of items
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addListItemDefaults( array $list, $pos )
+	protected function addListItemDefaults(array $list, $pos)
 	{
-		if( !isset( $list['catalog.lists.position'] ) ) {
+		if (!isset($list['catalog.lists.position'])) {
 			$list['catalog.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['catalog.lists.status'] ) ) {
+		if (!isset($list['catalog.lists.status'])) {
 			$list['catalog.lists.status'] = 1;
 		}
 
@@ -92,8 +92,8 @@ 
 	 */
 	protected function getObject()
 	{
-		if( $this->object === null ) {
-			throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' );
+		if ($this->object === null) {
+			throw new \Aimeos\Controller\Jobs\Exception('No processor object available');
 		}
 
 		return $this->object;
@@ -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/Catalog/Import/Csv/Cache/Iface.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context);
 
 	/**
 	 * Returns the item or ID for the given code
@@ -33,12 +33,12 @@ 
 	 * @param string|null $type Item type if used and required
 	 * @return \Aimeos\MShop\Common\Item\Iface|string|null Item object, unique ID or null if not found
 	 */
-	public function get( $code, $type = null );
+	public function get($code, $type = null);
 
 	/**
 	 * Adds the item or ID to the cache
 	 *
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Item object
 	 */
-	public function set( \Aimeos\MShop\Common\Item\Iface $item );
+	public function set(\Aimeos\MShop\Common\Item\Iface $item);
 }

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$this->context = $context;
 	}

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

Spacing +52 added lines, -52 removed lines

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