aimeos / ai-controller-jobs

controller/jobs/tests/Controller/Jobs/Product/Bought/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -15,8 +15,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -25,8 +25,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -35,8 +35,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -45,7 +45,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Bought\Factory::createController($context, $aimeos, 'Factory');
 	}
 }
\ No newline at end of file

controller/jobs/tests/Controller/Jobs/Product/Bought/StandardTest.php

Spacing +11 added lines, -11 removed lines

@@ -23,12 +23,12 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard($this->context, $this->aimeos);
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -49,28 +49,28 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Products bought together', $this->object->getName() );
+		$this->assertEquals('Products bought together', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Creates bought together product suggestions';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'deleteItems', 'saveItem' ) )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('deleteItems', 'saveItem'))
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'product/lists', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'product/lists', $stub);
 
-		$stub->expects( $this->atLeastOnce() )->method( 'deleteItems' );
-		$stub->expects( $this->atLeastOnce() )->method( 'saveItem' );
+		$stub->expects($this->atLeastOnce())->method('deleteItems');
+		$stub->expects($this->atLeastOnce())->method('saveItem');
 
 		$this->object->run();
 	}

controller/jobs/tests/Controller/Jobs/Product/Import/Csv/StandardTest.php

Spacing +94 added lines, -94 removed lines

@@ -22,16 +22,16 @@ 
 	 */
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 1 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 1);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 	}
 
 
@@ -43,104 +43,104 @@ 
 	 */
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
 
-		if( file_exists( 'tmp/import.zip' ) ) {
-			unlink( 'tmp/import.zip' );
+		if (file_exists('tmp/import.zip')) {
+			unlink('tmp/import.zip');
 		}
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product import CSV', $this->object->getName() );
+		$this->assertEquals('Product import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing products from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$convert = array(
 			1 => 'Text/LatinUTF8',
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/converter', $convert );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/converter', $convert);
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunUpdate()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$this->object->run();
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$config = $this->context->getConfig();
-		$mapping = $config->set( 'controller/jobs/product/import/csv/mapping', array() );
-		$mapping['item'] = array( 0 => 'product.label', 1 => 'product.code' );
+		$mapping = $config->set('controller/jobs/product/import/csv/mapping', array());
+		$mapping['item'] = array(0 => 'product.label', 1 => 'product.code');
 
-		$config->set( 'controller/jobs/product/import/csv/mapping', $mapping );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position' );
+		$config->set('controller/jobs/product/import/csv/mapping', $mapping);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position');
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
+		$this->assertEquals(2, count($result));
 	}
 
 
 	public function testRunProcessorInvalidPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
 
 		$mapping = array(
 			'item' => array(
@@ -160,11 +160,11 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$this->object->run();
 
-		$this->delete( $prodcodes, array( 'text', 'media' ), array() );
+		$this->delete($prodcodes, array('text', 'media'), array());
 	}
 
 
@@ -176,9 +176,9 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -218,15 +218,15 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 0 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 0);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -234,104 +234,104 @@ 
 	public function testRunBackup()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \Exception( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \Exception('Unable to copy test file');
 		}
 
 		$this->object->run();
 
-		$filename = strftime( 'tmp/test-%Y-%m-%d.zip' );
-		$this->assertTrue( file_exists( $filename ) );
+		$filename = strftime('tmp/test-%Y-%m-%d.zip');
+		$this->assertTrue(file_exists($filename));
 
-		unlink( $filename );
+		unlink($filename);
 	}
 
 
 	public function testRunBackupInvalid()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \Exception( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \Exception('Unable to copy test file');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
 
-	protected function delete( array $prodcodes, array $delete, array $nondelete )
+	protected function delete(array $prodcodes, array $delete, array $nondelete)
 	{
-		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context )->getSubmanager( 'lists' );
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $productManager->getSubManager( 'lists' );
+		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context)->getSubmanager('lists');
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $productManager->getSubManager('lists');
 
-		foreach( $this->get( $prodcodes, $delete + $nondelete ) as $id => $product )
+		foreach ($this->get($prodcodes, $delete + $nondelete) as $id => $product)
 		{
-			foreach( $delete as $domain )
+			foreach ($delete as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
+				$manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
 
-				foreach( $product->getListItems( $domain ) as $listItem )
+				foreach ($product->getListItems($domain) as $listItem)
 				{
-					$manager->deleteItem( $listItem->getRefItem()->getId() );
-					$listManager->deleteItem( $listItem->getId() );
+					$manager->deleteItem($listItem->getRefItem()->getId());
+					$listManager->deleteItem($listItem->getId());
 				}
 			}
 
-			foreach( $nondelete as $domain )
+			foreach ($nondelete as $domain)
 			{
-				$ids = array_keys( $product->getListItems( $domain ) );
-				$listManager->deleteItems( $ids );
+				$ids = array_keys($product->getListItems($domain));
+				$listManager->deleteItems($ids);
 			}
 
-			$productManager->deleteItem( $product->getId() );
+			$productManager->deleteItem($product->getId());
 
 			$search = $catListManager->createSearch();
-			$search->setConditions( $search->compare( '==', 'catalog.lists.refid', $id ) );
-			$result = $catListManager->searchItems( $search );
+			$search->setConditions($search->compare('==', 'catalog.lists.refid', $id));
+			$result = $catListManager->searchItems($search);
 
-			$catListManager->deleteItems( array_keys( $result ) );
+			$catListManager->deleteItems(array_keys($result));
 		}
 
 
-		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
+		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
 
 		$search = $attrManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', 'import-test' ) );
+		$search->setConditions($search->compare('==', 'attribute.code', 'import-test'));
 
-		$result = $attrManager->searchItems( $search );
+		$result = $attrManager->searchItems($search);
 
-		$attrManager->deleteItems( array_keys( $result ) );
+		$attrManager->deleteItems(array_keys($result));
 	}
 
 
-	protected function get( array $prodcodes, array $domains )
+	protected function get(array $prodcodes, array $domains)
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $prodcodes ) );
+		$search->setConditions($search->compare('==', 'product.code', $prodcodes));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
-	protected function getProperties( array $prodids )
+	protected function getProperties(array $prodids)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context )->getSubManager( 'property' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context)->getSubManager('property');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodids ) );
-		$search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodids));
+		$search->setSortations(array($search->sort('+', 'product.property.type.code')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

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

Braces +1 added lines, -2 removed lines

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

Spacing +49 added lines, -49 removed lines

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

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

Braces +1 added lines, -2 removed lines

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

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,72 +77,72 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
 		try
 		{
-			$map = $this->getMappedChunk( $data );
-			$listItems = $product->getListItems( 'media' );
+			$map = $this->getMappedChunk($data);
+			$listItems = $product->getListItems('media');
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$urls = explode( $separator, $list['media.url'] );
-				$type = $this->getValue( $list, 'media.type', 'default' );
-				$typecode = $this->getValue( $list, 'product.lists.type', 'default' );
+				$urls = explode($separator, $list['media.url']);
+				$type = $this->getValue($list, 'media.type', 'default');
+				$typecode = $this->getValue($list, 'product.lists.type', 'default');
 
-				if( ( $langid = $this->getValue( $list, 'media.languageid', null ) ) === '' ) {
+				if (($langid = $this->getValue($list, 'media.languageid', null)) === '') {
 					$langid = null;
 				}
 
-				foreach( $urls as $url )
+				foreach ($urls as $url)
 				{
-					if( ( $listItem = array_shift( $listItems ) ) !== null ) {
+					if (($listItem = array_shift($listItems)) !== null) {
 						$refItem = $listItem->getRefItem();
 					} else {
 						$listItem = $listManager->createItem();
 						$refItem = $manager->createItem();
 					}
 
-					$list['media.typeid'] = $this->getTypeId( 'media/type', 'product', $type );
+					$list['media.typeid'] = $this->getTypeId('media/type', 'product', $type);
 					$list['media.languageid'] = $langid;
 					$list['media.domain'] = 'product';
 					$list['media.url'] = $url;
 
-					$refItem->fromArray( $this->addItemDefaults( $list ) );
-					$manager->saveItem( $refItem );
+					$refItem->fromArray($this->addItemDefaults($list));
+					$manager->saveItem($refItem);
 
-					$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'media', $typecode );
+					$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'media', $typecode);
 					$list['product.lists.parentid'] = $product->getId();
 					$list['product.lists.refid'] = $refItem->getId();
 					$list['product.lists.domain'] = 'media';
 
-					$listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
-					$listManager->saveItem( $listItem );
+					$listItem->fromArray($this->addListItemDefaults($list, $pos++));
+					$listManager->saveItem($listItem);
 				}
 			}
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$manager->deleteItem( $listItem->getRefItem()->getId() );
-				$listManager->deleteItem( $listItem->getId() );
+				$manager->deleteItem($listItem->getRefItem()->getId());
+				$listManager->deleteItem($listItem->getId());
 			}
 
-			$remaining = $this->getObject()->process( $product, $data );
+			$remaining = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -158,17 +158,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;
 		}
 
@@ -182,10 +182,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['media.url'] ) || $list['media.url'] === '' || isset( $list['product.lists.type'] )
-				&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
+		if (!isset($list['media.url']) || $list['media.url'] === '' || isset($list['product.lists.type'])
+				&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
 		) {
 			return false;
 		}

controller/common/tests/bootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -11,22 +11,22 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', '1' );
+ini_set('display_errors', '1');
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /**
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_TIME, 'POSIX');
 
 /*
  * Set include path for tests
  */
-define( 'PATH_TESTS', __DIR__ );
+define('PATH_TESTS', __DIR__);
 
 require_once 'TestHelperJobs.php';
 \TestHelperJobs::bootstrap();

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

Doc Comments +1 added lines

@@ -321,6 +321,7 @@
 
 	/**
 	 * @param string $code
+	 * @return \Aimeos\MShop\Catalog\Item\Iface
 	 */
 	protected function get( $code )
 	{

Spacing +95 added lines, -95 removed lines

@@ -16,23 +16,23 @@ 
 
 	public static function setUpBeforeClass()
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperCntl::getContext() );
-		$typeManager = $manager->getSubmanager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperCntl::getContext());
+		$typeManager = $manager->getSubmanager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$result = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$result = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $result ) ) === false ) {
-			throw new \Exception( 'Product type "default" not found' );
+		if (($typeItem = reset($result)) === false) {
+			throw new \Exception('Product type "default" not found');
 		}
 
 		$item = $manager->createItem();
-		$item->setCode( 'job_csv_prod' );
-		$item->setTypeId( $typeItem->getId() );
-		$item->setStatus( 1 );
+		$item->setCode('job_csv_prod');
+		$item->setTypeId($typeItem->getId());
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		self::$product = $item;
 	}
@@ -40,23 +40,23 @@ 
 
 	public static function tearDownAfterClass()
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperCntl::getContext() );
-		$manager->deleteItem( self::$product->getId() );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperCntl::getContext());
+		$manager->deleteItem(self::$product->getId());
 	}
 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -77,30 +77,30 @@ 
 			3 => 'job_csv_test',
 		);
 
-		$this->create( 'job_csv_test' );
+		$this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$pos = 0;
 		$listItems = $category->getListItems();
 		$expected = array(
-			array( 'default', 'job_csv_prod' ),
-			array( 'promotion', 'job_csv_prod' ),
+			array('default', 'job_csv_prod'),
+			array('promotion', 'job_csv_prod'),
 		);
 
-		$this->assertEquals( 2, count( $listItems ) );
+		$this->assertEquals(2, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( 1, $listItem->getStatus() );
-			$this->assertEquals( 'product', $listItem->getDomain() );
-			$this->assertEquals( $expected[$pos][0], $listItem->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getCode() );
+			$this->assertEquals(1, $listItem->getStatus());
+			$this->assertEquals('product', $listItem->getDomain());
+			$this->assertEquals($expected[$pos][0], $listItem->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getCode());
 			$pos++;
 		}
 	}
@@ -122,32 +122,32 @@ 
 			3 => "job_csv_test\njob_csv_test2",
 		);
 
-		$this->create( 'job_csv_test' );
-		$this->create( 'job_csv_test2' );
+		$this->create('job_csv_test');
+		$this->create('job_csv_test2');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$category2 = $this->get( 'job_csv_test2' );
+		$category = $this->get('job_csv_test');
+		$category2 = $this->get('job_csv_test2');
 
-		$this->delete( $category );
-		$this->delete( $category2 );
+		$this->delete($category);
+		$this->delete($category2);
 
 
 		$pos = 0;
-		$types = array( 'default', 'promotion', 'default', 'promotion' );
+		$types = array('default', 'promotion', 'default', 'promotion');
 
-		foreach( array( $category->getListItems(), $category2->getListItems() ) as $listItems )
+		foreach (array($category->getListItems(), $category2->getListItems()) as $listItems)
 		{
-			$this->assertEquals( 2, count( $listItems ) );
+			$this->assertEquals(2, count($listItems));
 
-			foreach( $listItems as $listItem )
+			foreach ($listItems as $listItem)
 			{
-				$this->assertEquals( 1, $listItem->getStatus() );
-				$this->assertEquals( 'product', $listItem->getDomain() );
-				$this->assertEquals( $types[$pos], $listItem->getType() );
-				$this->assertEquals( 'job_csv_prod', $listItem->getRefItem()->getCode() );
+				$this->assertEquals(1, $listItem->getStatus());
+				$this->assertEquals('product', $listItem->getDomain());
+				$this->assertEquals($types[$pos], $listItem->getType());
+				$this->assertEquals('job_csv_prod', $listItem->getRefItem()->getCode());
 				$pos++;
 			}
 		}
@@ -171,23 +171,23 @@ 
 			1 => 'job_csv_test',
 		);
 
-		$this->create( 'job_csv_test' );
+		$this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( self::$product, $data );
-		$object->process( self::$product, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process(self::$product, $data);
+		$object->process(self::$product, $dataUpdate);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->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( 'job_csv_prod', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('job_csv_prod', $listItem->getRefItem()->getCode());
 	}
 
 
@@ -203,21 +203,21 @@ 
 			1 => 'job_csv_test',
 		);
 
-		$this->create( 'job_csv_test' );
+		$this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process(self::$product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, array(), $this->endpoint );
-		$object->process( self::$product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, array(), $this->endpoint);
+		$object->process(self::$product, array());
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -237,18 +237,18 @@ 
 			3 => 'job_csv_test',
 		);
 
-		$this->create( 'job_csv_test' );
+		$this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -268,71 +268,71 @@ 
 			3 => 'job_csv_test',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/catalog/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/catalog/listtypes', array('default'));
 
-		$this->create( 'job_csv_test' );
+		$this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( self::$product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Catalog\Standard($this->context, $mapping, $this->endpoint);
+		$object->process(self::$product, $data);
 
-		$category = $this->get( 'job_csv_test' );
-		$this->delete( $category );
+		$category = $this->get('job_csv_test');
+		$this->delete($category);
 
 
 		$listItems = $category->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( 'job_csv_prod', $listItem->getRefItem()->getCode() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('job_csv_prod', $listItem->getRefItem()->getCode());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
-		$manager->insertItem( $item );
+		$manager->insertItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Catalog\Item\Iface $catItem )
+	protected function delete(\Aimeos\MShop\Catalog\Item\Iface $catItem)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $catItem->getListItems('product') as $listItem ) {
-			$listManager->deleteItem( $listItem->getId() );
+		foreach ($catItem->getListItems('product') as $listItem) {
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $catItem->getId() );
+		$manager->deleteItem($catItem->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'catalog.code', $code ) );
+		$search->setConditions($search->compare('==', 'catalog.code', $code));
 
-		$result = $manager->searchItems( $search, array('product') );
+		$result = $manager->searchItems($search, array('product'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No catalog item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No catalog item for code "%1$s"', $code));
 		}
 
 		return $item;

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

Doc Comments +3 added lines

@@ -216,6 +216,9 @@
 	}
 
 
+	/**
+	 * @param integer $prodid
+	 */
 	protected function getStockItems( $prodid )
 	{
 		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product/stock' );

Spacing +63 added lines, -63 removed lines

@@ -15,16 +15,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, array() );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, array());
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -41,21 +41,21 @@ 
 			1 => '2000-01-01 00:00:00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( 100, $item->getStocklevel() );
-			$this->assertEquals( '2000-01-01 00:00:00', $item->getDateBack() );
+			$this->assertEquals(100, $item->getStocklevel());
+			$this->assertEquals('2000-01-01 00:00:00', $item->getDateBack());
 		}
 	}
 
@@ -76,19 +76,19 @@ 
 			3 => '200',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 2, count( $items ) );
+		$this->assertEquals(2, count($items));
 
-		foreach( $items as $item ) {
-			$this->assertEquals( 200, $item->getStocklevel() );
+		foreach ($items as $item) {
+			$this->assertEquals(200, $item->getStocklevel());
 		}
 	}
 
@@ -107,21 +107,21 @@ 
 			0 => '20',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
 
-		$object->process( $product, $data );
-		$object->process( $product, $dataUpdate );
+		$object->process($product, $data);
+		$object->process($product, $dataUpdate);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$item = reset( $items );
+		$item = reset($items);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertEquals( 20, $item->getStocklevel() );
+		$this->assertEquals(1, count($items));
+		$this->assertEquals(20, $item->getStocklevel());
 	}
 
 
@@ -135,19 +135,19 @@ 
 			0 => 50,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, array(), $this->endpoint );
-		$object->process( $product, array() );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, array(), $this->endpoint);
+		$object->process($product, array());
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 0, count( $items ) );
+		$this->assertEquals(0, count($items));
 	}
 
 
@@ -165,20 +165,20 @@ 
 			2 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Stock\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$items = $this->getStockItems( $product->getId() );
-		$this->delete( $product );
+		$items = $this->getStockItems($product->getId());
+		$this->delete($product);
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( null, $item->getStocklevel() );
-			$this->assertEquals( null, $item->getDateBack() );
+			$this->assertEquals(null, $item->getStocklevel());
+			$this->assertEquals(null, $item->getDateBack());
 		}
 	}
 
@@ -186,43 +186,43 @@ 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \Exception( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \Exception('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$manager->deleteItem( $product->getId() );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$manager->deleteItem($product->getId());
 	}
 
 
-	protected function getStockItems( $prodid )
+	protected function getStockItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product/stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.stock.parentid', $prodid ) );
+		$search->setConditions($search->compare('==', 'product.stock.parentid', $prodid));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file

controller/jobs/tests/Controller/Jobs/Product/Export/Sitemap/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -14,8 +14,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj);
+		$obj = \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -24,8 +24,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -34,8 +34,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -44,7 +44,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos, 'Factory');
 	}
 }
\ No newline at end of file