aimeos / ai-controller-frontend

controller/frontend/src/Controller/Frontend/Service/Decorator/Base.php

Doc Comments +1 added lines, -4 removed lines

@@ -77,7 +77,6 @@ 
 	/**
 	 * Returns the service item for the given ID
 	 *
-	 * @param string $id Unique service ID
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Item\Iface Service item object
 	 */
@@ -91,8 +90,6 @@ 
 	 * Returns the service providers for the given
 	 *
 	 * @param string $type Service type, e.g. "delivery" (shipping related) or "payment" (payment related)
-	 * @param string $serviceId Identifier of one of the service option returned by getService()
-	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
 	public function getProviders( $type, $ref = ['media', 'price', 'text'] )
@@ -172,7 +169,7 @@ 
 	/**
 	 * Returns the frontend controller
 	 *
-	 * @return \Aimeos\Controller\Frontend\Service\Iface Frontend controller object
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
 	 */
 	protected function getController()
 	{

Spacing +22 added lines, -22 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 */
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$iface = '\Aimeos\Controller\Frontend\Service\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -53,9 +53,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->controller, $name ), $param );
+		return @call_user_func_array(array($this->controller, $name), $param);
 	}
 
 
@@ -68,9 +68,9 @@ 
 	 * @return array List of key/value pairs of attributes keys and an error message for values that are invalid or
 	 * 	missing
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		return $this->controller->checkAttributes( $serviceId, $attributes );
+		return $this->controller->checkAttributes($serviceId, $attributes);
 	}
 
 
@@ -81,9 +81,9 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Item\Iface Service item object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		return $this->controller->getProvider( $serviceId, $ref );
+		return $this->controller->getProvider($serviceId, $ref);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getProviders( $type, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type, $ref = ['media', 'price', 'text'])
 	{
-		return $this->controller->getProviders( $type, $ref );
+		return $this->controller->getProviders($type, $ref);
 	}
 
 
@@ -111,10 +111,10 @@ 
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
 	 * @deprecated Use getProviders() instead
 	 */
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		$ref = array( 'media', 'price', 'text' ) )
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		$ref = array('media', 'price', 'text'))
 	{
-		return $this->controller->getServices( $type, $basket, $ref );
+		return $this->controller->getServices($type, $basket, $ref);
 	}
 
 
@@ -128,9 +128,9 @@ 
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 * @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)
 	{
-		return $this->controller->getServiceAttributes( $type, $serviceId, $basket );
+		return $this->controller->getServiceAttributes($type, $serviceId, $basket);
 	}
 
 
@@ -146,9 +146,9 @@ 
 	 * @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)
 	{
-		return $this->controller->getServicePrice( $type, $serviceId, $basket );
+		return $this->controller->getServicePrice($type, $serviceId, $basket);
 	}
 
 
@@ -163,9 +163,9 @@ 
 	 * 	missing
 	 * @deprecated Use checkAttributes() instead
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
 	{
-		return $this->controller->checkServiceAttributes( $type, $serviceId, $attributes );
+		return $this->controller->checkServiceAttributes($type, $serviceId, $attributes);
 	}
 
 

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

Doc Comments -3 removed lines

@@ -34,7 +34,6 @@ 
 	/**
 	 * Returns the service item for the given ID
 	 *
-	 * @param string $id Unique service ID
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Item\Iface Service item object
 	 */
@@ -44,8 +43,6 @@ 
 	 * Returns the service providers for the given
 	 *
 	 * @param string $type Service type, e.g. "delivery" (shipping related) or "payment" (payment related)
-	 * @param string $serviceId Identifier of one of the service option returned by getService()
-	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
 	public function getProviders( $type, $ref = ['media', 'price', 'text'] );

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return array List of key/value pairs of attributes keys and an error message for values that are invalid or
 	 * 	missing
 	 */
-	public function checkAttributes( $serviceId, array $attributes );
+	public function checkAttributes($serviceId, array $attributes);
 
 	/**
 	 * Returns the service item for the given ID
@@ -38,7 +38,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Item\Iface Service item object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the service providers for the given
@@ -48,5 +48,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getProviders( $type, $ref = ['media', 'price', 'text'] );
+	public function getProviders($type, $ref = ['media', 'price', 'text']);
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -44,8 +44,8 @@
 	/**
 	 * Returns the service item for the given ID
 	 *
-	 * @param string $id Unique service ID
 	 * @param string[] $ref List of domain names whose items should be fetched too
+	 * @param integer $serviceId
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
 	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )

Spacing +52 added lines, -52 removed lines

@@ -32,12 +32,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));
 	}
 
 
@@ -48,10 +48,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));
 	}
 
 
@@ -62,22 +62,22 @@ 
 	 * @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, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type, $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 = $manager->createSearch(true);
 		$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->setSortations( array( $search->sort( '+', 'service.position' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'service.position')));
 
-		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;
@@ -94,38 +94,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);
 			}
 		}
 
@@ -146,16 +146,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);
 	}
 
 
@@ -171,16 +171,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);
 	}
 
 
@@ -196,22 +196,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]);
 			}
 		}
 

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 );

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

Spacing +57 added lines, -57 removed lines

@@ -28,13 +28,13 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values )
+	public function addItem(array $values)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$manager->saveItem( $item );
+		$item->fromArray($values);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -45,13 +45,13 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setStatus( 1 );
+		$item->fromArray($values);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -63,12 +63,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @since 2017.04
 	 */
-	public function deleteItem( $id )
+	public function deleteItem($id)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -80,15 +80,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function editItem( $id, array $values )
+	public function editItem($id, array $values)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		$item = $manager->getItem( $id, [], true );
-		$item->fromArray( $values );
-		$manager->saveItem( $item );
+		$item = $manager->getItem($id, [], true);
+		$item->fromArray($values);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -102,17 +102,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function getItem( $id = null, array $domains = [] )
+	public function getItem($id = null, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		if( $id == null ) {
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
+		if ($id == null) {
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
 		}
 
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		return $manager->getItem( $id, $domains, true );
+		return $manager->getItem($id, $domains, true);
 	}
 
 
@@ -126,9 +126,9 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function findItem( $code, array $domains = [] )
+	public function findItem($code, array $domains = [])
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
 	}
 
 
@@ -137,9 +137,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
 	{
-		\Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
+		\Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -150,15 +150,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function addAddressItem( array $values )
+	public function addAddressItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setParentId( $context->getUserId() );
-		$manager->saveItem( $item );
+		$item->fromArray($values);
+		$item->setParentId($context->getUserId());
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -169,14 +169,14 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function createAddressItem( array $values = [] )
+	public function createAddressItem(array $values = [])
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setParentId( $context->getUserId() );
+		$item->fromArray($values);
+		$item->setParentId($context->getUserId());
 
 		return $item;
 	}
@@ -188,13 +188,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -206,15 +206,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function editAddressItem( $id, array $values )
+	public function editAddressItem($id, array $values)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		$item->fromArray( $values );
-		$manager->saveItem( $item );
+		$item->fromArray($values);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -227,12 +227,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function getAddressItem( $id )
+	public function getAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
-		$item = $manager->getItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
+		$item = $manager->getItem($id);
 
-		$this->checkUser( $item->getParentId() );
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -243,9 +243,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
 	{
-		\Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
+		\Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -255,12 +255,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
 	 */
-	protected function checkUser( $id )
+	protected function checkUser($id)
 	{
-		if( $id !== $this->getContext()->getUserId() )
+		if ($id !== $this->getContext()->getUserId())
 		{
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
 		}
 	}
 }

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 +47 added lines, -47 removed lines

@@ -20,137 +20,137 @@
 	{
 		$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 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 testGetProvideres()
 	{
-		$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 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 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/tests/Controller/Frontend/Service/StandardTest.php

Spacing +50 added lines, -50 removed lines

@@ -16,59 +16,59 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Service\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Service\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	public static function setUpBeforeClass()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$orderBaseMgr = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$orderBaseMgr = $orderManager->getSubManager('base');
 		self::$basket = $orderBaseMgr->createItem();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$attributes = $this->object->checkAttributes( $this->getServiceItem()->getId(), [] );
-		$this->assertEquals( [], $attributes );
+		$attributes = $this->object->checkAttributes($this->getServiceItem()->getId(), []);
+		$this->assertEquals([], $attributes);
 	}
 
 
 	public function testGetProviders()
 	{
-		$providers = $this->object->getProviders( 'delivery' );
-		$this->assertGreaterThan( 0, count( $providers ) );
+		$providers = $this->object->getProviders('delivery');
+		$this->assertGreaterThan(0, count($providers));
 
-		foreach( $providers as $provider ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		foreach ($providers as $provider) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 		}
 	}
 
 
 	public function testGetProvider()
 	{
-		$provider = $this->object->getProvider( $this->getServiceItem()->getId() );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		$provider = $this->object->getProvider($this->getServiceItem()->getId());
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 	}
 
 
 	public function testGetServices()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$services = $this->object->getServices( 'delivery', $basket );
-		$this->assertGreaterThan( 0, count( $services ) );
+		$services = $this->object->getServices('delivery', $basket);
+		$this->assertGreaterThan(0, count($services));
 
-		foreach( $services as $service ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Item\\Iface', $service );
+		foreach ($services as $service) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Item\\Iface', $service);
 		}
 	}
 
@@ -76,83 +76,83 @@ 
 	public function testGetServiceAttributes()
 	{
 		$service = $this->getServiceItem();
-		$attributes = $this->object->getServiceAttributes( 'delivery', $service->getId(), self::$basket );
+		$attributes = $this->object->getServiceAttributes('delivery', $service->getId(), self::$basket);
 
-		$this->assertEquals( 0, count( $attributes ) );
+		$this->assertEquals(0, count($attributes));
 	}
 
 
 	public function testGetServiceAttributesCache()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$services = $this->object->getServices( 'delivery', $basket );
+		$services = $this->object->getServices('delivery', $basket);
 
-		if( ( $service = reset( $services ) ) === false ) {
-			throw new \RuntimeException( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \RuntimeException('No service item found');
 		}
 
-		$attributes = $this->object->getServiceAttributes( 'delivery', $service->getId(), self::$basket );
+		$attributes = $this->object->getServiceAttributes('delivery', $service->getId(), self::$basket);
 
-		$this->assertEquals( 0, count( $attributes ) );
+		$this->assertEquals(0, count($attributes));
 	}
 
 
 	public function testGetServiceAttributesNoItems()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getServiceAttributes( 'invalid', -1, self::$basket );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getServiceAttributes('invalid', -1, self::$basket);
 	}
 
 
 	public function testGetServicePrice()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
 		$service = $this->getServiceItem();
-		$price = $this->object->getServicePrice( 'delivery', $service->getId(), $basket );
+		$price = $this->object->getServicePrice('delivery', $service->getId(), $basket);
 
-		$this->assertEquals( '12.95', $price->getValue() );
-		$this->assertEquals( '1.99', $price->getCosts() );
+		$this->assertEquals('12.95', $price->getValue());
+		$this->assertEquals('1.99', $price->getCosts());
 	}
 
 
 	public function testGetServicePriceCache()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$services = $this->object->getServices( 'delivery', $basket );
+		$services = $this->object->getServices('delivery', $basket);
 
-		if( ( $service = reset( $services ) ) === false ) {
-			throw new \RuntimeException( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \RuntimeException('No service item found');
 		}
 
-		$price = $this->object->getServicePrice( 'delivery', $service->getId(), $basket );
+		$price = $this->object->getServicePrice('delivery', $service->getId(), $basket);
 
-		$this->assertEquals( '12.95', $price->getValue() );
-		$this->assertEquals( '1.99', $price->getCosts() );
+		$this->assertEquals('12.95', $price->getValue());
+		$this->assertEquals('1.99', $price->getCosts());
 	}
 
 
 	public function testGetServicePriceNoItems()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getServicePrice( 'invalid', -1, $basket );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getServicePrice('invalid', -1, $basket);
 	}
 
 
 	public function testCheckServiceAttributes()
 	{
 		$service = $this->getServiceItem();
-		$attributes = $this->object->checkServiceAttributes( 'delivery', $service->getId(), array() );
+		$attributes = $this->object->checkServiceAttributes('delivery', $service->getId(), array());
 
-		$this->assertEquals( array(), $attributes );
+		$this->assertEquals(array(), $attributes);
 	}
 
 
@@ -161,7 +161,7 @@ 
 	 */
 	protected function getServiceItem()
 	{
-		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		return $manager->findItem( 'unitcode', [], 'service', 'delivery' );
+		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		return $manager->findItem('unitcode', [], 'service', 'delivery');
 	}
 }