aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Subscription/Process/Renew/Factory.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller or "Standard" if null
 	 * @return \Aimeos\Controller\Jobs\Iface New controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null)
 	{
 		/** controller/jobs/subscription/process/renew/name
 		 * Class name of the used subscription suggestions scheduler controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		if ( $name === null ) {
+		if ($name === null) {
 			$name = $context->getConfig()->get('controller/jobs/subscription/process/renew/name', 'Standard');
 		}
 
-		if ( ctype_alnum($name) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Subscription\\Process\\Renew\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
 		$classname = '\\Aimeos\\Controller\\Jobs\\Subscription\\Process\\Renew\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/subscription/process/renew/decorators/excludes
 		 * Excludes decorators added by the "common" option from the subscription process CSV job controller
@@ -154,6 +154,6 @@ 
 		 * @see controller/jobs/subscription/process/renew/decorators/excludes
 		 * @see controller/jobs/subscription/process/renew/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'subscription/process/renew' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'subscription/process/renew');
 	}
 }
\ No newline at end of file

controller/common/src/Controller/Common/Subscription/Process/Processor/Iface.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context);
 
 
 	/**
@@ -32,7 +32,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 */
-	public function begin( \Aimeos\MShop\Subscription\Item\Iface $subscription );
+	public function begin(\Aimeos\MShop\Subscription\Item\Iface $subscription);
 
 
 	/**
@@ -41,7 +41,7 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 * @param \Aimeos\MShop\Order\Item\Iface $order Order invoice item
 	 */
-	public function renew( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Iface $order );
+	public function renew(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Iface $order);
 
 
 	/**
@@ -49,5 +49,5 @@ 
 	 *
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 */
-	public function end( \Aimeos\MShop\Subscription\Item\Iface $subscription );
+	public function end(\Aimeos\MShop\Subscription\Item\Iface $subscription);
 }
\ No newline at end of file

controller/common/src/Controller/Common/Subscription/Process/Processor/Base.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$this->context = $context;
 	}
@@ -49,7 +49,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 */
-	public function begin( \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	public function begin(\Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
 	}
 
@@ -60,7 +60,7 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 * @param \Aimeos\MShop\Order\Item\Iface $order Order invoice item
 	 */
-	public function renew( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Iface $order )
+	public function renew(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Iface $order)
 	{
 	}
 
@@ -70,7 +70,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item
 	 */
-	public function end( \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	public function end(\Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
 	}
 }

controller/jobs/tests/Controller/Jobs/Order/Export/Csv/StandardTest.php

Spacing +54 added lines, -54 removed lines

@@ -20,109 +20,109 @@
 		$this->context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Order\Export\Csv\Standard( $this->context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Order\Export\Csv\Standard($this->context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Order export CSV', $this->object->getName() );
+		$this->assertEquals('Order export CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
-		$this->assertEquals( 'Exports orders to CSV file', $this->object->getDescription() );
+		$this->assertEquals('Exports orders to CSV file', $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$mqmStub = $this->getMockBuilder( '\\Aimeos\\MW\\MQueue\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context->getConfig()] )
-			->setMethods( ['get'] )
+		$mqmStub = $this->getMockBuilder('\\Aimeos\\MW\\MQueue\\Manager\\Standard')
+			->setConstructorArgs([$this->context->getConfig()])
+			->setMethods(['get'])
 			->getMock();
 
-		$mqStub = $this->getMockBuilder( '\\Aimeos\\MW\\MQueue\\Standard' )
+		$mqStub = $this->getMockBuilder('\\Aimeos\\MW\\MQueue\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['getQueue'] )
+			->setMethods(['getQueue'])
 			->getMock();
 
-		$queueStub = $this->getMockBuilder( '\\Aimeos\\MW\\MQueue\\Queue\\Standard' )
+		$queueStub = $this->getMockBuilder('\\Aimeos\\MW\\MQueue\\Queue\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['del', 'get'] )
+			->setMethods(['del', 'get'])
 			->getMock();
 
-		$msgStub = $this->getMockBuilder( '\\Aimeos\\MW\\MQueue\\Message\\Standard' )
+		$msgStub = $this->getMockBuilder('\\Aimeos\\MW\\MQueue\\Message\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['getBody'] )
+			->setMethods(['getBody'])
 			->getMock();
 
 
-		$this->context->setMessageQueueManager( $mqmStub );
+		$this->context->setMessageQueueManager($mqmStub);
 
 
-		$mqmStub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $mqStub ) );
+		$mqmStub->expects($this->once())->method('get')
+			->will($this->returnValue($mqStub));
 
-		$mqStub->expects( $this->once() )->method( 'getQueue' )
-			->will( $this->returnValue( $queueStub ) );
+		$mqStub->expects($this->once())->method('getQueue')
+			->will($this->returnValue($queueStub));
 
-		$queueStub->expects( $this->exactly( 2 ) )->method( 'get' )
-			->will( $this->onConsecutiveCalls( $msgStub, null ) );
+		$queueStub->expects($this->exactly(2))->method('get')
+			->will($this->onConsecutiveCalls($msgStub, null));
 
-		$queueStub->expects( $this->once() )->method( 'del' );
+		$queueStub->expects($this->once())->method('del');
 
-		$msgStub->expects( $this->once() )->method( 'getBody' )
-			->will( $this->returnValue( '{"sitecode":"unittest"}' ) );
+		$msgStub->expects($this->once())->method('getBody')
+			->will($this->returnValue('{"sitecode":"unittest"}'));
 
 
 		$this->object->run();
 
 
-		$jobManager = \Aimeos\MAdmin\Factory::createManager( $this->context, 'job' );
+		$jobManager = \Aimeos\MAdmin\Factory::createManager($this->context, 'job');
 		$jobSearch = $jobManager->createSearch();
-		$jobSearch->setConditions( $jobSearch->compare( '=~', 'job.label', 'order-export_' ) );
-		$jobItems = $jobManager->searchItems( $jobSearch );
-		$jobManager->deleteItems( array_keys( $jobItems ) );
+		$jobSearch->setConditions($jobSearch->compare('=~', 'job.label', 'order-export_'));
+		$jobItems = $jobManager->searchItems($jobSearch);
+		$jobManager->deleteItems(array_keys($jobItems));
 
-		$this->assertEquals( 1, count( $jobItems ) );
+		$this->assertEquals(1, count($jobItems));
 
 
-		$filename = dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) . '/tmp/' . reset( $jobItems )->getLabel();
-		$fp = fopen( $filename, 'r' );
+		$filename = dirname(dirname(dirname(dirname(dirname(__DIR__))))) . '/tmp/' . reset($jobItems)->getLabel();
+		$fp = fopen($filename, 'r');
 
-		$invoice = fgetcsv( $fp );
-		$address1 = fgetcsv( $fp );
-		$address2 = fgetcsv( $fp );
-		$service1 = fgetcsv( $fp );
-		$service2 = fgetcsv( $fp );
+		$invoice = fgetcsv($fp);
+		$address1 = fgetcsv($fp);
+		$address2 = fgetcsv($fp);
+		$service1 = fgetcsv($fp);
+		$service2 = fgetcsv($fp);
 		$coupon1 = fgetcsv($fp);
 		$coupon2 = fgetcsv($fp);
-		$product1 = fgetcsv( $fp );
-		$product2 = fgetcsv( $fp );
-		$product3 = fgetcsv( $fp );
-		$product4 = fgetcsv( $fp );
-
-		fclose( $fp );
-		unlink( $filename );
-
-		$this->assertEquals( 'invoice', $invoice[0] );
-		$this->assertEquals( 'address', $address1[0] );
-		$this->assertEquals( 'address', $address2[0] );
-		$this->assertEquals( 'service', $service1[0] );
-		$this->assertEquals( 'service', $service2[0] );
-		$this->assertEquals( 'coupon', $coupon1[0]);
-		$this->assertEquals( 'coupon', $coupon2[0]);
-		$this->assertEquals( 'product', $product1[0] );
-		$this->assertEquals( 'product', $product2[0] );
-		$this->assertEquals( 'product', $product3[0] );
-		$this->assertEquals( 'product', $product4[0] );
+		$product1 = fgetcsv($fp);
+		$product2 = fgetcsv($fp);
+		$product3 = fgetcsv($fp);
+		$product4 = fgetcsv($fp);
+
+		fclose($fp);
+		unlink($filename);
+
+		$this->assertEquals('invoice', $invoice[0]);
+		$this->assertEquals('address', $address1[0]);
+		$this->assertEquals('address', $address2[0]);
+		$this->assertEquals('service', $service1[0]);
+		$this->assertEquals('service', $service2[0]);
+		$this->assertEquals('coupon', $coupon1[0]);
+		$this->assertEquals('coupon', $coupon2[0]);
+		$this->assertEquals('product', $product1[0]);
+		$this->assertEquals('product', $product2[0]);
+		$this->assertEquals('product', $product3[0]);
+		$this->assertEquals('product', $product4[0]);
 	}
 }

controller/jobs/tests/Controller/Jobs/Subscription/Process/Renew/StandardTest.php

Spacing +62 added lines, -62 removed lines

@@ -21,62 +21,62 @@ 
 		$this->aimeos = \TestHelperJobs::getAimeos();
 		$this->context = \TestHelperJobs::getContext();
 
-		$this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Renew\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Renew\Standard($this->context, $this->aimeos);
 
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
-		unset( $this->object, $this->context, $this->aimeos );
+		unset($this->object, $this->context, $this->aimeos);
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Subscription process renew', $this->object->getName() );
+		$this->assertEquals('Subscription process renew', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
-		$this->assertEquals( 'Renews subscriptions at next date', $this->object->getDescription() );
+		$this->assertEquals('Renews subscriptions at next date', $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] );
+		$this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']);
 		$item = $this->getSubscription();
 
-		$object = $this->getMockBuilder( '\\Aimeos\\Controller\\Jobs\\Subscription\\Process\\Renew\\Standard' )
-			->setConstructorArgs( [$this->context, $this->aimeos] )
-			->setMethods( ['createOrderBase', 'createOrderInvoice', 'createPayment'] )
+		$object = $this->getMockBuilder('\\Aimeos\\Controller\\Jobs\\Subscription\\Process\\Renew\\Standard')
+			->setConstructorArgs([$this->context, $this->aimeos])
+			->setMethods(['createOrderBase', 'createOrderInvoice', 'createPayment'])
 			->getMock();
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['searchItems', 'saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['searchItems', 'saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub);
 
-		$object->expects( $this->once() )->method( 'createOrderBase' )
-			->will( $this->returnValue( $this->getOrderBaseItem( $item->getOrderBaseId() ) ) );
+		$object->expects($this->once())->method('createOrderBase')
+			->will($this->returnValue($this->getOrderBaseItem($item->getOrderBaseId())));
 
-		$object->expects( $this->once() )->method( 'createOrderInvoice' )
-			->will( $this->returnValue( $this->getOrderItem() ) );
+		$object->expects($this->once())->method('createOrderInvoice')
+			->will($this->returnValue($this->getOrderItem()));
 
-		$object->expects( $this->once() )->method( 'createPayment' );
+		$object->expects($this->once())->method('createPayment');
 
-		$managerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [$item] ) );
+		$managerStub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([$item]));
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' );
+		$managerStub->expects($this->once())->method('saveItem');
 
 		$object->run();
 	}
@@ -84,19 +84,19 @@ 
 
 	public function testRunException()
 	{
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] );
+		$this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']);
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['searchItems', 'saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['searchItems', 'saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [$managerStub->createItem()] ) );
+		$managerStub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([$managerStub->createItem()]));
 
-		$managerStub->expects( $this->never() )->method( 'saveItem' );
+		$managerStub->expects($this->never())->method('saveItem');
 
 		$this->object->run();
 	}
@@ -106,34 +106,34 @@ 
 	{
 		$item = $this->getSubscription();
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['store'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['store'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'store' );
+		$managerStub->expects($this->once())->method('store');
 
-		$this->access( 'createOrderBase' )->invokeArgs( $this->object, [$this->context, $item] );
+		$this->access('createOrderBase')->invokeArgs($this->object, [$this->context, $item]);
 	}
 
 
 	public function testCreateOrderInvoice()
 	{
 		$item = $this->getSubscription();
-		$baseItem = $this->getOrderBaseItem( $item->getOrderBaseId() );
+		$baseItem = $this->getOrderBaseItem($item->getOrderBaseId());
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' );
+		$managerStub->expects($this->once())->method('saveItem');
 
-		$this->access( 'createOrderInvoice' )->invokeArgs( $this->object, [$this->context, $baseItem] );
+		$this->access('createOrderInvoice')->invokeArgs($this->object, [$this->context, $baseItem]);
 	}
 
 
@@ -141,55 +141,55 @@ 
 	{
 		$item = $this->getSubscription();
 		$invoice = $this->getOrderItem();
-		$baseItem = $this->getOrderBaseItem( $item->getOrderBaseId() );
+		$baseItem = $this->getOrderBaseItem($item->getOrderBaseId());
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' );
+		$managerStub->expects($this->once())->method('saveItem');
 
-		$this->access( 'createPayment' )->invokeArgs( $this->object, [$this->context, $baseItem, $invoice] );
+		$this->access('createPayment')->invokeArgs($this->object, [$this->context, $baseItem, $invoice]);
 	}
 
 
 	protected function getOrderItem()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		return \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 	}
 
 
-	protected function getOrderBaseItem( $baseId )
+	protected function getOrderBaseItem($baseId)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->getItem( $baseId, ['order/base/service'] );
+		return \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->getItem($baseId, ['order/base/service']);
 	}
 
 
 	protected function getSubscription()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Jobs\Subscription\Process\Renew\Standard' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Jobs\Subscription\Process\Renew\Standard');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +35 added lines, -35 removed lines

@@ -35,51 +35,51 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Product\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( 4, count( $data ) );
-
-		$this->assertEquals( 18, count( $data[0] ) );
-		$this->assertEquals( 'default', $data[0][0] );
-		$this->assertEquals( 'unit_type1', $data[0][1] );
-		$this->assertEquals( 'unitsupplier', $data[0][2] );
-		$this->assertEquals( 'CNE', $data[0][3] );
-		$this->assertGreaterThan( 0, $data[0][4] );
-		$this->assertEquals( '9', $data[0][5] );
-		$this->assertEquals( 'Cafe Noire Expresso', $data[0][6] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[0][7] );
-		$this->assertEquals( '4.50', $data[0][8] );
-		$this->assertEquals( '0.00', $data[0][9] );
-		$this->assertEquals( '0.00', $data[0][10] );
-		$this->assertEquals( '0.0000', $data[0][11] );
-		$this->assertEquals( '1', $data[0][12] );
-		$this->assertEquals( '1', $data[0][13] );
-		$this->assertEquals( "default\ndefault\nconfig", $data[0][14] );
-		$this->assertEquals( "width\nlength\ninterval", $data[0][15] );
-		$this->assertEquals( "33\n36\nP0Y1M0W0D", $data[0][16] );
-		$this->assertEquals( "33\n36\nP0Y1M0W0D", $data[0][17] );
+		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Product\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(4, count($data));
+
+		$this->assertEquals(18, count($data[0]));
+		$this->assertEquals('default', $data[0][0]);
+		$this->assertEquals('unit_type1', $data[0][1]);
+		$this->assertEquals('unitsupplier', $data[0][2]);
+		$this->assertEquals('CNE', $data[0][3]);
+		$this->assertGreaterThan(0, $data[0][4]);
+		$this->assertEquals('9', $data[0][5]);
+		$this->assertEquals('Cafe Noire Expresso', $data[0][6]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[0][7]);
+		$this->assertEquals('4.50', $data[0][8]);
+		$this->assertEquals('0.00', $data[0][9]);
+		$this->assertEquals('0.00', $data[0][10]);
+		$this->assertEquals('0.0000', $data[0][11]);
+		$this->assertEquals('1', $data[0][12]);
+		$this->assertEquals('1', $data[0][13]);
+		$this->assertEquals("default\ndefault\nconfig", $data[0][14]);
+		$this->assertEquals("width\nlength\ninterval", $data[0][15]);
+		$this->assertEquals("33\n36\nP0Y1M0W0D", $data[0][16]);
+		$this->assertEquals("33\n36\nP0Y1M0W0D", $data[0][17]);
 	}
 
 
-	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/common/tests/Controller/Common/Subscription/Export/Csv/Processor/Product/StandardTest.php

Spacing +35 added lines, -35 removed lines

@@ -35,51 +35,51 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Product\Standard( $context, $mapping );
-
-		$subscription = $this->getSubscription( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $subscription->getOrderBaseId() );
-
-		$data = $object->process( $subscription, $order );
-
-
-		$this->assertEquals( 1, count( $data ) );
-
-		$this->assertEquals( 18, count( $data[0] ) );
-		$this->assertEquals( 'default', $data[0][0] );
-		$this->assertEquals( 'unit_type1', $data[0][1] );
-		$this->assertEquals( 'unitsupplier', $data[0][2] );
-		$this->assertEquals( 'CNE', $data[0][3] );
-		$this->assertGreaterThan( 0, $data[0][4] );
-		$this->assertEquals( '9', $data[0][5] );
-		$this->assertEquals( 'Cafe Noire Expresso', $data[0][6] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[0][7] );
-		$this->assertEquals( '4.50', $data[0][8] );
-		$this->assertEquals( '0.00', $data[0][9] );
-		$this->assertEquals( '0.00', $data[0][10] );
-		$this->assertEquals( '0.0000', $data[0][11] );
-		$this->assertEquals( '1', $data[0][12] );
-		$this->assertEquals( '1', $data[0][13] );
-		$this->assertEquals( "default\ndefault\nconfig", $data[0][14] );
-		$this->assertEquals( "width\nlength\ninterval", $data[0][15] );
-		$this->assertEquals( "33\n36\nP0Y1M0W0D", $data[0][16] );
-		$this->assertEquals( "33\n36\nP0Y1M0W0D", $data[0][17] );
+		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Product\Standard($context, $mapping);
+
+		$subscription = $this->getSubscription($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($subscription->getOrderBaseId());
+
+		$data = $object->process($subscription, $order);
+
+
+		$this->assertEquals(1, count($data));
+
+		$this->assertEquals(18, count($data[0]));
+		$this->assertEquals('default', $data[0][0]);
+		$this->assertEquals('unit_type1', $data[0][1]);
+		$this->assertEquals('unitsupplier', $data[0][2]);
+		$this->assertEquals('CNE', $data[0][3]);
+		$this->assertGreaterThan(0, $data[0][4]);
+		$this->assertEquals('9', $data[0][5]);
+		$this->assertEquals('Cafe Noire Expresso', $data[0][6]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[0][7]);
+		$this->assertEquals('4.50', $data[0][8]);
+		$this->assertEquals('0.00', $data[0][9]);
+		$this->assertEquals('0.00', $data[0][10]);
+		$this->assertEquals('0.0000', $data[0][11]);
+		$this->assertEquals('1', $data[0][12]);
+		$this->assertEquals('1', $data[0][13]);
+		$this->assertEquals("default\ndefault\nconfig", $data[0][14]);
+		$this->assertEquals("width\nlength\ninterval", $data[0][15]);
+		$this->assertEquals("33\n36\nP0Y1M0W0D", $data[0][16]);
+		$this->assertEquals("33\n36\nP0Y1M0W0D", $data[0][17]);
 	}
 
 
-	protected function getSubscription( $context )
+	protected function getSubscription($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

controller/jobs/src/Controller/Jobs/Media/Scale/Standard.php

Spacing +18 added lines, -18 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rescale product images' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rescale product images');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rescales product images to the new sizes' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rescales product images to the new sizes');
 	}
 
 
@@ -51,41 +51,41 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.domain', 'product' ),
-			$search->compare( '=~', 'media.mimetype', 'image/' ),
+			$search->compare('==', 'media.domain', 'product'),
+			$search->compare('=~', 'media.mimetype', 'image/'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'media.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'media.id')));
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					$cntl->scale( $item, 'fs-media' );
-					$manager->saveItem( $item );
+					$cntl->scale($item, 'fs-media');
+					$manager->saveItem($item);
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
-					$msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() );
-					$context->getLogger()->log( $msg );
+					$msg = sprintf('Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage());
+					$context->getLogger()->log($msg);
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 				{
 					$cntl->scale( $item, 'fs-media' );
 					$manager->saveItem( $item );
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() );
 					$context->getLogger()->log( $msg );

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

Spacing +8 added lines, -8 removed lines

@@ -40,21 +40,21 @@
 	 * @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\Coupon\Item\Code\Iface $item, array $data )
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
+		$map = $this->getMappedChunk($data, $this->getMapping());
 
-		foreach( $map as $list )
+		foreach ($map as $list)
 		{
-			if( trim( $list['coupon.code.code'] ) == '' ) {
+			if (trim($list['coupon.code.code']) == '') {
 				continue;
 			}
 
-			$item->fromArray( $list );
-			$manager->saveItem( $item );
+			$item->fromArray($list);
+			$manager->saveItem($item);
 		}
 
-		return $this->getObject()->process( $item, $data );
+		return $this->getObject()->process($item, $data);
 	}
 }