aimeos / ai-controller-jobs

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

Spacing +58 added lines, -58 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,33 +57,33 @@ 
 			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);
 
 
 		$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( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$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('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());
 	}
 
 
@@ -111,21 +111,21 @@ 
 			7 => '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);
 
 
 		$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()->getCurrencyId() );
-			$this->assertEquals( $data[$pos++], $listItem->getRefItem()->getValue() );
+			$this->assertEquals($data[$pos++], $listItem->getRefItem()->getCurrencyId());
+			$this->assertEquals($data[$pos++], $listItem->getRefItem()->getValue());
 		}
 	}
 
@@ -147,20 +147,20 @@ 
 			1 => '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->process( $product, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Price\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
+		$object->process($product, $dataUpdate);
 
 
 		$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());
 	}
 
 
@@ -176,18 +176,18 @@ 
 			1 => '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);
 
-		$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, []);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -207,15 +207,15 @@ 
 			3 => '',
 		);
 
-		$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);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -239,31 +239,31 @@ 
 			5 => '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);
 
 
 		$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 );
-		return $manager->createItem()->setCode( $code );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		return $manager->createItem()->setCode($code);
 	}
 }
\ No newline at end of file

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

Spacing +61 added lines, -61 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();
 	}
 
@@ -49,30 +49,30 @@ 
 			4 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$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( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'name', $refItem->getType() );
-		$this->assertEquals( 'test text', $refItem->getLabel() );
-		$this->assertEquals( 'Job CSV test', $refItem->getContent() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('name', $refItem->getType());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -100,27 +100,27 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 		$expected = array(
-			0 => array( 'name', 'Job CSV test' ),
-			1 => array( 'short', 'Short: Job CSV test' ),
-			2 => array( 'long', 'Long: Job CSV test' ),
-			3 => array( 'long', 'Long: Job CSV test 2' ),
+			0 => array('name', 'Job CSV test'),
+			1 => array('short', 'Short: Job CSV test'),
+			2 => array('long', 'Long: Job CSV test'),
+			3 => array('long', 'Long: Job CSV test 2'),
 		);
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() );
+			$this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent());
 			$pos++;
 		}
 	}
@@ -143,21 +143,21 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
-		$object->process( $product, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
+		$object->process($product, $dataUpdate);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent());
 	}
 
 
@@ -173,18 +173,18 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -204,15 +204,15 @@ 
 			3 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -236,32 +236,32 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/text/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'test short', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('test short', $listItem->getRefItem()->getContent());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		return $manager->createItem()->setCode( $code );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		return $manager->createItem()->setCode($code);
 	}
 }
\ No newline at end of file

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

Spacing +64 added lines, -64 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\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,29 +57,29 @@ 
 			8 => 'variant',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 		$expected = array(
-			array( 'variant', 'length', '30' ),
-			array( 'variant', 'width', '29' ),
-			array( 'variant', 'color', 'white' ),
+			array('variant', 'length', '30'),
+			array('variant', 'width', '29'),
+			array('variant', 'color', 'white'),
 		);
 
-		$this->assertEquals( 3, count( $listItems ) );
+		$this->assertEquals(3, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( 1, $listItem->getStatus() );
-			$this->assertEquals( 'attribute', $listItem->getDomain() );
-			$this->assertEquals( $expected[$pos][0], $listItem->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][2], $listItem->getRefItem()->getCode() );
+			$this->assertEquals(1, $listItem->getStatus());
+			$this->assertEquals('attribute', $listItem->getDomain());
+			$this->assertEquals($expected[$pos][0], $listItem->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][2], $listItem->getRefItem()->getCode());
 			$pos++;
 		}
 	}
@@ -99,25 +99,25 @@ 
 			2 => 'variant',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$pos = 0;
-		$codes = array( 'white', 'black', 'aimeos' );
+		$codes = array('white', 'black', 'aimeos');
 
-		foreach( $product->getListItems() as $listItems )
+		foreach ($product->getListItems() as $listItems)
 		{
-			$this->assertEquals( 3, count( $listItems ) );
+			$this->assertEquals(3, count($listItems));
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$this->assertEquals( 1, $listItem->getStatus() );
-				$this->assertEquals( 'attribute', $listItem->getDomain() );
-				$this->assertEquals( 'variant', $listItem->getType() );
-				$this->assertEquals( $codes[$pos], $listItem->getRefItem()->getCode() );
+				$this->assertEquals(1, $listItem->getStatus());
+				$this->assertEquals('attribute', $listItem->getDomain());
+				$this->assertEquals('variant', $listItem->getType());
+				$this->assertEquals($codes[$pos], $listItem->getRefItem()->getCode());
 				$pos++;
 			}
 		}
@@ -141,21 +141,21 @@ 
 			1 => '29',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
-		$object->process( $product, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
+		$object->process($product, $dataUpdate);
 
 
 		$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( 'width', $listItem->getRefItem()->getType() );
-		$this->assertEquals( '29', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('width', $listItem->getRefItem()->getType());
+		$this->assertEquals('29', $listItem->getRefItem()->getCode());
 	}
 
 
@@ -171,18 +171,18 @@ 
 			1 => '30',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -202,15 +202,15 @@ 
 			3 => '30',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -226,17 +226,17 @@ 
 			1 => '30',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
 
 		try {
-			$object->process( $product, $data );
-		} catch( \Exception $e ) {
+			$object->process($product, $data);
+		} catch (\Exception $e) {
 			return;
 		}
 
-		$this->markTestFail( 'No exception thrown' );
+		$this->markTestFail('No exception thrown');
 	}
 
 
@@ -260,32 +260,32 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/attribute/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/attribute/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Attribute\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$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( 'width', $listItem->getRefItem()->getType() );
-		$this->assertEquals( '30', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('width', $listItem->getRefItem()->getType());
+		$this->assertEquals('30', $listItem->getRefItem()->getCode());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		return $manager->createItem()->setCode( $code );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		return $manager->createItem()->setCode($code);
 	}
 }
\ No newline at end of file

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

Spacing +17 added lines, -17 removed lines

@@ -40,44 +40,44 @@
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$propMap = [];
-		$items = $product->getPropertyItems( null, false );
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
+		$items = $product->getPropertyItems(null, false);
+		$map = $this->getMappedChunk($data, $this->getMapping());
 
-		foreach( $items as $item ) {
-			$propMap[ $item->getValue() ][ $item->getType() ] = $item;
+		foreach ($items as $item) {
+			$propMap[$item->getValue()][$item->getType()] = $item;
 		}
 
-		foreach( $map as $list )
+		foreach ($map as $list)
 		{
-			$typecode = trim( $list['product.property.type'] );
-			$value = trim( $list['product.property.value'] );
+			$typecode = trim($list['product.property.type']);
+			$value = trim($list['product.property.value']);
 
-			if( $typecode == '' || $value == '' ) {
+			if ($typecode == '' || $value == '') {
 				continue;
 			}
 
-			if( isset( $propMap[$value][$typecode] ) )
+			if (isset($propMap[$value][$typecode]))
 			{
 				$item = $propMap[$value][$typecode];
-				unset( $items[ $item->getId() ] );
+				unset($items[$item->getId()]);
 			}
 			else
 			{
-				$item = $manager->createItem( $typecode, 'product' );
+				$item = $manager->createItem($typecode, 'product');
 			}
 
-			$item->fromArray( $list );
+			$item->fromArray($list);
 
-			$product->addPropertyItem( $item );
+			$product->addPropertyItem($item);
 		}
 
-		$product->deletePropertyItems( $items );
+		$product->deletePropertyItems($items);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 			{
 				$item = $propMap[$value][$typecode];
 				unset( $items[ $item->getId() ] );
-			}
-			else
+			} else
 			{
 				$item = $manager->createItem( $typecode, 'product' );
 			}

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

Spacing +36 added lines, -36 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,62 +77,62 @@ 
 	 * @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");
 
 		$listMap = [];
-		$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, trim( $list['media.url'] ) );
-			$type = trim( $this->getValue( $list, 'media.type', 'default' ) );
-			$typecode = trim( $this->getValue( $list, 'product.lists.type', 'default' ) );
+			$urls = explode($separator, trim($list['media.url']));
+			$type = trim($this->getValue($list, 'media.type', 'default'));
+			$typecode = trim($this->getValue($list, 'product.lists.type', 'default'));
 
-			foreach( $urls as $url )
+			foreach ($urls as $url)
 			{
-				$url = trim( $url );
+				$url = trim($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
 				{
-					$listItem = $listManager->createItem( $typecode, 'media' );
-					$refItem = $manager->createItem( $type, 'product' );
+					$listItem = $listManager->createItem($typecode, 'media');
+					$refItem = $manager->createItem($type, 'product');
 				}
 
 				$list['media.url'] = $url;
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$listItem->fromArray($this->addListItemDefaults($list, $pos++));
 
-				$product->addListItem( 'media', $listItem, $refItem );
+				$product->addListItem('media', $listItem, $refItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -142,17 +142,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;
 		}
 
@@ -166,10 +166,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'] ) || trim( $list['media.url'] ) === '' || isset( $list['product.lists.type'] )
-				&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['media.url']) || trim($list['media.url']) === '' || isset($list['product.lists.type'])
+				&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
 					$listItem = $listMap[$url][$type][$typecode];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem( $typecode, 'media' );
 					$refItem = $manager->createItem( $type, 'product' );

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

Spacing +29 added lines, -29 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/product/listtypes
 		 * Names of the product list types that are updated or removed
@@ -73,11 +73,11 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$default = array( 'default', 'suggestion' );
+		$default = array('default', 'suggestion');
 		$key = 'controller/common/product/import/csv/processor/product/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key, $default );
+		$this->listTypes = $context->getConfig()->get($key, $default);
 
-		$this->cache = $this->getCache( 'product' );
+		$this->cache = $this->getCache('product');
 	}
 
 
@@ -88,49 +88,49 @@ 
 	 * @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, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
-		$listItems = $product->getListItems( 'product', null, null, false );
-		$this->cache->set( $product );
+		$listItems = $product->getListItems('product', null, null, false);
+		$this->cache->set($product);
 
-		foreach( $this->getMappedChunk( $data, $this->getMapping() ) as $list )
+		foreach ($this->getMappedChunk($data, $this->getMapping()) as $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$type = trim( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+			$type = trim(isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-			foreach( explode( $separator, trim( $list['product.code'] ) ) as $code )
+			foreach (explode($separator, trim($list['product.code'])) as $code)
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( ( $prodid = $this->cache->get( $code ) ) === null )
+				if (($prodid = $this->cache->get($code)) === null)
 				{
 					$msg = 'No product for code "%1$s" available when importing product with code "%2$s"';
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( $msg, $code, $product->getCode() ) );
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf($msg, $code, $product->getCode()));
 				}
 
-				if( ( $listItem = $product->getListItem( 'product', $type, $prodid ) ) === null ) {
-					$listItem = $manager->createItem( $type, 'product' );
+				if (($listItem = $product->getListItem('product', $type, $prodid)) === null) {
+					$listItem = $manager->createItem($type, 'product');
 				} else {
-					unset( $listItems[$listItem->getId()] );
+					unset($listItems[$listItem->getId()]);
 				}
 
-				$listItem->fromArray( $list );
-				$listItem->setRefId( $prodid );
+				$listItem->fromArray($list);
+				$listItem->setRefId($prodid);
 
-				$product->addListItem( 'product', $listItem );
+				$product->addListItem('product', $listItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems );
+		$product->deleteListItems($listItems);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -140,10 +140,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['product.code'] ) || trim( $list['product.code'] ) === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['product.code']) || trim($list['product.code']) === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

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

Spacing +32 added lines, -32 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,54 +77,54 @@ 
 	 * @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');
 
 		$listMap = [];
-		$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 = trim( isset( $list['price.value'] ) ? $list['price.value'] : '0.00' );
-			$type = trim( isset( $list['price.type'] ) ? $list['price.type'] : 'default' );
-			$typecode = trim( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+			$value = trim(isset($list['price.value']) ? $list['price.value'] : '0.00');
+			$type = trim(isset($list['price.type']) ? $list['price.type'] : 'default');
+			$typecode = trim(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
 			{
-				$listItem = $listManager->createItem( $typecode, 'price' );
-				$refItem = $manager->createItem( $type, 'product' );
+				$listItem = $listManager->createItem($typecode, 'price');
+				$refItem = $manager->createItem($type, 'product');
 			}
 
 
-			$refItem->fromArray( $this->addItemDefaults( $list ) );
-			$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
+			$refItem->fromArray($this->addItemDefaults($list));
+			$listItem->fromArray($this->addListItemDefaults($list, $pos));
 
-			$product->addListItem( 'price', $listItem, $refItem );
+			$product->addListItem('price', $listItem, $refItem);
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -134,13 +134,13 @@ 
 	 * @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.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;
 		}
 
@@ -154,10 +154,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'] ) || trim( $list['price.value'] ) === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['price.value']) || trim($list['price.value']) === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 				$listItem = $listMap[$value][$type][$typecode];
 				$refItem = $listItem->getRefItem();
 				unset( $listItems[ $listItem->getId() ] );
-			}
-			else
+			} else
 			{
 				$listItem = $listManager->createItem( $typecode, 'price' );
 				$refItem = $manager->createItem( $type, 'product' );

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

Spacing +45 added lines, -45 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/catalog/listtypes
 		 * Names of the catalog list types that are updated or removed
@@ -67,9 +67,9 @@ 
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/catalog/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/catalog/listtypes');
 
-		$this->cache = $this->getCache( 'catalog' );
+		$this->cache = $this->getCache('catalog');
 	}
 
 
@@ -80,11 +80,11 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
 
 		/** controller/common/product/import/csv/separator
 		 * Single separator character for multiple entries in one field of the import file
@@ -104,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,57 +112,57 @@ 
 		{
 			$listMap = [];
 			$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, trim( $list['catalog.code'] ) );
-				$type = trim( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' );
+				$codes = explode($separator, trim($list['catalog.code']));
+				$type = trim(isset($list['catalog.lists.type']) ? $list['catalog.lists.type'] : 'default');
 
-				foreach( $codes as $code )
+				foreach ($codes as $code)
 				{
-					$code = trim( $code );
+					$code = trim($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.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( $type, 'product' );
+						$listItem = $listManager->createItem($type, 'product');
 					}
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem, false );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem, false);
 				}
 			}
 
-			$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;
@@ -179,13 +179,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;
 		}
 
@@ -199,10 +199,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'] ) || trim( $list['catalog.code'] ) === '' || isset( $list['catalog.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['catalog.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['catalog.code']) || trim($list['catalog.code']) === '' || isset($list['catalog.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['catalog.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}
@@ -218,24 +218,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

@@ -146,8 +146,7 @@ 
 					{
 						$listItem = $listMap[$catid][$type];
 						unset( $listItems[ $listItem->getId() ] );
-					}
-					else
+					} else
 					{
 						$listItem = $listManager->createItem( $type, 'product' );
 					}
@@ -161,8 +160,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 +33 added lines, -33 removed lines

@@ -42,10 +42,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\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,53 +77,53 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\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');
 
 		$listMap = [];
-		$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;
 			}
 
-			$content = trim( $list['text.content'] );
-			$type = trim( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-			$typecode = trim( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+			$content = trim($list['text.content']);
+			$type = trim(isset($list['text.type']) ? $list['text.type'] : 'name');
+			$typecode = trim(isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-			if( isset( $listMap[$content][$type][$typecode] ) )
+			if (isset($listMap[$content][$type][$typecode]))
 			{
 				$listItem = $listMap[$content][$type][$typecode];
 				$refItem = $listItem->getRefItem();
-				unset( $listItems[ $listItem->getId() ] );
+				unset($listItems[$listItem->getId()]);
 			}
 			else
 			{
-				$listItem = $listManager->createItem( $typecode, 'text' );
-				$refItem = $manager->createItem( $type, 'product' );
+				$listItem = $listManager->createItem($typecode, 'text');
+				$refItem = $manager->createItem($type, 'product');
 			}
 
-			$refItem->fromArray( $this->addItemDefaults( $list ) );
-			$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
+			$refItem->fromArray($this->addItemDefaults($list));
+			$listItem->fromArray($this->addListItemDefaults($list, $pos));
 
-			$product->addListItem( 'text', $listItem, $refItem );
+			$product->addListItem('text', $listItem, $refItem);
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -133,13 +133,13 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['text.label'] ) ) {
-			$list['text.label'] = mb_strcut( trim( $list['text.content'] ), 0, 255 );
+		if (!isset($list['text.label'])) {
+			$list['text.label'] = mb_strcut(trim($list['text.content']), 0, 255);
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -153,10 +153,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['text.content'] ) || trim( $list['text.content'] ) === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 				$listItem = $listMap[$content][$type][$typecode];
 				$refItem = $listItem->getRefItem();
 				unset( $listItems[ $listItem->getId() ] );
-			}
-			else
+			} else
 			{
 				$listItem = $listManager->createItem( $typecode, 'text' );
 				$refItem = $manager->createItem( $type, 'product' );