aimeos / ai-controller-jobs

controller/jobs/tests/Controller/Jobs/Admin/Log/StandardTest.php

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
 		$this->context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard( $this->context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard($this->context, $aimeos);
 	}
 
 
@@ -44,14 +44,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Log cleanup', $this->object->getName() );
+		$this->assertEquals('Log cleanup', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Removes the old log entries from the database and archives them (optional)';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -59,38 +59,38 @@ 
 	{
 		$config = $this->context->getConfig();
 
-		$mock = $this->getMockBuilder( '\\Aimeos\\MAdmin\\Log\\Manager\\Standard' )
-			->setMethods( array( 'deleteItems' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$mock = $this->getMockBuilder('\\Aimeos\\MAdmin\\Log\\Manager\\Standard')
+			->setMethods(array('deleteItems'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		$mock->expects( $this->atLeastOnce() )->method( 'deleteItems' );
+		$mock->expects($this->atLeastOnce())->method('deleteItems');
 
-		$tmppath = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'tmp';
+		$tmppath = dirname(dirname(dirname(dirname(__DIR__)))) . DIRECTORY_SEPARATOR . 'tmp';
 		$name = 'ControllerJobsAdminLogDefaultRun';
-		$config->set( 'madmin/log/manager/name', $name );
-		$config->set( 'controller/jobs/admin/log/standard/limit-days', 0 );
-		$config->set( 'controller/jobs/admin/log/standard/path', $tmppath );
+		$config->set('madmin/log/manager/name', $name);
+		$config->set('controller/jobs/admin/log/standard/limit-days', 0);
+		$config->set('controller/jobs/admin/log/standard/path', $tmppath);
 
-		\Aimeos\MAdmin\Log\Manager\Factory::injectManager( '\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock );
+		\Aimeos\MAdmin\Log\Manager\Factory::injectManager('\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock);
 
-		if( !is_dir( $tmppath ) && mkdir( $tmppath ) === false ) {
-			throw new \RuntimeException( sprintf( 'Unable to create temporary path "%1$s"', $tmppath ) );
+		if (!is_dir($tmppath) && mkdir($tmppath) === false) {
+			throw new \RuntimeException(sprintf('Unable to create temporary path "%1$s"', $tmppath));
 		}
 
 		$this->object->run();
 
-		foreach( new \DirectoryIterator( $tmppath ) as $file )
+		foreach (new \DirectoryIterator($tmppath) as $file)
 		{
-			if( $file->isFile() && $file->getExtension() === 'zip' )
+			if ($file->isFile() && $file->getExtension() === 'zip')
 			{
-				$container = \Aimeos\MW\Container\Factory::getContainer( $file->getPathName(), 'Zip', 'CSV', [] );
-				$container->get( 'unittest facility.csv' );
-				unlink( $file->getPathName() );
+				$container = \Aimeos\MW\Container\Factory::getContainer($file->getPathName(), 'Zip', 'CSV', []);
+				$container->get('unittest facility.csv');
+				unlink($file->getPathName());
 				return;
 			}
 		}
 
-		$this->fail( 'Log archive file not found' );
+		$this->fail('Log archive file not found');
 	}
 }

controller/jobs/tests/Controller/Jobs/Order/Service/Payment/StandardTest.php

Spacing +67 added lines, -67 removed lines

@@ -24,7 +24,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 	}
 
 
@@ -42,14 +42,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Capture authorized payments', $this->object->getName() );
+		$this->assertEquals('Capture authorized payments', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -60,49 +60,49 @@ 
 
 
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' )
-			->setMethods( array( 'isImplemented', 'capture' ) )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay')
+			->setMethods(array('isImplemented', 'capture'))
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'isImplemented' )
-			->will( $this->returnValue( true ) );
+		$serviceProviderStub->expects($this->once())->method('isImplemented')
+			->will($this->returnValue(true));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'capture' );
+		$serviceProviderStub->expects($this->once())->method('capture');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -114,52 +114,52 @@ 
 
 
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' )
-			->setMethods( array( 'isImplemented', 'capture' ) )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay')
+			->setMethods(array('isImplemented', 'capture'))
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'isImplemented' )
-			->will( $this->returnValue( true ) );
+		$serviceProviderStub->expects($this->once())->method('isImplemented')
+			->will($this->returnValue(true));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'capture' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test oder service payment: capture' ) ) );
+		$serviceProviderStub->expects($this->once())->method('capture')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test oder service payment: capture')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'saveItem' );
+		$orderManagerStub->expects($this->never())->method('saveItem');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -171,36 +171,36 @@ 
 
 
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test service delivery process: getProvider' ) ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test service delivery process: getProvider')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'searchItems' );
+		$orderManagerStub->expects($this->never())->method('searchItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/src/Controller/Jobs/Admin/Log/Standard.php

Spacing +26 added lines, -26 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Log cleanup' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Log cleanup');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes the old log entries from the database and archives them (optional)' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes the old log entries from the database and archives them (optional)');
 	}
 
 
@@ -71,8 +71,8 @@ 
 		 * @see controller/jobs/admin/log/standard/container/format
 		 * @see controller/jobs/admin/log/standard/container/options
 		 */
-		$limit = $config->get( 'controller/jobs/admin/log/standard/limit-days', 30 );
-		$limitDate = date( 'Y-m-d H:i:s', time() - $limit * 86400 );
+		$limit = $config->get('controller/jobs/admin/log/standard/limit-days', 30);
+		$limitDate = date('Y-m-d H:i:s', time() - $limit * 86400);
 
 		/** controller/jobs/admin/log/standard/path
 		 * Path to a writable directory where the log archive files should be stored
@@ -101,7 +101,7 @@ 
 		 * @see controller/jobs/admin/log/standard/container/options
 		 * @see controller/jobs/admin/log/standard/limit-days
 		 */
-		if( ( $path = $config->get( 'controller/jobs/admin/log/standard/path', null ) ) !== null )
+		if (($path = $config->get('controller/jobs/admin/log/standard/path', null)) !== null)
 		{
 			/** controller/jobs/admin/log/standard/container/type
 			 * Container file type storing all coupon code files to import
@@ -175,19 +175,19 @@ 
 			 * @see controller/jobs/admin/log/standard/limit-days
 			 */
 
-			$type = $config->get( 'controller/jobs/admin/log/standard/container/type', 'Zip' );
-			$format = $config->get( 'controller/jobs/admin/log/standard/container/format', 'CSV' );
-			$options = $config->get( 'controller/jobs/admin/log/standard/container/options', [] );
+			$type = $config->get('controller/jobs/admin/log/standard/container/type', 'Zip');
+			$format = $config->get('controller/jobs/admin/log/standard/container/format', 'CSV');
+			$options = $config->get('controller/jobs/admin/log/standard/container/options', []);
 
-			$path .= DIRECTORY_SEPARATOR . str_replace( ' ', '_', $limitDate );
-			$container = \Aimeos\MW\Container\Factory::getContainer( $path, $type, $format, $options );
+			$path .= DIRECTORY_SEPARATOR . str_replace(' ', '_', $limitDate);
+			$container = \Aimeos\MW\Container\Factory::getContainer($path, $type, $format, $options);
 		}
 
-		$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'log' );
+		$manager = \Aimeos\MAdmin\Factory::createManager($context, 'log');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '<=', 'log.timestamp', $limitDate ) );
-		$search->setSortations( array( $search->sort( '+', 'log.timestamp' ) ) );
+		$search->setConditions($search->compare('<=', 'log.timestamp', $limitDate));
+		$search->setSortations(array($search->sort('+', 'log.timestamp')));
 
 		$start = 0;
 		$contents = [];
@@ -195,37 +195,37 @@ 
 		do
 		{
 			$ids = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				if( $container !== null )
+				if ($container !== null)
 				{
 					$facility = $item->getFacility();
 
-					if( !isset( $contents[$facility] ) ) {
-						$contents[$facility] = $container->create( $facility );
+					if (!isset($contents[$facility])) {
+						$contents[$facility] = $container->create($facility);
 					}
 
-					$contents[$facility]->add( $item->toArray() );
+					$contents[$facility]->add($item->toArray());
 				}
 
 				$ids[] = $id;
 			}
 
-			$manager->deleteItems( $ids );
+			$manager->deleteItems($ids);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
 
-		if( $container !== null && !empty( $contents ) )
+		if ($container !== null && !empty($contents))
 		{
-			foreach( $contents as $content ) {
-				$container->add( $content );
+			foreach ($contents as $content) {
+				$container->add($content);
 			}
 
 			$container->close();

controller/jobs/src/Controller/Jobs/Order/Cleanup/Unpaid/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unpaid orders' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unpaid orders');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unpaid orders to keep the database clean' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unpaid orders to keep the database clean');
 	}
 
 
@@ -52,9 +52,9 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Common\Order\Factory::createController( $context );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$controller = \Aimeos\Controller\Common\Order\Factory::createController($context);
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/jobs/order/cleanup/unpaid/keep-days
 		 * Removes all orders from the database that are unpaid
@@ -71,35 +71,35 @@ 
 		 * @since 2014.07
 		 * @category User
 		 */
-		$days = $context->getConfig()->get( 'controller/jobs/order/cleanup/unpaid/keep-days', 3 );
-		$limit = date( 'Y-m-d H:i:s', time() - 86400 * $days );
+		$days = $context->getConfig()->get('controller/jobs/order/cleanup/unpaid/keep-days', 3);
+		$limit = date('Y-m-d H:i:s', time() - 86400 * $days);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '<', 'order.mtime', $limit ),
-			$search->compare( '<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND ),
+			$search->compare('<', 'order.mtime', $limit),
+			$search->compare('<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$controller->unblock( $item );
+				$controller->unblock($item);
 				$baseIds[] = $item->getBaseId();
 			}
 
-			$baseManager->deleteItems( $baseIds );
+			$baseManager->deleteItems($baseIds);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Cleanup/Unfinished/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unfinished orders' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unfinished orders');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again');
 	}
 
 
@@ -52,9 +52,9 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Common\Order\Factory::createController( $context );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$controller = \Aimeos\Controller\Common\Order\Factory::createController($context);
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/jobs/order/cleanup/unfinished/keep-hours
 		 * Release the ordered products after the configured time if no payment was confirmed
@@ -74,35 +74,35 @@ 
 		 * @since 2014.07
 		 * @category User
 		 */
-		$hours = $context->getConfig()->get( 'controller/jobs/order/cleanup/unfinished/keep-hours', 24 );
-		$limit = date( 'Y-m-d H:i:s', time() - 3600 * $hours );
+		$hours = $context->getConfig()->get('controller/jobs/order/cleanup/unfinished/keep-hours', 24);
+		$limit = date('Y-m-d H:i:s', time() - 3600 * $hours);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '<', 'order.mtime', $limit ),
-			$search->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED ),
+			$search->compare('<', 'order.mtime', $limit),
+			$search->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$controller->unblock( $item );
+				$controller->unblock($item);
 				$baseIds[] = $item->getBaseId();
 			}
 
-			$baseManager->deleteItems( $baseIds );
+			$baseManager->deleteItems($baseIds);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Order\Export\Csv\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\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Export\Csv\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\Order\Export\Csv\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,8 +46,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'Factory');
 	}
 
 }

controller/jobs/src/Controller/Jobs/Order/Export/Csv/Standard.php

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
 				}
 
 				$this->export( $processors, $data, $maxcnt );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger->log( 'Order export error: ' . $e->getMessage() );
 				$logger->log( $e->getTraceAsString() );

Spacing +60 added lines, -60 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order export CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Order export CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports orders to CSV file' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports orders to CSV file');
 	}
 
 
@@ -73,7 +73,7 @@ 
 		 * @category Developer
 		 * @see controller/common/order/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/order/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/order/export/csv/mapping', $mappings);
 
 		/** controller/jobs/order/export/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -88,7 +88,7 @@ 
 		 * @category Developer
 		 * @see controller/common/order/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/order/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/order/export/csv/mapping', $mappings);
 
 
 		/** controller/common/order/export/csv/max-size
@@ -106,29 +106,29 @@ 
 		 * @category Developer
 		 * @see controller/common/order/export/csv/mapping
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/order/export/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/order/export/csv/max-size', 1000);
 
 
-		$processors = $this->getProcessors( $mappings );
-		$mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'order-export' );
+		$processors = $this->getProcessors($mappings);
+		$mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('order-export');
 
-		while( ( $msg = $mq->get() ) !== null )
+		while (($msg = $mq->get()) !== null)
 		{
 			try
 			{
-				if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) {
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %1$s', $msg->getBody() ) );
+				if (($data = json_decode($msg->getBody(), true)) === null) {
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %1$s', $msg->getBody()));
 				}
 
-				$this->export( $processors, $data, $maxcnt );
+				$this->export($processors, $data, $maxcnt);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$logger->log( 'Order export error: ' . $e->getMessage() );
-				$logger->log( $e->getTraceAsString() );
+				$logger->log('Order export error: ' . $e->getMessage());
+				$logger->log($e->getTraceAsString());
 			}
 
-			$mq->del( $msg );
+			$mq->del($msg);
 		}
 	}
 
@@ -139,15 +139,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
 	 * @param string $path Absolute path to the exported file
 	 */
-	protected function addJob( $context, $path )
+	protected function addJob($context, $path)
 	{
-		$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'job' );
+		$manager = \Aimeos\MAdmin\Factory::createManager($context, 'job');
 
 		$item = $manager->createItem();
-		$item->setResult( ['file' => $path] );
-		$item->setLabel( $path );
+		$item->setResult(['file' => $path]);
+		$item->setLabel($path);
 
-		$manager->saveItem( $item, false );
+		$manager->saveItem($item, false);
 	}
 
 
@@ -177,7 +177,7 @@ 
 		 * @see controller/jobs/order/export/csv/container/content
 		 * @see controller/jobs/order/export/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/order/export/csv/location', sys_get_temp_dir() );
+		$location = $config->get('controller/jobs/order/export/csv/location', sys_get_temp_dir());
 
 		/** controller/jobs/order/export/csv/container/type
 		 * Nave of the container type to read the data from
@@ -200,7 +200,7 @@ 
 		 * @see controller/jobs/order/export/csv/container/content
 		 * @see controller/jobs/order/export/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/order/export/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/order/export/csv/container/type', 'Directory');
 
 		/** controller/jobs/order/export/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -221,7 +221,7 @@ 
 		 * @see controller/jobs/order/export/csv/container/type
 		 * @see controller/jobs/order/export/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/order/export/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/order/export/csv/container/content', 'CSV');
 
 		/** controller/jobs/order/export/csv/container/options
 		 * List of file container options for the order export files
@@ -239,9 +239,9 @@ 
 		 * @see controller/jobs/order/export/csv/container/content
 		 * @see controller/jobs/order/export/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/order/export/csv/container/options', [] );
+		$options = $config->get('controller/jobs/order/export/csv/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -253,56 +253,56 @@ 
 	 * @param integer $maxcnt Maximum number of retrieved orders at once
 	 * @return string Path of the file containing the exported data
 	 */
-	protected function export( array $processors, $msg, $maxcnt )
+	protected function export(array $processors, $msg, $maxcnt)
 	{
-		$lcontext = $this->getLocaleContext( $msg );
+		$lcontext = $this->getLocaleContext($msg);
 		$baseRef = ['order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service'];
 
-		$manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order' );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($lcontext, 'order');
+		$baseManager = \Aimeos\MShop\Factory::createManager($lcontext, 'order/base');
 
 		$container = $this->getContainer();
-		$content = $container->create( 'order-export_' . date( 'Y-m-d_H-i-s' ) );
-		$search = $this->initCriteria( $manager->createSearch()->setSlice( 0, 0x7fffffff ), $msg );
+		$content = $container->create('order-export_' . date('Y-m-d_H-i-s'));
+		$search = $this->initCriteria($manager->createSearch()->setSlice(0, 0x7fffffff), $msg);
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$search->setSlice( $start, $maxcnt );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, $maxcnt);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$baseIds[] = $item->getBaseId();
 			}
 
 			$baseSearch = $baseManager->createSearch();
-			$baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) );
-			$baseSearch->setSlice( 0, count( $baseIds ) );
+			$baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds));
+			$baseSearch->setSlice(0, count($baseIds));
 
-			$baseItems = $baseManager->searchItems( $baseSearch, $baseRef );
+			$baseItems = $baseManager->searchItems($baseSearch, $baseRef);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				foreach( $processors as $type => $processor )
+				foreach ($processors as $type => $processor)
 				{
-					foreach( $processor->process( $item, $baseItems[$item->getBaseId()] ) as $line ) {
-						$content->add( [0 => $type, 1 => $id] + $line );
+					foreach ($processor->process($item, $baseItems[$item->getBaseId()]) as $line) {
+						$content->add([0 => $type, 1 => $id] + $line);
 					}
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 
 		$path = $content->getResource();
-		$container->add( $content );
+		$container->add($content);
 		$container->close();
 
-		$path = $this->moveFile( $lcontext, $path );
-		$this->addJob( $lcontext, $path );
+		$path = $this->moveFile($lcontext, $path);
+		$this->addJob($lcontext, $path);
 	}
 
 
@@ -312,15 +312,15 @@ 
 	 * @param array $msg Message data including a "sitecode" value
 	 * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale
 	 */
-	protected function getLocaleContext( array $msg )
+	protected function getLocaleContext(array $msg)
 	{
 		$lcontext = clone $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'locale' );
+		$manager = \Aimeos\MShop\Factory::createManager($lcontext, 'locale');
 
-		$sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' );
-		$localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_PATH );
+		$sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default');
+		$localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_PATH);
 
-		return $lcontext->setLocale( $localeItem );
+		return $lcontext->setLocale($localeItem);
 	}
 
 
@@ -331,14 +331,14 @@ 
 	 * @param array $msg Message data
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg)
 	{
-		if( isset( $msg['filter'] ) ) {
-			$criteria->setConditions( $criteria->toConditions( $msg['filter'] ) );
+		if (isset($msg['filter'])) {
+			$criteria->setConditions($criteria->toConditions($msg['filter']));
 		}
 
-		if( isset( $msg['sort'] ) ) {
-			$criteria->setSortations( $criteria->toSortations( $msg['sort'] ) );
+		if (isset($msg['sort'])) {
+			$criteria->setSortations($criteria->toSortations($msg['sort']));
 		}
 
 		return $criteria;
@@ -352,12 +352,12 @@ 
 	 * @param string $path Absolute path to the exported file
 	 * @return string Relative path of the file in the storage
 	 */
-	protected function moveFile( $context, $path )
+	protected function moveFile($context, $path)
 	{
-		$filename = basename( $path );
-		$context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path );
+		$filename = basename($path);
+		$context->getFileSystemManager()->get('fs-admin')->writef($filename, $path);
 
-		unlink( $path );
+		unlink($path);
 		return $filename;
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Export/Csv/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/order/export/csv/name
 		 * Class name of the used order suggestions scheduler controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2015.01
 		 * @category Developer
 		 */
-		if ( $name === null ) {
+		if ($name === null) {
 			$name = $context->getConfig()->get('controller/jobs/order/export/csv/name', 'Standard');
 		}
 
-		if ( ctype_alnum($name) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Order\\Export\\Csv\\' . $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\\Order\\Export\\Csv\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/order/export/csv/decorators/excludes
 		 * Excludes decorators added by the "common" option from the order export CSV job controller
@@ -154,6 +154,6 @@ 
 		 * @see controller/jobs/order/export/csv/decorators/excludes
 		 * @see controller/jobs/order/export/csv/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'order/export/csv' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'order/export/csv');
 	}
 }
\ No newline at end of file

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

Spacing +15 added lines, -15 removed lines

@@ -18,37 +18,37 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard( $context, $mapping );
+		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Coupon\Standard($context, $mapping);
 
-		$invoice = $this->getInvoice( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() );
+		$invoice = $this->getInvoice($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId());
 
-		$data = $object->process( $invoice, $order );
+		$data = $object->process($invoice, $order);
 
 
-		$this->assertEquals( 2, count( $data ) );
+		$this->assertEquals(2, count($data));
 
-		$this->assertEquals( 1, count( $data[0] ) );
-		$this->assertEquals( '5678', $data[0][0] );
+		$this->assertEquals(1, count($data[0]));
+		$this->assertEquals('5678', $data[0][0]);
 
-		$this->assertEquals( 1, count( $data[1] ) );
-		$this->assertEquals( 'OPQR', $data[1][0] );
+		$this->assertEquals(1, count($data[1]));
+		$this->assertEquals('OPQR', $data[1][0]);
 	}
 
 
-	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');
 	}
 }