aimeos / ai-controller-frontend

controller/frontend/src/Controller/Frontend/Service/Standard.php

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
 				} else {
 					unset( $items[$id] );
 				}
-			}
-			catch( \Aimeos\MShop\Service\Exception $e )
+			} catch( \Aimeos\MShop\Service\Exception $e )
 			{
 				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
 				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );

Spacing +69 added lines, -69 removed lines

@@ -35,12 +35,12 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$provider = $manager->getProvider( $manager->getItem( $serviceId, [], true ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$provider = $manager->getProvider($manager->getItem($serviceId, [], true));
 
-		return array_filter( $provider->checkConfigFE( $attributes ) );
+		return array_filter($provider->checkConfigFE($attributes));
 	}
 
 
@@ -51,10 +51,10 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		return $manager->getProvider( $manager->getItem( $serviceId, $ref, true ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		return $manager->getProvider($manager->getItem($serviceId, $ref, true));
 	}
 
 
@@ -65,26 +65,26 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
 	{
 		$list = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$search = $manager->createSearch( true );
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
+		$search = $manager->createSearch(true);
+		$search->setSortations(array($search->sort('+', 'service.position')));
 
-		if( $type != null )
+		if ($type != null)
 		{
 			$expr = array(
 				$search->getConditions(),
-				$search->compare( '==', 'service.type.code', $type ),
-				$search->compare( '==', 'service.type.domain', 'service' ),
+				$search->compare('==', 'service.type.code', $type),
+				$search->compare('==', 'service.type.domain', 'service'),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 		}
 
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
-			$list[$id] = $manager->getProvider( $item );
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
+			$list[$id] = $manager->getProvider($item);
 		}
 
 		return $list;
@@ -102,14 +102,14 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$provider = $manager->getProvider( $manager->getItem( $serviceId, [], true ) );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($manager->getItem($serviceId, [], true));
+		$provider->injectGlobalConfigBE($urls);
 
-		return $provider->process( $orderItem, $params );
+		return $provider->process($orderItem, $params);
 	}
 
 
@@ -122,35 +122,35 @@ 
 	 * 	(keys are <type>.url-self, <type>.url-success, <type>.url-update where type can be "delivery" or "payment")
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls )
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls)
 	{
 		$queryParams = $request->getQueryParams();
 
-		if( !isset( $queryParams['code'] ) ) {
+		if (!isset($queryParams['code'])) {
 			return;
 		}
 
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-		$provider = $manager->getProvider( $manager->findItem( $queryParams['code'] ) );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($manager->findItem($queryParams['code']));
+		$provider->injectGlobalConfigBE($urls);
 
-		$params = array_merge( $queryParams, (array) $request->getParsedBody() );
+		$params = array_merge($queryParams, (array) $request->getParsedBody());
 		$body = (string) $request->getBody();
 		$response = null;
 		$headers = [];
 
-		if( ( $orderItem = $provider->updateSync( $params, $body, $response, $headers ) ) !== null )
+		if (($orderItem = $provider->updateSync($params, $body, $response, $headers)) !== null)
 		{
-			if( $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
-				&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
+			if ($orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
+				&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
 			) {
-				$provider->query( $orderItem );
+				$provider->query($orderItem);
 			}
 
 			// update stock, coupons, etc.
-			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
+			\Aimeos\Controller\Frontend\Factory::createController($context, 'order')->update($orderItem);
 		}
 
 		return $orderItem;
@@ -167,38 +167,38 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProviders() instead
 	 */
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket, $ref = ['media', 'price', 'text'] )
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket, $ref = ['media', 'price', 'text'])
 	{
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$search = $serviceManager->createSearch( true );
+		$search = $serviceManager->createSearch(true);
 		$expr = array(
 			$search->getConditions(),
-			$search->compare( '==', 'service.type.domain', 'service' ),
-			$search->compare( '==', 'service.type.code', $type ),
+			$search->compare('==', 'service.type.domain', 'service'),
+			$search->compare('==', 'service.type.code', $type),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'service.position')));
 
-		$items = $serviceManager->searchItems( $search, $ref );
+		$items = $serviceManager->searchItems($search, $ref);
 
 
-		foreach( $items as $id => $service )
+		foreach ($items as $id => $service)
 		{
 			try
 			{
-				$provider = $serviceManager->getProvider( $service );
+				$provider = $serviceManager->getProvider($service);
 
-				if( $provider->isAvailable( $basket ) ) {
+				if ($provider->isAvailable($basket)) {
 					$this->providers[$type][$id] = $provider;
 				} else {
-					unset( $items[$id] );
+					unset($items[$id]);
 				}
 			}
-			catch( \Aimeos\MShop\Service\Exception $e )
+			catch (\Aimeos\MShop\Service\Exception $e)
 			{
-				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
-				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );
+				$msg = sprintf('Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id);
+				$this->getContext()->getLogger()->log($msg, \Aimeos\MW\Logger\Base::WARN);
 			}
 		}
 
@@ -219,16 +219,16 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProvider() instead
 	 */
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		if( isset( $this->providers[$type][$serviceId] ) ) {
-			return $this->providers[$type][$serviceId]->getConfigFE( $basket );
+		if (isset($this->providers[$type][$serviceId])) {
+			return $this->providers[$type][$serviceId]->getConfigFE($basket);
 		}
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $serviceManager->getItem( $serviceId, ['price'], true );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $serviceManager->getItem($serviceId, ['price'], true);
 
-		return $serviceManager->getProvider( $item )->getConfigFE( $basket );
+		return $serviceManager->getProvider($item)->getConfigFE($basket);
 	}
 
 
@@ -244,16 +244,16 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProvider() instead
 	 */
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		if( isset( $this->providers[$type][$serviceId] ) ) {
-			return $this->providers[$type][$serviceId]->calcPrice( $basket );
+		if (isset($this->providers[$type][$serviceId])) {
+			return $this->providers[$type][$serviceId]->calcPrice($basket);
 		}
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $serviceManager->getItem( $serviceId, ['price'], true );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $serviceManager->getItem($serviceId, ['price'], true);
 
-		return $serviceManager->getProvider( $item )->calcPrice( $basket );
+		return $serviceManager->getProvider($item)->calcPrice($basket);
 	}
 
 
@@ -269,22 +269,22 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
 	 * @deprecated Use checkAttributes() instead
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
 	{
-		if( !isset( $this->providers[$type][$serviceId] ) )
+		if (!isset($this->providers[$type][$serviceId]))
 		{
-			$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-			$item = $serviceManager->getItem( $serviceId, ['price'], true );
+			$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+			$item = $serviceManager->getItem($serviceId, ['price'], true);
 
-			$this->providers[$type][$serviceId] = $serviceManager->getProvider( $item );
+			$this->providers[$type][$serviceId] = $serviceManager->getProvider($item);
 		}
 
-		$errors = $this->providers[$type][$serviceId]->checkConfigFE( $attributes );
+		$errors = $this->providers[$type][$serviceId]->checkConfigFE($attributes);
 
-		foreach( $errors as $key => $msg )
+		foreach ($errors as $key => $msg)
 		{
-			if( $msg === null ) {
-				unset( $errors[$key] );
+			if ($msg === null) {
+				unset($errors[$key]);
 			}
 		}
 

controller/frontend/tests/Controller/Frontend/Customer/StandardTest.php

Spacing +44 added lines, -44 removed lines

@@ -18,106 +18,106 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object );
+		unset($this->context, $this->object);
 	}
 
 
 	public function testAddEditSaveDeleteItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$id = $manager->findItem( 'UTC001' )->getId();
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$id = $manager->findItem('UTC001')->getId();
 
-		$this->context->setUserId( $id );
-		$item = $this->object->addItem( ['customer.code' => 'unittest-ctnl', 'customer.status' => 1] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$this->context->setUserId($id);
+		$item = $this->object->addItem(['customer.code' => 'unittest-ctnl', 'customer.status' => 1]);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 
-		$this->context->setUserId( $item->getId() );
-		$item = $this->object->editItem( $item->getId(), ['customer.code' => 'unittest-ctnl2'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$this->context->setUserId($item->getId());
+		$item = $this->object->editItem($item->getId(), ['customer.code' => 'unittest-ctnl2']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 
-		$item->setStatus( 0 );
-		$this->object->saveItem( $item );
-		$this->assertEquals( 0, $item->getStatus() );
+		$item->setStatus(0);
+		$this->object->saveItem($item);
+		$this->assertEquals(0, $item->getStatus());
 
-		$this->object->deleteItem( $item->getId() );
+		$this->object->deleteItem($item->getId());
 
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
-		$manager->findItem( 'unittest-ctnl' );
+		$this->setExpectedException('\Aimeos\MShop\Exception');
+		$manager->findItem('unittest-ctnl');
 	}
 
 
 	public function testCreateItem()
 	{
 		$result = $this->object->createItem();
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
 	}
 
 
 	public function testGetItem()
 	{
-		$id = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' )->getId();
-		$this->context->setUserId( $id );
+		$id = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001')->getId();
+		$this->context->setUserId($id);
 
-		$result = $this->object->getItem( $id, ['customer/address', 'text'] );
+		$result = $this->object->getItem($id, ['customer/address', 'text']);
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
-		$this->assertEquals( 1, count( $result->getRefItems( 'text' ) ) );
-		$this->assertEquals( 1, count( $result->getAddressItems() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
+		$this->assertEquals(1, count($result->getRefItems('text')));
+		$this->assertEquals(1, count($result->getAddressItems()));
 	}
 
 
 	public function testFindItem()
 	{
-		$result = $this->object->findItem( 'UTC001' );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
+		$result = $this->object->findItem('UTC001');
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
 	}
 
 
 	public function testAddEditSaveDeleteAddressItem()
 	{
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
-		$item = $this->object->addAddressItem( ['customer.address.lastname' => 'unittest-ctnl'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
+		$item = $this->object->addAddressItem(['customer.address.lastname' => 'unittest-ctnl']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
 
-		$item = $this->object->editAddressItem( $item->getId(), ['customer.address.lastname' => 'unittest-ctnl2'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
+		$item = $this->object->editAddressItem($item->getId(), ['customer.address.lastname' => 'unittest-ctnl2']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
 
-		$item->setLastName( 'test' );
-		$this->object->saveAddressItem( $item );
-		$this->assertEquals( 'test', $item->getLastName() );
+		$item->setLastName('test');
+		$this->object->saveAddressItem($item);
+		$this->assertEquals('test', $item->getLastName());
 
-		$this->object->deleteAddressItem( $item->getId() );
+		$this->object->deleteAddressItem($item->getId());
 	}
 
 
 	public function testCreateAddressItem()
 	{
 		$result = $this->object->createAddressItem();
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
 	}
 
 
 	public function testGetAddressItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address');
 		$search = $manager->createSearch();
-		$search->setSlice( 0, 1 );
-		$result = $manager->searchItems( $search );
+		$search->setSlice(0, 1);
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No customer address available' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No customer address available');
 		}
 
-		$this->context->setUserId( $item->getParentId() );
-		$result = $this->object->getAddressItem( $item->getId() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
+		$this->context->setUserId($item->getParentId());
+		$result = $this->object->getAddressItem($item->getId());
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
 	}
 }

controller/frontend/tests/Controller/Frontend/Service/FactoryTest.php

Spacing +10 added lines, -10 removed lines

@@ -15,31 +15,31 @@
 	{
 		$target = '\\Aimeos\\Controller\\Frontend\\Service\\Iface';
 
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext() );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext());
+		$this->assertInstanceOf($target, $controller);
 
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
+		$this->assertInstanceOf($target, $controller);
 	}
 
 
 	public function testCreateControllerInvalidImplementation()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 }

controller/frontend/tests/Controller/Frontend/Service/Decorator/BaseTest.php

Spacing +57 added lines, -57 removed lines

@@ -20,161 +20,161 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$this->stub->expects( $this->once() )->method( 'checkAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('checkAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->checkAttributes( -1, [] ) );
+		$this->assertEquals([], $this->object->checkAttributes( -1, [] ));
 	}
 
 
 	public function testGetProvider()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$provider = $manager->getProvider( $manager->findItem( 'unitcode', [], 'service', 'delivery' ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$provider = $manager->getProvider($manager->findItem('unitcode', [], 'service', 'delivery'));
 
-		$this->stub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $provider ) );
+		$this->stub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($provider));
 
-		$this->assertSame( $provider, $this->object->getProvider( -1 ) );
+		$this->assertSame($provider, $this->object->getProvider( -1 ));
 	}
 
 
 	public function testGetProviders()
 	{
-		$this->stub->expects( $this->once() )->method( 'getProviders' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getProviders')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getProviders( 'payment' ) );
+		$this->assertEquals([], $this->object->getProviders('payment'));
 	}
 
 
 	public function testProcess()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'process' )
-			->will( $this->returnValue( new \Aimeos\MShop\Common\Item\Helper\Form\Standard() ) );
+		$this->stub->expects($this->once())->method('process')
+			->will($this->returnValue(new \Aimeos\MShop\Common\Item\Helper\Form\Standard()));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process( $item, -1, [], [] ) );
+		$this->assertInstanceOf('Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process($item, -1, [], []));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$response = $this->getMockBuilder( '\Psr\Http\Message\ResponseInterface' )->getMock();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$response = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'updateSync' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('updateSync')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Order\Item\Iface', $this->object->updateSync( $request, $response, [] ) );
+		$this->assertInstanceOf('Aimeos\MShop\Order\Item\Iface', $this->object->updateSync($request, $response, []));
 	}
 
 
 	public function testGetServices()
 	{
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getServices' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getServices')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getServices( 'payment', $basket ) );
+		$this->assertEquals([], $this->object->getServices('payment', $basket));
 	}
 
 
 	public function testGetServiceAttributes()
 	{
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getServiceAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getServiceAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getServiceAttributes( 'payment', -1, $basket ) );
+		$this->assertEquals([], $this->object->getServiceAttributes('payment', -1, $basket));
 	}
 
 
 	public function testGetServicePrice()
 	{
-		$priceItem = \Aimeos\MShop\Factory::createManager( $this->context, 'price' )->createItem();
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$priceItem = \Aimeos\MShop\Factory::createManager($this->context, 'price')->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getServicePrice' )
-			->will( $this->returnValue( $priceItem ) );
+		$this->stub->expects($this->once())->method('getServicePrice')
+			->will($this->returnValue($priceItem));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Price\Item\Iface', $this->object->getServicePrice( 'payment', -1, $basket ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Price\Item\Iface', $this->object->getServicePrice('payment', -1, $basket));
 	}
 
 
 	public function testCheckServiceAttributes()
 	{
-		$this->stub->expects( $this->once() )->method( 'checkServiceAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('checkServiceAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->checkServiceAttributes( 'payment', -1, [] ) );
+		$this->assertEquals([], $this->object->checkServiceAttributes('payment', -1, []));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Service\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Service\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

controller/frontend/src/Controller/Frontend/Order/Iface.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param string $type Arbitrary order type (max. eight chars)
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
 	 */
-	public function addItem( $baseId, $type );
+	public function addItem($baseId, $type);
 
 
 	/**
@@ -44,7 +44,7 @@ 
 	 * @param string $id Unique order ID
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
 	 */
-	public function getItem( $id );
+	public function getItem($id);
 
 
 	/**
@@ -54,7 +54,7 @@ 
 	 * @param integer &$total|null Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
 
 
 	/**
@@ -76,7 +76,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -98,7 +98,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -116,7 +116,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -130,5 +130,5 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 * @deprecated 2017.04 Use store() from basket controller instead
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket);
 }

controller/frontend/tests/Controller/Frontend/Order/Decorator/BaseTest.php

Spacing +43 added lines, -43 removed lines

@@ -20,136 +20,136 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Order\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Order\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Order\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Order\Decorator\Base')
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Order\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Order\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Order\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Order\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Order\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Order\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testAddItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'addItem' )->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('addItem')->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, '' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, '' ));
 	}
 
 
 	public function testCreateFilter()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'createFilter' )->will( $this->returnValue( $search ) );
+		$this->stub->expects($this->once())->method('createFilter')->will($this->returnValue($search));
 
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getItem' )->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('getItem')->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( -1 ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( -1 ));
 	}
 
 
 	public function testSearchItems()
 	{
-		$search = $this->getMockBuilder( '\Aimeos\MW\Criteria\Iface' )->getMock();
+		$search = $this->getMockBuilder('\Aimeos\MW\Criteria\Iface')->getMock();
 
-		$this->stub->expects( $this->once() )->method( 'searchItems' )->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('searchItems')->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->searchItems( $search ) );
+		$this->assertEquals([], $this->object->searchItems($search));
 	}
 
 
 	public function testUnblock()
 	{
-		$orderItem = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$orderItem = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'unblock' );
+		$this->stub->expects($this->once())->method('unblock');
 
-		$this->object->unblock( $orderItem );
+		$this->object->unblock($orderItem);
 	}
 
 
 	public function testUpdate()
 	{
-		$orderItem = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$orderItem = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'update' );
+		$this->stub->expects($this->once())->method('update');
 
-		$this->object->update( $orderItem );
+		$this->object->update($orderItem);
 	}
 
 
 	public function testStore()
 	{
-		$orderItem = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$orderItem = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'store' )
-			->will( $this->returnValue( $orderItem ) );
+		$this->stub->expects($this->once())->method('store')
+			->will($this->returnValue($orderItem));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->store( $basket ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->store($basket));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Order\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Order\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

controller/frontend/src/Controller/Frontend/Service/Iface.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes );
+	public function checkAttributes($serviceId, array $attributes);
 
 	/**
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
 
 	/**
 	 * Updates the payment or delivery status for the given request
@@ -72,5 +72,5 @@ 
 	 * 	(keys are <type>.url-self, <type>.url-success, <type>.url-update where type can be "delivery" or "payment")
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls );
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls);
 }

controller/frontend/src/Controller/Frontend/Order/Standard.php

Spacing +32 added lines, -32 removed lines

@@ -29,12 +29,12 @@ 
 	 * @param string $type Arbitrary order type (max. eight chars)
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
 	 */
-	public function addItem( $baseId, $type )
+	public function addItem($baseId, $type)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order');
 
-		$item = $manager->createItem()->setBaseId( $baseId )->setType( $type );
-		$manager->saveItem( $item );
+		$item = $manager->createItem()->setBaseId($baseId)->setType($type);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -47,7 +47,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true);
 	}
 
 
@@ -57,26 +57,26 @@ 
 	 * @param string $id Unique order ID
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
 	 */
-	public function getItem( $id )
+	public function getItem($id)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '==', 'order.id', $id ),
-			$search->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$search->compare('==', 'order.id', $id),
+			$search->compare('==', 'order.base.customerid', $context->getUserId()),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) );
+		throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id));
 	}
 
 
@@ -87,18 +87,18 @@ 
 	 * @param integer|null &$total Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$expr = [
 			$filter->getConditions(),
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -120,9 +120,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
 	}
 
 
@@ -144,9 +144,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
 	}
 
 
@@ -164,9 +164,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
 	}
 
 
@@ -181,22 +181,22 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 * @deprecated 2017.04 Use store() from basket controller instead
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$context = $this->getContext();
 
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
 
 		$orderBaseManager->begin();
-		$orderBaseManager->store( $basket );
+		$orderBaseManager->store($basket);
 		$orderBaseManager->commit();
 
 		$orderItem = $orderManager->createItem();
-		$orderItem->setBaseId( $basket->getId() );
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
-		$orderManager->saveItem( $orderItem );
+		$orderItem->setBaseId($basket->getId());
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
+		$orderManager->saveItem($orderItem);
 
 
 		return $orderItem;

controller/frontend/tests/Controller/Frontend/Order/StandardTest.php

Spacing +64 added lines, -64 removed lines

@@ -18,175 +18,175 @@
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Order\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Order\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testAddItem()
 	{
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
 
-		$manager->expects( $this->once() )->method( 'saveItem' );
+		$manager->expects($this->once())->method('saveItem');
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ));
 	}
 
 
 	public function testCreateFilter()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$customerItem = $manager->findItem( 'UTC001' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$customerItem = $manager->findItem('UTC001');
 
-		$this->context->setUserId( $customerItem->getId() );
+		$this->context->setUserId($customerItem->getId());
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
-		$search = $manager->createSearch()->setSlice( 0, 1 );
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $customerItem->getId() ) );
-		$result = $manager->searchItems( $search );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
+		$search = $manager->createSearch()->setSlice(0, 1);
+		$search->setConditions($search->compare('==', 'order.base.customerid', $customerItem->getId()));
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No order item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No order item found');
 		}
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( $item->getId() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->getItem($item->getId()));
 	}
 
 
 	public function testGetItemException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
-		$search = $manager->createSearch()->setSlice( 0, 1 );
-		$result = $manager->searchItems( $search );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
+		$search = $manager->createSearch()->setSlice(0, 1);
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No order item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No order item found');
 		}
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
-		$this->object->getItem( $item->getId() );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
+		$this->object->getItem($item->getId());
 	}
 
 
 	public function testSearchItems()
 	{
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
 	}
 
 
 	public function testStore()
 	{
 		$name = 'ControllerFrontendOrderStore';
-		$this->context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$this->context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'getSubManager' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'getSubManager'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		$orderBaseManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard' )
-			->setMethods( array( 'store' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderBaseManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard')
+			->setMethods(array('store'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$orderBaseItem = $orderBaseManagerStub->createItem();
-		$orderBaseItem->setId( 1 );
+		$orderBaseItem->setId(1);
 
 
-		$orderBaseManagerStub->expects( $this->once() )->method( 'store' );
+		$orderBaseManagerStub->expects($this->once())->method('store');
 
-		$orderManagerStub->expects( $this->once() )->method( 'getSubManager' )
-			->will( $this->returnValue( $orderBaseManagerStub ) );
+		$orderManagerStub->expects($this->once())->method('getSubManager')
+			->will($this->returnValue($orderBaseManagerStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'saveItem' );
+		$orderManagerStub->expects($this->once())->method('saveItem');
 
 
-		$this->object->store( $orderBaseItem );
+		$this->object->store($orderBaseItem);
 	}
 
 
 	public function testBlock()
 	{
 		$name = 'ControllerFrontendOrderBlock';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'block' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('block'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'block' );
+		$orderCntlStub->expects($this->once())->method('block');
 
 
-		$this->object->block( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->block(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 
 
 	public function testUnblock()
 	{
 		$name = 'ControllerFrontendOrderUnblock';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'unblock' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('unblock'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'unblock' );
+		$orderCntlStub->expects($this->once())->method('unblock');
 
 
-		$this->object->unblock( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->unblock(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 
 
 	public function testUpdate()
 	{
 		$name = 'ControllerFrontendOrderUpdate';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'update' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('update'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'update' );
+		$orderCntlStub->expects($this->once())->method('update');
 
 
-		$this->object->update( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->update(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 }