aimeos / ai-controller-frontend

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

Spacing +24 added lines, -24 removed lines

@@ -30,13 +30,13 @@ 
 	 * @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)
 	{
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Frontend\\Product\\Iface', $controller );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Frontend\\Product\\Iface', $controller);
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -48,9 +48,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);
 	}
 
 
@@ -64,9 +64,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
 	{
-		return $this->controller->addFilterAttribute( $filter, $attrIds, $optIds, $oneIds );
+		return $this->controller->addFilterAttribute($filter, $attrIds, $optIds, $oneIds);
 	}
 
 
@@ -80,10 +80,10 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default',
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default',
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 	{
-		return $this->controller->addFilterCategory( $filter, $catIds, $listtype, $level );
+		return $this->controller->addFilterCategory($filter, $catIds, $listtype, $level);
 	}
 
 
@@ -96,9 +96,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2018.07
 	 */
-	public function addFilterSupplier( \Aimeos\MW\Criteria\Iface $filter, $supIds, $listtype = 'default' )
+	public function addFilterSupplier(\Aimeos\MW\Criteria\Iface $filter, $supIds, $listtype = 'default')
 	{
-		return $this->controller->addFilterSupplier( $filter, $supIds, $listtype );
+		return $this->controller->addFilterSupplier($filter, $supIds, $listtype);
 	}
 
 
@@ -110,9 +110,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input)
 	{
-		return $this->controller->addFilterText( $filter, $input );
+		return $this->controller->addFilterText($filter, $input);
 	}
 
 
@@ -124,9 +124,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2015.08
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return $this->controller->aggregate( $filter, $key );
+		return $this->controller->aggregate($filter, $key);
 	}
 
 
@@ -140,9 +140,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100 )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100)
 	{
-		return $this->controller->createFilter( $sort, $direction, $start, $size );
+		return $this->controller->createFilter($sort, $direction, $start, $size);
 	}
 
 
@@ -154,9 +154,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
 	{
-		return $this->controller->getItem( $productId, $domains );
+		return $this->controller->getItem($productId, $domains);
 	}
 
 
@@ -168,9 +168,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
 	 * @since 2017.03
 	 */
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
 	{
-		return $this->controller->getItems( $productIds, $domains );
+		return $this->controller->getItems($productIds, $domains);
 	}
 
 
@@ -183,9 +183,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2015.08
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return $this->controller->searchItems( $filter, $domains, $total );
+		return $this->controller->searchItems($filter, $domains, $total);
 	}
 
 

controller/frontend/tests/Controller/FrontendTest.php

Spacing +33 added lines, -33 removed lines

@@ -13,94 +13,94 @@
 {
 	public function testCreateController()
 	{
-		$controller = \Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'basket' );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
 	}
 
 
 	public function testCreateControllerEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), '' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), '');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 
 	public function testCreateSubControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'basket/notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'basket/notexist');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Controller\Frontend::cache( true );
+		$cache = \Aimeos\Controller\Frontend::cache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$controller1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
+		$controller1 = \Aimeos\Controller\Frontend::create($context, 'basket');
 		\Aimeos\Controller\Frontend::clear();
-		$controller2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
+		$controller2 = \Aimeos\Controller\Frontend::create($context, 'basket');
 
-		\Aimeos\Controller\Frontend::cache( $cache );
+		\Aimeos\Controller\Frontend::cache($cache);
 
-		$this->assertNotSame( $controller1, $controller2 );
+		$this->assertNotSame($controller1, $controller2);
 	}
 
 
 	public function testClearSite()
 	{
-		$cache = \Aimeos\Controller\Frontend::cache( true );
+		$cache = \Aimeos\Controller\Frontend::cache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
+		$basket1 = \Aimeos\Controller\Frontend::create($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend::create($context, 'catalog');
 
-		\Aimeos\Controller\Frontend::clear( (string) $context );
+		\Aimeos\Controller\Frontend::clear((string) $context);
 
-		$basket2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend::create($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend::create($context, 'catalog');
 
-		\Aimeos\Controller\Frontend::cache( $cache );
+		\Aimeos\Controller\Frontend::cache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertNotSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertNotSame($catalog1, $catalog2);
 	}
 
 
 	public function testClearSpecific()
 	{
-		$cache = \Aimeos\Controller\Frontend::cache( true );
+		$cache = \Aimeos\Controller\Frontend::cache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
+		$basket1 = \Aimeos\Controller\Frontend::create($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend::create($context, 'catalog');
 
-		\Aimeos\Controller\Frontend::clear( (string) $context, 'basket' );
+		\Aimeos\Controller\Frontend::clear((string) $context, 'basket');
 
-		$basket2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend::create($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend::create($context, 'catalog');
 
-		\Aimeos\Controller\Frontend::cache( $cache );
+		\Aimeos\Controller\Frontend::cache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertSame($catalog1, $catalog2);
 	}
 
 }
\ No newline at end of file

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

Spacing +28 added lines, -28 removed lines

@@ -27,13 +27,13 @@ 
 	 * @param string $id Unique subscription ID
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Canceled subscription item
 	 */
-	public function cancel( $id )
+	public function cancel($id)
 	{
-		$item = $this->getItem( $id );
-		$item->setDateEnd( $item->getDateNext() );
-		$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_CANCEL );
+		$item = $this->getItem($id);
+		$item->setDateEnd($item->getDateNext());
+		$item->setReason(\Aimeos\MShop\Subscription\Item\Iface::REASON_CANCEL);
 
-		return $this->saveItem( $item );
+		return $this->saveItem($item);
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop::create( $this->getContext(), 'subscription' )->createSearch();
+		return \Aimeos\MShop::create($this->getContext(), 'subscription')->createSearch();
 	}
 
 
@@ -54,25 +54,25 @@ 
 	 * @param string $id Unique subscription ID
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription object
 	 */
-	public function getItem( $id )
+	public function getItem($id)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'subscription' );
+		$manager = \Aimeos\MShop::create($context, 'subscription');
 
 		$filter = $manager->createSearch();
 		$expr = [
-			$filter->compare( '==', 'subscription.id', $id ),
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'subscription.id', $id),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 			$filter->getConditions(),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		$items = $this->searchItems( $filter );
+		$items = $this->searchItems($filter);
 
-		if( ( $item = reset( $items ) ) === false )
+		if (($item = reset($items)) === false)
 		{
 			$msg = 'Invalid subscription ID "%1$s" for customer ID "%2$s"';
-			throw new \Aimeos\Controller\Frontend\Subscription\Exception( sprintf( $msg, $id, $context->getUserId() ) );
+			throw new \Aimeos\Controller\Frontend\Subscription\Exception(sprintf($msg, $id, $context->getUserId()));
 		}
 
 		return $item;
@@ -87,18 +87,18 @@ 
 	public function getIntervals()
 	{
 		$intervals = [];
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'attribute');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
 			$search->getConditions(),
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.type', 'interval' ),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.type', 'interval'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search, ['text'] ) as $attrItem ) {
+		foreach ($manager->searchItems($search, ['text']) as $attrItem) {
 			$intervals[$attrItem->getCode()] = $attrItem;
 		}
 
@@ -111,9 +111,9 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription object
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Saved subscription item
 	 */
-	public function saveItem( \Aimeos\MShop\Subscription\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Subscription\Item\Iface $item)
 	{
-		return \Aimeos\MShop::create( $this->getContext(), 'subscription' )->saveItem( $item );
+		return \Aimeos\MShop::create($this->getContext(), 'subscription')->saveItem($item);
 	}
 
 
@@ -124,17 +124,17 @@ 
 	 * @param integer &$total|null Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Associative list of IDs as keys and subscription 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::create( $context, 'subscription' );
+		$manager = \Aimeos\MShop::create($context, 'subscription');
 
 		$expr = [
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 			$filter->getConditions(),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 }

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

Spacing +39 added lines, -39 removed lines

@@ -35,14 +35,14 @@ 
 	 * @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::create( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
 
-		$item = $manager->getItem( $serviceId, [], true );
-		$provider = $manager->getProvider( $item, $item->getType() );
+		$item = $manager->getItem($serviceId, [], true);
+		$provider = $manager->getProvider($item, $item->getType());
 
-		return array_filter( $provider->checkConfigFE( $attributes ) );
+		return array_filter($provider->checkConfigFE($attributes));
 	}
 
 
@@ -53,12 +53,12 @@ 
 	 * @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::create( $this->getContext(), 'service' );
-		$item = $manager->getItem( $serviceId, $ref, true );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->getItem($serviceId, $ref, true);
 
-		return $manager->getProvider( $item, $item->getType() );
+		return $manager->getProvider($item, $item->getType());
 	}
 
 
@@ -69,25 +69,25 @@ 
 	 * @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::create( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
 
-		$search = $manager->createSearch( true );
-		$search->setSortations( [$search->sort( '+', 'service.position' )] );
+		$search = $manager->createSearch(true);
+		$search->setSortations([$search->sort('+', 'service.position')]);
 
-		if( $type != null )
+		if ($type != null)
 		{
 			$expr = array(
 				$search->getConditions(),
-				$search->compare( '==', 'service.type', $type ),
+				$search->compare('==', 'service.type', $type),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 		}
 
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
-			$list[$id] = $manager->getProvider( $item, $item->getType() );
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
+			$list[$id] = $manager->getProvider($item, $item->getType());
 		}
 
 		return $list;
@@ -105,15 +105,15 @@ 
 	 * @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::create( $this->getContext(), 'service' );
-		$item = $manager->getItem( $serviceId, [], true );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->getItem($serviceId, [], true);
 
-		$provider = $manager->getProvider( $item, $item->getType() );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($item, $item->getType());
+		$provider->injectGlobalConfigBE($urls);
 
-		return $provider->process( $orderItem, $params );
+		return $provider->process($orderItem, $params);
 	}
 
 
@@ -125,14 +125,14 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code )
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
-		$item = $manager->findItem( $code );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->findItem($code);
 
-		$provider = $manager->getProvider( $item, $item->getType() );
+		$provider = $manager->getProvider($item, $item->getType());
 
-		return $provider->updatePush( $request, $response );
+		return $provider->updatePush($request, $response);
 	}
 
 
@@ -144,24 +144,24 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid )
+	public function updateSync(ServerRequestInterface $request, $code, $orderid)
 	{
 		$context = $this->getContext();
-		$orderManager = \Aimeos\MShop::create( $context, 'order' );
-		$serviceManager = \Aimeos\MShop::create( $context, 'service' );
+		$orderManager = \Aimeos\MShop::create($context, 'order');
+		$serviceManager = \Aimeos\MShop::create($context, 'service');
 
-		$orderItem = $orderManager->getItem( $orderid );
-		$serviceItem = $serviceManager->findItem( $code );
+		$orderItem = $orderManager->getItem($orderid);
+		$serviceItem = $serviceManager->findItem($code);
 
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
 
-		if( ( $orderItem = $provider->updateSync( $request, $orderItem ) ) !== null )
+		if (($orderItem = $provider->updateSync($request, $orderItem)) !== 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);
 			}
 		}
 

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

Spacing +119 added lines, -119 removed lines

@@ -28,29 +28,29 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values )
+	public function addItem(array $values)
 	{
 		$list = [];
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		foreach( $values as $key => $val ) {
-			$list[str_replace( 'order.base.address', 'customer', $key )] = $val;
+		foreach ($values as $key => $val) {
+			$list[str_replace('order.base.address', 'customer', $key)] = $val;
 		}
 
-		$manager = \Aimeos\MShop::create( $context, 'customer' );
-		$list = $this->addItemDefaults( $list );
+		$manager = \Aimeos\MShop::create($context, 'customer');
+		$list = $this->addItemDefaults($list);
 		$passwd = $list['customer.password'];
 
 		try
 		{
-			$item = $manager->findItem( $list['customer.code'], [], true );
+			$item = $manager->findItem($list['customer.code'], [], true);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$this->checkLimit( $list );
+			$this->checkLimit($list);
 
-			$item = $manager->createItem()->fromArray( $list )->setId( null );
+			$item = $manager->createItem()->fromArray($list)->setId(null);
 
 			/** controller/frontend/customer/groupids
 			 * List of groups new customers should be assigned to
@@ -64,14 +64,14 @@ 
 			 * @category User
 			 * @category Developer
 			 */
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', [] ) );
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', []));
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
 			$msg = $item->toArray();
 			// Show only generated passwords in account creation e-mails
-			$msg['customer.password'] = ( isset( $values['customer.password'] ) ? null : $passwd );
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
+			$msg['customer.password'] = (isset($values['customer.password']) ? null : $passwd);
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
 		}
 
 		return $item;
@@ -83,10 +83,10 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer' );
-		return $manager->createItem()->fromArray( $values )->setId( null );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer');
+		return $manager->createItem()->fromArray($values)->setId(null);
 	}
 
 
@@ -96,12 +96,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::create( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -113,15 +113,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 );
-		unset( $values['customer.id'] );
+		$this->checkUser($id);
+		unset($values['customer.id']);
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer' );
-		$item = $manager->getItem( $id, ['customer/group'], true )->fromArray( $values );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer');
+		$item = $manager->getItem($id, ['customer/group'], true)->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -133,17 +133,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::create( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop::create($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);
 	}
 
 
@@ -157,9 +157,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::create( $this->getContext(), 'customer' )->findItem( $code, $domains, true );
+		return \Aimeos\MShop::create($this->getContext(), 'customer')->findItem($code, $domains, true);
 	}
 
 
@@ -169,9 +169,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
 	{
-		return \Aimeos\MShop::create( $this->getContext(), 'customer' )->saveItem( $item );
+		return \Aimeos\MShop::create($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -182,13 +182,13 @@ 
 	 * @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::create( $context, 'customer/address' );
+		$manager = \Aimeos\MShop::create($context, 'customer/address');
 
-		$item = $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
+		return $manager->saveItem($item);
 	}
 
 
@@ -197,12 +197,12 @@ 
 	 *
 	 * @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::create( $context, 'customer/address' );
+		$manager = \Aimeos\MShop::create($context, 'customer/address');
 
-		return $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
+		return $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
 	}
 
 
@@ -212,13 +212,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/address');
 
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -230,15 +230,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)
 	{
-		unset( $values['customer.address.id'] );
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/address' );
+		unset($values['customer.address.id']);
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		return $manager->saveItem( $item->fromArray( $values ) );
+		return $manager->saveItem($item->fromArray($values));
 	}
 
 
@@ -249,12 +249,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::create( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id);
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -266,9 +266,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
 	{
-		return \Aimeos\MShop::create( $this->getContext(), 'customer/address' )->saveItem( $item );
+		return \Aimeos\MShop::create($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -279,28 +279,28 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function addListItem( array $values )
+	public function addListItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
-		if( !isset( $values['customer.lists.typeid'] ) )
+		if (!isset($values['customer.lists.typeid']))
 		{
-			if( !isset( $values['customer.lists.type'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
+			if (!isset($values['customer.lists.type'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
 			}
 
-			if( !isset( $values['customer.lists.domain'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
+			if (!isset($values['customer.lists.domain'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
 			}
 
-			$typeManager = \Aimeos\MShop::create( $context, 'customer/lists/type' );
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
+			$typeManager = \Aimeos\MShop::create($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
-		$item = $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
+		return $manager->saveItem($item);
 	}
 
 
@@ -313,10 +313,10 @@ 
 	public function createListsFilter()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
 		$filter = $manager->createSearch();
-		$filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) );
+		$filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId()));
 
 		return $filter;
 	}
@@ -328,13 +328,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.06
 	 */
-	public function deleteListItem( $id )
+	public function deleteListItem($id)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
 
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
+		$this->checkUser($manager->getItem($id)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -346,31 +346,31 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function editListItem( $id, array $values )
+	public function editListItem($id, array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
-		unset( $values['customer.lists.id'] );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
+		unset($values['customer.lists.id']);
 
-		if( !isset( $values['customer.lists.typeid'] ) )
+		if (!isset($values['customer.lists.typeid']))
 		{
-			if( !isset( $values['customer.lists.type'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
+			if (!isset($values['customer.lists.type'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
 			}
 
-			if( !isset( $values['customer.lists.domain'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
+			if (!isset($values['customer.lists.domain'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
 			}
 
-			$typeManager = \Aimeos\MShop::create( $context, 'customer/lists/type' );
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'], true );
+			$typeManager = \Aimeos\MShop::create($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain'], true);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
-		return $manager->saveItem( $item->fromArray( $values ) );
+		return $manager->saveItem($item->fromArray($values));
 	}
 
 
@@ -381,12 +381,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.06
 	 */
-	public function getListItem( $id )
+	public function getListItem($id)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists' );
-		$item = $manager->getItem( $id );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
+		$item = $manager->getItem($id);
 
-		$this->checkUser( $item->getParentId() );
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -400,11 +400,11 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
 	 * @since 2017.06
 	 */
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -414,33 +414,33 @@ 
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
 	 * @return string[] Associative list of customer key/value pairs with default values set
 	 */
-	protected function addItemDefaults( array $values )
+	protected function addItemDefaults(array $values)
 	{
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
 		{
 			$label = '';
 
-			if( isset( $values['customer.lastname'] ) ) {
+			if (isset($values['customer.lastname'])) {
 				$label = $values['customer.lastname'];
 			}
 
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
 				$label = $values['customer.firstname'] . ' ' . $label;
 			}
 
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
 				$label .= ' (' . $values['customer.company'] . ')';
 			}
 
 			$values['customer.label'] = $label;
 		}
 
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
 			$values['customer.code'] = $values['customer.email'];
 		}
 
-		if( !isset( $values['customer.password'] ) ) {
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
+		if (!isset($values['customer.password'])) {
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
 		}
 
 		return $values;
@@ -453,7 +453,7 @@ 
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
 	 */
-	protected function checkLimit( array $values )
+	protected function checkLimit(array $values)
 	{
 		$total = 0;
 		$context = $this->getContext();
@@ -474,7 +474,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/customer/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/customer/limit-count', 5 );
+		$count = $config->get('controller/frontend/customer/limit-count', 5);
 
 		/** controller/frontend/customer/limit-seconds
 		 * Customer account limitation time frame in seconds
@@ -492,22 +492,22 @@ 
 		 * @category Developer
 		 * @see controller/frontend/customer/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/customer/limit-seconds', 300);
 
-		$manager = \Aimeos\MShop::create( $context, 'customer' );
+		$manager = \Aimeos\MShop::create($context, 'customer');
 
 		$search = $manager->createSearch();
 		$expr = [
-			$search->compare( '==', 'customer.editor', $context->getEditor() ),
-			$search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'customer.editor', $context->getEditor()),
+			$search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$manager->searchItems( $search, [], $total );
+		$manager->searchItems($search, [], $total);
 
-		if( $total > $count ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) );
+		if ($total > $count) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached'));
 		}
 	}
 
@@ -518,12 +518,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/src/Controller/Frontend/Locale/Standard.php

Spacing +8 added lines, -8 removed lines

@@ -31,15 +31,15 @@ 
 	public function createFilter()
 	{
 		$context = $this->getContext();
-		$filter = \Aimeos\MShop::create( $context, 'locale' )->createSearch( true );
+		$filter = \Aimeos\MShop::create($context, 'locale')->createSearch(true);
 
 		$expr = array(
-			$filter->compare( '==', 'locale.siteid', $context->getLocale()->getSitePath() ),
+			$filter->compare('==', 'locale.siteid', $context->getLocale()->getSitePath()),
 			$filter->getConditions(),
 		);
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
-		$filter->setSortations( array( $filter->sort( '+', 'locale.position' ) ) );
+		$filter->setConditions($filter->combine('&&', $expr));
+		$filter->setSortations(array($filter->sort('+', 'locale.position')));
 
 		return $filter;
 	}
@@ -53,9 +53,9 @@ 
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = [] )
+	public function getItem($id, array $domains = [])
 	{
-		return \Aimeos\MShop::create( $this->getContext(), 'locale' )->getItem( $id, $domains, true );
+		return \Aimeos\MShop::create($this->getContext(), 'locale')->getItem($id, $domains, true);
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null)
 	{
-		return \Aimeos\MShop::create( $this->getContext(), 'locale' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop::create($this->getContext(), 'locale')->searchItems($filter, $domains, $total);
 	}
 }

controller/frontend/src/Controller/Frontend/Basket/Decorator/Category.php

Spacing +12 added lines, -12 removed lines

@@ -36,27 +36,27 @@
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$context = $this->getContext();
-		$catalogListManager = \Aimeos\MShop::create( $context, 'catalog/lists' );
+		$catalogListManager = \Aimeos\MShop::create($context, 'catalog/lists');
 
-		$search = $catalogListManager->createSearch( true );
+		$search = $catalogListManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $catalogListManager->searchItems( $search );
+		$result = $catalogListManager->searchItems($search);
 
-		if( reset( $result ) === false )
+		if (reset($result) === false)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Adding product with ID "%1$s" is not allowed' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $prodid ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Adding product with ID "%1$s" is not allowed');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $prodid));
 		}
 
 		$this->getController()->addProduct(

controller/frontend/src/Controller/Frontend/Basket/Decorator/Bundle.php

Spacing +35 added lines, -35 removed lines

@@ -36,13 +36,13 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
+		$productManager = \Aimeos\MShop::create($context, 'product');
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'bundle' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'bundle')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,29 +51,29 @@ 
 		}
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
 
-		$orderBaseProductItem = \Aimeos\MShop::create( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop::create($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -86,43 +86,43 @@ 
 	 * @param array $variantAttributeIds List of product variant attribute IDs
 	 * @param string $stocktype
 	 */
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype )
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype)
 	{
 		$quantity = $orderBaseProductItem->getQuantity();
 		$products = $subProductIds = $orderProducts = [];
-		$orderProductManager = \Aimeos\MShop::create( $this->getContext(), 'order/base/product' );
+		$orderProductManager = \Aimeos\MShop::create($this->getContext(), 'order/base/product');
 
-		foreach( $productItem->getRefItems( 'product', null, 'default' ) as $item ) {
+		foreach ($productItem->getRefItems('product', null, 'default') as $item) {
 			$subProductIds[] = $item->getId();
 		}
 
-		if( count( $subProductIds ) > 0 )
+		if (count($subProductIds) > 0)
 		{
-			$productManager = \Aimeos\MShop::create( $this->getContext(), 'product' );
+			$productManager = \Aimeos\MShop::create($this->getContext(), 'product');
 
-			$search = $productManager->createSearch( true );
+			$search = $productManager->createSearch(true);
 			$expr = array(
-				$search->compare( '==', 'product.id', $subProductIds ),
+				$search->compare('==', 'product.id', $subProductIds),
 				$search->getConditions(),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 
-			$products = $productManager->searchItems( $search, array( 'attribute', 'media', 'price', 'text' ) );
+			$products = $productManager->searchItems($search, array('attribute', 'media', 'price', 'text'));
 		}
 
-		foreach( $products as $product )
+		foreach ($products as $product)
 		{
-			$prices = $product->getRefItems( 'price', 'default', 'default' );
+			$prices = $product->getRefItems('price', 'default', 'default');
 
 			$orderProduct = $orderProductManager->createItem();
-			$orderProduct->copyFrom( $product );
-			$orderProduct->setStockType( $stocktype );
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
+			$orderProduct->copyFrom($product);
+			$orderProduct->setStockType($stocktype);
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
 
 			$orderProducts[] = $orderProduct;
 		}
 
-		$orderBaseProductItem->setProducts( $orderProducts );
+		$orderBaseProductItem->setProducts($orderProducts);
 	}
 }

controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php

Spacing +43 added lines, -43 removed lines

@@ -36,14 +36,14 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, [], true );
+		$productManager = \Aimeos\MShop::create($context, 'product');
+		$productItem = $productManager->getItem($prodid, [], true);
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,30 +51,30 @@ 
 			);
 		}
 
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
 
-		$orderBaseProductItem = \Aimeos\MShop::create( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop::create($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds );
-		$hidden += $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds);
+		$hidden += $productItem->getRefItems('attribute', null, 'hidden');
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $attr, $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($attr, $custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -89,12 +89,12 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
 	 */
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds )
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds)
 	{
 		$attr = [];
 		$context = $this->getContext();
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
 
 		/** controller/frontend/basket/require-variant
 		 * A variant of a selection product must be chosen
@@ -115,47 +115,47 @@ 
 		 * @category Developer
 		 * @category User
 		 */
-		$requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true );
+		$requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true);
 
 
-		if( count( $productItems ) > 1 )
+		if (count($productItems) > 1)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
 		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		else if (($result = reset($productItems)) !== false) // count == 1
 		{
 			$productItem = $result;
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
+			$orderBaseProductItem->setProductCode($productItem->getCode());
 
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
 
-			if( !empty( $subprices ) ) {
+			if (!empty($subprices)) {
 				$prices = $subprices;
 			}
 
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
 
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
+			if (($mediaItem = reset($submedia)) !== false) {
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
 			}
 
-			$orderProductAttrManager = \Aimeos\MShop::create( $this->getContext(), 'order/base/product/attribute' );
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
+			$orderProductAttrManager = \Aimeos\MShop::create($this->getContext(), 'order/base/product/attribute');
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
 
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
 			{
 				$orderAttributeItem = $orderProductAttrManager->createItem();
-				$orderAttributeItem->copyFrom( $attrItem );
-				$orderAttributeItem->setType( 'variant' );
+				$orderAttributeItem->copyFrom($attrItem);
+				$orderAttributeItem->setType('variant');
 
 				$attr[] = $orderAttributeItem;
 			}
 		}
-		else if( $requireVariant != false ) // count == 0
+		else if ($requireVariant != false) // count == 0
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'No article found for selected attributes and product ID "%1$s"');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
 		}
 
 		return $attr;