aimeos / ai-controller-jobs

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

Spacing +94 added lines, -94 removed lines

@@ -18,119 +18,119 @@ 
 
 	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);
 	}
 
 
 	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', [] );
-		$mapping['item'] = array( 0 => 'product.label', 1 => 'product.code' );
+		$mapping = $config->set('controller/jobs/product/import/csv/mapping', []);
+		$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(
@@ -150,11 +150,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' ), [] );
+		$this->delete($prodcodes, array('text', 'media'), []);
 	}
 
 
@@ -166,9 +166,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();
 	}
 
@@ -208,15 +208,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();
 	}
 
@@ -224,104 +224,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 \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('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 \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('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/jobs/tests/Controller/Jobs/Product/Bought/StandardTest.php

Spacing +11 added lines, -11 removed lines

@@ -19,18 +19,18 @@ 
 
 	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);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -39,28 +39,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/Coupon/Import/Csv/Code/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj);
+		$obj = \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -26,8 +26,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -36,8 +36,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,7 +46,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController($context, $aimeos, 'Factory');
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Order/Export/Csv/Processor/Service/StandardTest.php

Spacing +43 added lines, -43 removed lines

@@ -29,59 +29,59 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Service\Standard( $context, $mapping );
-
-		$invoice = $this->getInvoice( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() );
-
-		$data = $object->process( $invoice, $order );
-
-
-		$this->assertEquals( 2, count( $data ) );
-
-		$this->assertEquals( 12, count( $data[0] ) );
-		$this->assertEquals( 'payment', $data[0][0] );
-		$this->assertEquals( 'OGONE', $data[0][1] );
-		$this->assertEquals( 'ogone', $data[0][2] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[0][3] );
-		$this->assertEquals( '0.00', $data[0][4] );
-		$this->assertEquals( '0.00', $data[0][5] );
-		$this->assertEquals( '0.00', $data[0][6] );
-		$this->assertEquals( '0.0000', $data[0][7] );
-		$this->assertEquals( "payment\npayment\npayment\npayment\npayment\npayment\npayment\npayment\npayment", $data[0][8] );
-		$this->assertEquals( "ACOWNER\nACSTRING\nNAME\nOgone-alias-name\nOgone-alias-value\nREFID\nTXDATE\nX-ACCOUNT\nX-STATUS", $data[0][9] );
-		$this->assertEquals( "account owner\naccount number\npayment method\nogone alias name\nogone alias value\nreference id\ntransaction date\ntransaction account\ntransaction status", $data[0][10] );
-		$this->assertEquals( "test user\n9876543\nCreditCard\naliasName\naliasValue\n12345678\n2009-08-18\nKraft02\n9", $data[0][11] );
-
-		$this->assertEquals( 12, count( $data[1] ) );
-		$this->assertEquals( 'delivery', $data[1][0] );
-		$this->assertEquals( '73', $data[1][1] );
-		$this->assertEquals( 'solucia', $data[1][2] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[1][3] );
-		$this->assertEquals( '0.00', $data[1][4] );
-		$this->assertEquals( '5.00', $data[1][5] );
-		$this->assertEquals( '0.00', $data[1][6] );
-		$this->assertEquals( '0.0000', $data[1][7] );
-		$this->assertEquals( '', $data[1][8] );
-		$this->assertEquals( '', $data[1][9] );
-		$this->assertEquals( '', $data[1][10] );
-		$this->assertEquals( '', $data[1][11] );
+		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Service\Standard($context, $mapping);
+
+		$invoice = $this->getInvoice($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId());
+
+		$data = $object->process($invoice, $order);
+
+
+		$this->assertEquals(2, count($data));
+
+		$this->assertEquals(12, count($data[0]));
+		$this->assertEquals('payment', $data[0][0]);
+		$this->assertEquals('OGONE', $data[0][1]);
+		$this->assertEquals('ogone', $data[0][2]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[0][3]);
+		$this->assertEquals('0.00', $data[0][4]);
+		$this->assertEquals('0.00', $data[0][5]);
+		$this->assertEquals('0.00', $data[0][6]);
+		$this->assertEquals('0.0000', $data[0][7]);
+		$this->assertEquals("payment\npayment\npayment\npayment\npayment\npayment\npayment\npayment\npayment", $data[0][8]);
+		$this->assertEquals("ACOWNER\nACSTRING\nNAME\nOgone-alias-name\nOgone-alias-value\nREFID\nTXDATE\nX-ACCOUNT\nX-STATUS", $data[0][9]);
+		$this->assertEquals("account owner\naccount number\npayment method\nogone alias name\nogone alias value\nreference id\ntransaction date\ntransaction account\ntransaction status", $data[0][10]);
+		$this->assertEquals("test user\n9876543\nCreditCard\naliasName\naliasValue\n12345678\n2009-08-18\nKraft02\n9", $data[0][11]);
+
+		$this->assertEquals(12, count($data[1]));
+		$this->assertEquals('delivery', $data[1][0]);
+		$this->assertEquals('73', $data[1][1]);
+		$this->assertEquals('solucia', $data[1][2]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[1][3]);
+		$this->assertEquals('0.00', $data[1][4]);
+		$this->assertEquals('5.00', $data[1][5]);
+		$this->assertEquals('0.00', $data[1][6]);
+		$this->assertEquals('0.0000', $data[1][7]);
+		$this->assertEquals('', $data[1][8]);
+		$this->assertEquals('', $data[1][9]);
+		$this->assertEquals('', $data[1][10]);
+		$this->assertEquals('', $data[1][11]);
 	}
 
 
-	protected function getInvoice( $context )
+	protected function getInvoice($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) );
+		$search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No order item found' );
+		throw new \Exception('No order item found');
 	}
 }

controller/jobs/tests/Controller/Jobs/Coupon/Import/Csv/Code/StandardTest.php

Spacing +28 added lines, -28 removed lines

@@ -18,95 +18,95 @@
 
 	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/skip-lines', 1);
 
-		$this->object = new \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Coupon code import CSV', $this->object->getName() );
+		$this->assertEquals('Coupon code import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing coupon code from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'Example' ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('Example'));
 
 		$dir = 'tmp/import/couponcode/unittest';
 		$filepath = $dir . '/' . $coupon->getId() . '.csv';
 
-		if( !is_dir( $dir ) && mkdir( 'tmp/import/couponcode/unittest', 0775, true ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create directory "%1$s"', $dir ) );
+		if (!is_dir($dir) && mkdir('tmp/import/couponcode/unittest', 0775, true) === false) {
+			throw new \Exception(sprintf('Unable to create directory "%1$s"', $dir));
 		}
 
 		$content = 'code,count,start,end
 jobccimport1,3,2000-01-01 00:00:00,
 jobccimport2,5,,';
 
-		if( file_put_contents( $filepath, $content ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create file "%1$s"', $file ) );
+		if (file_put_contents($filepath, $content) === false) {
+			throw new \Exception(sprintf('Unable to create file "%1$s"', $file));
 		}
 
 		$this->object->run();
 
 
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
-		$code1 = $codeManager->findItem( 'jobccimport1' );
-		$code2 = $codeManager->findItem( 'jobccimport2' );
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
+		$code1 = $codeManager->findItem('jobccimport1');
+		$code2 = $codeManager->findItem('jobccimport2');
 
-		$manager->deleteItem( $coupon->getId() );
+		$manager->deleteItem($coupon->getId());
 
-		$this->assertEquals( 3, $code1->getCount() );
-		$this->assertEquals( '2000-01-01 00:00:00', $code1->getDateStart() );
-		$this->assertEquals( null, $code1->getDateEnd() );
+		$this->assertEquals(3, $code1->getCount());
+		$this->assertEquals('2000-01-01 00:00:00', $code1->getDateStart());
+		$this->assertEquals(null, $code1->getDateEnd());
 
-		$this->assertEquals( 5, $code2->getCount() );
-		$this->assertEquals( null, $code2->getDateStart() );
-		$this->assertEquals( null, $code2->getDateEnd() );
+		$this->assertEquals(5, $code2->getCount());
+		$this->assertEquals(null, $code2->getDateStart());
+		$this->assertEquals(null, $code2->getDateEnd());
 	}
 
 
 	public function testRunException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
 
 		$dir = 'tmp/import/couponcode/unittest';
 		$filepath = $dir . '/0.csv';
 
-		if( !is_dir( $dir ) && mkdir( 'tmp/import/couponcode/unittest', 0775, true ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create directory "%1$s"', $dir ) );
+		if (!is_dir($dir) && mkdir('tmp/import/couponcode/unittest', 0775, true) === false) {
+			throw new \Exception(sprintf('Unable to create directory "%1$s"', $dir));
 		}
 
 		$content = 'code,count,start,end
 jobccimport1,,,';
 
-		if( file_put_contents( $filepath, $content ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create file "%1$s"', $file ) );
+		if (file_put_contents($filepath, $content) === false) {
+			throw new \Exception(sprintf('Unable to create file "%1$s"', $file));
 		}
 
 		$this->object->run();

controller/jobs/src/Controller/Jobs/Order/Service/Async/Standard.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Batch update of payment/delivery status' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Batch update of payment/delivery status');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Executes payment or delivery service providers that uses batch updates' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Executes payment or delivery service providers that uses batch updates');
 	}
 
 
@@ -52,32 +52,32 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
 		$search = $serviceManager->createSearch();
 		$start = 0;
 
 		do
 		{
-			$serviceItems = $serviceManager->searchItems( $search );
+			$serviceItems = $serviceManager->searchItems($search);
 
-			foreach( $serviceItems as $serviceItem )
+			foreach ($serviceItems as $serviceItem)
 			{
 				try
 				{
-					$serviceManager->getProvider( $serviceItem, $serviceItem->getType() )->updateAsync();
+					$serviceManager->getProvider($serviceItem, $serviceItem->getType())->updateAsync();
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Executing updateAsyc() of "%1$s" failed: %2$s';
-					$context->getLogger()->log( sprintf( $msg, $serviceItem->getProvider(), $e->getMessage() ) );
+					$context->getLogger()->log(sprintf($msg, $serviceItem->getProvider(), $e->getMessage()));
 				}
 			}
 
-			$count = count( $serviceItems );
+			$count = count($serviceItems);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -66,8 +66,7 @@
 				try
 				{
 					$serviceManager->getProvider( $serviceItem, $serviceItem->getType() )->updateAsync();
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$msg = 'Executing updateAsyc() of "%1$s" failed: %2$s';
 					$context->getLogger()->log( sprintf( $msg, $serviceItem->getProvider(), $e->getMessage() ) );

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +9 added lines, -9 removed lines

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

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

Doc Comments +3 added lines

@@ -248,6 +248,9 @@
 	}
 
 
+	/**
+	 * @param string $catcode
+	 */
 	protected function get( $catcode, array $domains = [] )
 	{
 		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );

Spacing +66 added lines, -66 removed lines

@@ -18,65 +18,65 @@ 
 
 	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/catalog/import/csv/skip-lines', 1 );
-		$config->set( 'controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/valid' );
+		$config->set('controller/jobs/catalog/import/csv/skip-lines', 1);
+		$config->set('controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/valid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard($this->context, $this->aimeos);
 	}
 
 
 	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( 'Catalog import CSV', $this->object->getName() );
+		$this->assertEquals('Catalog import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing categories from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$catcodes = array( 'job_csv_test', 'job_csv_test2', 'job_csv_test3', 'job_csv_test4' );
-		$domains = array( 'media', 'text' );
+		$catcodes = array('job_csv_test', 'job_csv_test2', 'job_csv_test3', 'job_csv_test4');
+		$domains = array('media', 'text');
 
 		$convert = array(
 			1 => 'Text/LatinUTF8',
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/converter', $convert );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/converter', $convert);
 
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test', $domains );
-		$this->delete( $tree, $domains );
+		$tree = $this->get('job_csv_test', $domains);
+		$this->delete($tree, $domains);
 
-		$this->assertEquals( 2, count( $tree->getListItems() ) );
+		$this->assertEquals(2, count($tree->getListItems()));
 
-		foreach( $tree->getChildren() as $node ) {
-			$this->assertEquals( 2, count( $node->getListItems() ) );
+		foreach ($tree->getChildren() as $node) {
+			$this->assertEquals(2, count($node->getListItems()));
 		}
 	}
 
@@ -86,13 +86,13 @@ 
 		$this->object->run();
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test', ['media', 'text'] );
-		$this->delete( $tree, ['media', 'text'] );
+		$tree = $this->get('job_csv_test', ['media', 'text']);
+		$this->delete($tree, ['media', 'text']);
 
-		$this->assertEquals( 2, count( $tree->getListItems() ) );
+		$this->assertEquals(2, count($tree->getListItems()));
 
-		foreach( $tree->getChildren() as $node ) {
-			$this->assertEquals( 2, count( $node->getListItems() ) );
+		foreach ($tree->getChildren() as $node) {
+			$this->assertEquals(2, count($node->getListItems()));
 		}
 	}
 
@@ -100,18 +100,18 @@ 
 	public function testRunPosition()
 	{
 		$config = $this->context->getConfig();
-		$mapping = $config->set( 'controller/jobs/catalog/import/csv/mapping', [] );
-		$mapping['item'] = array( 0 => 'catalog.label', 1 => 'catalog.code', 2 => 'catalog.parent' );
+		$mapping = $config->set('controller/jobs/catalog/import/csv/mapping', []);
+		$mapping['item'] = array(0 => 'catalog.label', 1 => 'catalog.code', 2 => 'catalog.parent');
 
-		$config->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
-		$config->set( 'controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/position' );
+		$config->set('controller/jobs/catalog/import/csv/mapping', $mapping);
+		$config->set('controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/position');
 
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test' );
-		$this->delete( $tree );
+		$tree = $this->get('job_csv_test');
+		$this->delete($tree);
 
-		$this->assertEquals( 1, count( $tree->getChildren() ) );
+		$this->assertEquals(1, count($tree->getChildren()));
 	}
 
 
@@ -135,12 +135,12 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/mapping', $mapping);
 
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test' );
-		$this->delete( $tree );
+		$tree = $this->get('job_csv_test');
+		$this->delete($tree);
 	}
 
 
@@ -152,9 +152,9 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/mapping', $mapping);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -178,15 +178,15 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/mapping', $mapping);
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/catalog/import/csv/skip-lines', 0 );
-		$config->set( 'controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/invalid' );
+		$config->set('controller/jobs/catalog/import/csv/skip-lines', 0);
+		$config->set('controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/invalid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard($this->context, $this->aimeos);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -194,65 +194,65 @@ 
 	public function testRunBackup()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/catalog/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
+		$config->set('controller/jobs/catalog/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/catalog/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/catalog/import/csv/backup', 'tmp/test-%Y-%m-%d.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('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/catalog/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/backup', 'tmp/notexist/import.zip' );
+		$config->set('controller/jobs/catalog/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/catalog/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/catalog/import/csv/backup', 'tmp/notexist/import.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('Unable to copy test file');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
 
-	protected function delete( \Aimeos\MShop\Catalog\Item\Iface $tree, array $domains = [] )
+	protected function delete(\Aimeos\MShop\Catalog\Item\Iface $tree, array $domains = [])
 	{
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
-		foreach( $domains as $domain )
+		foreach ($domains as $domain)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
+			$manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
 
-			foreach( $tree->getListItems( $domain ) as $listItem ) {
-				$manager->deleteItem( $listItem->getRefItem()->getId() );
+			foreach ($tree->getListItems($domain) as $listItem) {
+				$manager->deleteItem($listItem->getRefItem()->getId());
 			}
 		}
 
-		foreach( $tree->getChildren() as $node ) {
-			$this->delete( $node, $domains );
+		foreach ($tree->getChildren() as $node) {
+			$this->delete($node, $domains);
 		}
 
-		$catalogManager->deleteItem( $tree->getId() );
+		$catalogManager->deleteItem($tree->getId());
 	}
 
 
-	protected function get( $catcode, array $domains = [] )
+	protected function get($catcode, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		$root = $manager->findItem( $catcode );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		$root = $manager->findItem($catcode);
 
-		return $manager->getTree( $root->getId(), $domains, \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE );
+		return $manager->getTree($root->getId(), $domains, \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE);
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Catalog/Import/Csv/BaseTest.php

Spacing +25 added lines, -25 removed lines

@@ -16,77 +16,77 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$context = \TestHelperCntl::getContext();
 		$aimeos = \TestHelperCntl::getAimeos();
 
-		$this->object = new TestAbstract( $context, $aimeos );
+		$this->object = new TestAbstract($context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testGetCacheInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetProcessors()
 	{
-		$processor = $this->object->getProcessorsPublic( array( 'media' => [] ) );
+		$processor = $this->object->getProcessorsPublic(array('media' => []));
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $processor );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $processor);
 	}
 
 
 	public function testGetProcessorsInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetTypeId()
 	{
-		$typeid = $this->object->getTypeIdPublic( 'text/type', 'catalog', 'name' );
+		$typeid = $this->object->getTypeIdPublic('text/type', 'catalog', 'name');
 
-		$this->assertNotEquals( null, $typeid );
+		$this->assertNotEquals(null, $typeid);
 	}
 
 
 	public function testGetTypeIdUnknown()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getTypeIdPublic( 'text/type', 'catalog', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getTypeIdPublic('text/type', 'catalog', 'unknown');
 	}
 }
 
@@ -94,21 +94,21 @@ 
 class TestAbstract
 	extends \Aimeos\Controller\Common\Catalog\Import\Csv\Base
 {
-	public function getCachePublic( $type, $name = null )
+	public function getCachePublic($type, $name = null)
 	{
-		return $this->getCache( $type, $name );
+		return $this->getCache($type, $name);
 	}
 
 
-	public function getProcessorsPublic( array $mappings )
+	public function getProcessorsPublic(array $mappings)
 	{
-		return $this->getProcessors( $mappings );
+		return $this->getProcessors($mappings);
 	}
 
 
-	public function getTypeIdPublic( $path, $domain, $code )
+	public function getTypeIdPublic($path, $domain, $code)
 	{
-		return $this->getTypeId( $path, $domain, $code );
+		return $this->getTypeId($path, $domain, $code);
 	}
 }