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/src/Controller/Common/Order/Export/Csv/Processor/Product/Standard.php

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 
-		foreach( $order->getProducts() as $item )
+		foreach ($order->getProducts() as $item)
 		{
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $item->getAttributes() as $attrItem )
+			foreach ($item->getAttributes() as $attrItem)
 			{
-				foreach( $attrItem->toArray() as $key => $value )
+				foreach ($attrItem->toArray() as $key => $value)
 				{
-					if( isset( $list[$key] ) ) {
+					if (isset($list[$key])) {
 						$list[$key] .= "\n" . $value;
 					} else {
 						$list[$key] = $value;
@@ -61,16 +61,16 @@ 
 				}
 			}
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

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/common/src/Controller/Common/Order/Export/Csv/Processor/Service/Standard.php

Spacing +10 added lines, -10 removed lines

@@ -40,25 +40,25 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$services = $order->getServices();
 
-		krsort( $services );
+		krsort($services);
 
-		foreach( $services as $list )
+		foreach ($services as $list)
 		{
-			foreach( $list as $item )
+			foreach ($list as $item)
 			{
 				$data = [];
 				$list = $item->toArray();
 
-				foreach( $item->getAttributes() as $attrItem )
+				foreach ($item->getAttributes() as $attrItem)
 				{
-					foreach( $attrItem->toArray() as $key => $value )
+					foreach ($attrItem->toArray() as $key => $value)
 					{
-						if( isset( $list[$key] ) ) {
+						if (isset($list[$key])) {
 							$list[$key] .= "\n" . $value;
 						} else {
 							$list[$key] = $value;
@@ -66,16 +66,16 @@ 
 					}
 				}
 
-				foreach( $this->getMapping() as $pos => $key )
+				foreach ($this->getMapping() as $pos => $key)
 				{
-					if( array_key_exists( $key, $list ) ) {
+					if (array_key_exists($key, $list)) {
 						$data[$pos] = $list[$key];
 					} else {
 						$data[$pos] = '';
 					}
 				}
 
-				ksort( $data );
+				ksort($data);
 				$result[] = $data;
 			}
 		}

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

Spacing +73 added lines, -73 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, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -47,29 +47,29 @@ 
 			4 => '50',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
 		$pos = 0;
 		$expected = array(
-			array( 'package-weight', '3.00', 'de' ),
-			array( 'package-width', '50', null ),
+			array('package-weight', '3.00', 'de'),
+			array('package-width', '50', null),
 		);
 
-		$this->assertEquals( 2, count( $items ) );
+		$this->assertEquals(2, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( $expected[$pos][0], $item->getType() );
-			$this->assertEquals( $expected[$pos][1], $item->getValue() );
-			$this->assertEquals( $expected[$pos][2], $item->getLanguageId() );
+			$this->assertEquals($expected[$pos][0], $item->getType());
+			$this->assertEquals($expected[$pos][1], $item->getValue());
+			$this->assertEquals($expected[$pos][2], $item->getLanguageId());
 			$pos++;
 		}
 	}
@@ -92,27 +92,27 @@ 
 			1 => '10',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object->process( $product, $dataUpdate );
+		$object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
-		$item = reset( $items );
+		$item = reset($items);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item );
+		$this->assertEquals(1, count($items));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item);
 
-		$this->assertEquals( 'package-height', $item->getType() );
-		$this->assertEquals( '10', $item->getValue() );
+		$this->assertEquals('package-height', $item->getType());
+		$this->assertEquals('10', $item->getValue());
 	}
 
 
@@ -128,22 +128,22 @@ 
 			1 => '3.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 0, count( $items ) );
+		$this->assertEquals(0, count($items));
 	}
 
 
@@ -163,85 +163,85 @@ 
 			3 => '3.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$items = $this->getProperties( $product->getId() );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$items = $this->getProperties($product->getId());
+		$this->delete($product);
 
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \RuntimeException( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \RuntimeException('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('attribute') as $listItem ) {
-			$listManager->deleteItem( $listItem->getId() );
+		foreach ($product->getListItems('attribute') as $listItem) {
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('attribute') );
+		$result = $manager->searchItems($search, array('attribute'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;
 	}
 
 
-	protected function getProperties( $prodid )
+	protected function getProperties($prodid)
 	{
-		$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', $prodid ) );
-		$search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodid));
+		$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/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() ) );