aimeos / ai-controller-frontend

controller/frontend/tests/bootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -11,22 +11,22 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', '1' );
+ini_set('display_errors', '1');
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /**
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_TIME, 'POSIX');
 
 /*
  * Set include path for tests
  */
-define( 'PATH_TESTS', __DIR__ );
+define('PATH_TESTS', __DIR__);
 
 require_once 'TestHelperFrontend.php';
 \TestHelperFrontend::bootstrap();

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

Spacing +46 added lines, -46 removed lines

@@ -35,43 +35,43 @@ 
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
 	 * @throws \Exception If an error occurs
 	 */
-	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'))
 	{
-		if( isset( $this->items[$type] ) ) {
+		if (isset($this->items[$type])) {
 			return $this->items[$type];
 		}
 
-		$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')));
 
-		$this->items[$type] = $serviceManager->searchItems( $search, $ref );
+		$this->items[$type] = $serviceManager->searchItems($search, $ref);
 
 
-		foreach( $this->items[$type] as $id => $service )
+		foreach ($this->items[$type] 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( $this->items[$type][$id] );
+					unset($this->items[$type][$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);
 			}
 		}
 
@@ -91,16 +91,16 @@ 
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
 	 * @throws \Exception If an error occurs
 	 */
-	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);
 		}
 
-		$item = $this->getServiceItem( $type, $serviceId );
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$item = $this->getServiceItem($type, $serviceId);
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		return $serviceManager->getProvider( $item )->getConfigFE( $basket );
+		return $serviceManager->getProvider($item)->getConfigFE($basket);
 	}
 
 
@@ -115,16 +115,16 @@ 
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
 	 * @throws \Exception If an error occurs
 	 */
-	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);
 		}
 
-		$item = $this->getServiceItem( $type, $serviceId );
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$item = $this->getServiceItem($type, $serviceId);
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		return $serviceManager->getProvider( $item )->calcPrice( $basket );
+		return $serviceManager->getProvider($item)->calcPrice($basket);
 	}
 
 
@@ -139,16 +139,16 @@ 
 	 * 	known by the provider but aren't valid resp. null for attributes whose values are OK
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
 	{
-		if( isset( $this->providers[$type][$serviceId] ) ) {
-			return $this->providers[$type][$serviceId]->checkConfigFE( $attributes );
+		if (isset($this->providers[$type][$serviceId])) {
+			return $this->providers[$type][$serviceId]->checkConfigFE($attributes);
 		}
 
-		$item = $this->getServiceItem( $type, $serviceId );
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$item = $this->getServiceItem($type, $serviceId);
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		return $serviceManager->getProvider( $item )->checkConfigFE( $attributes );
+		return $serviceManager->getProvider($item)->checkConfigFE($attributes);
 	}
 
 
@@ -159,25 +159,25 @@ 
 	 * @param string $serviceId Identifier of the service option chosen by the customer
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
 	 */
-	protected function getServiceItem( $type, $serviceId )
+	protected function getServiceItem($type, $serviceId)
 	{
-		$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.id', $serviceId ),
-			$search->compare( '==', 'service.type.domain', 'service' ),
-			$search->compare( '==', 'service.type.code', $type ),
+			$search->compare('==', 'service.id', $serviceId),
+			$search->compare('==', 'service.type.domain', 'service'),
+			$search->compare('==', 'service.type.code', $type),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$items = $serviceManager->searchItems( $search, array( 'price' ) );
+		$items = $serviceManager->searchItems($search, array('price'));
 
-		if( ( $item = reset( $items ) ) === false )
+		if (($item = reset($items)) === false)
 		{
-			$msg = sprintf( 'Service item for type "%1$s" and ID "%2$s" not found', $type, $serviceId );
-			throw new \Aimeos\Controller\Frontend\Service\Exception( $msg );
+			$msg = sprintf('Service item for type "%1$s" and ID "%2$s" not found', $type, $serviceId);
+			throw new \Aimeos\Controller\Frontend\Service\Exception($msg);
 		}
 
 		return $item;

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 				} else {
 					unset( $this->items[$type][$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/Service/Iface.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
 	 */
-	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'));
 
 	/**
 	 * Returns the list of attribute definitions which must be used to render the input form where the customer can
@@ -41,7 +41,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket);
 
 	/**
 	 * Returns the price of the service.
@@ -54,7 +54,7 @@ 
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
 	 * @throws \Exception If an error occurs
 	 */
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket);
 
 	/**
 	 * Returns a list of attributes that are invalid.
@@ -66,5 +66,5 @@ 
 	 * @return array List of key/value pairs of attributes keys and an error message for values that are invalid or
 	 * 	missing
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes );
+	public function checkServiceAttributes($type, $serviceId, array $attributes);
 }

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** controller/frontend/service/name
 		 * Class name of the used service frontend controller implementation
@@ -64,19 +64,19 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/service/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/service/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false ) {
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Service\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+		if (ctype_alnum($name) === false) {
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Service\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Service\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Service\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/service/decorators/excludes
 		 * Excludes decorators added by the "common" option from the service frontend controllers
@@ -152,6 +152,6 @@ 
 		 * @see controller/frontend/service/decorators/excludes
 		 * @see controller/frontend/service/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'service' );
+		return self::addControllerDecorators($context, $manager, 'service');
 	}
 }

controller/frontend/src/Controller/Frontend/Factory.php

Spacing +19 added lines, -19 removed lines

@@ -30,11 +30,11 @@ 
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
 	 * @param string $path Path describing the controller to clear, e.g. "basket"
 	 */
-	static public function clear( $id = null, $path = null )
+	static public function clear($id = null, $path = null)
 	{
-		if( $id !== null )
+		if ($id !== null)
 		{
-			if( $path !== null ) {
+			if ($path !== null) {
 				self::$controllers[$id][$path] = null;
 			} else {
 				self::$controllers[$id] = array();
@@ -61,37 +61,37 @@ 
 	 * @param string $path Name of the domain (and sub-managers) separated by slashes, e.g "basket"
 	 * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found
 	 */
-	static public function createController( \Aimeos\MShop\Context\Item\Iface $context, $path )
+	static public function createController(\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		if( empty( $path ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
+		if (empty($path)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty'));
 		}
 
 		$id = (string) $context;
 
-		if( self::$cache === false || !isset( self::$controllers[$id][$path] ) )
+		if (self::$cache === false || !isset(self::$controllers[$id][$path]))
 		{
-			$parts = explode( '/', $path );
+			$parts = explode('/', $path);
 
-			foreach( $parts as $key => $part )
+			foreach ($parts as $key => $part)
 			{
-				if( ctype_alnum( $part ) === false ) {
-					throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s" in "%2$s"', $part, $path ) );
+				if (ctype_alnum($part) === false) {
+					throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s" in "%2$s"', $part, $path));
 				}
 
-				$parts[$key] = ucwords( $part );
+				$parts[$key] = ucwords($part);
 			}
 
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . join( '\\', $parts ) . '\\Factory';
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . join('\\', $parts) . '\\Factory';
 
-			if( class_exists( $factory ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+			if (class_exists($factory) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory));
 			}
 
-			$manager = call_user_func_array( array( $factory, 'createController' ), array( $context ) );
+			$manager = call_user_func_array(array($factory, 'createController'), array($context));
 
-			if( $manager === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+			if ($manager === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory));
 			}
 
 			self::$controllers[$id][$path] = $manager;
@@ -107,7 +107,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function setCache( $value )
+	static public function setCache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;

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

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
 	 * @return void
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context);
 
 }

controller/frontend/src/Controller/Frontend/Common/Factory/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
 	 * @param string|null $name Name of the controller implementation (Default if null)
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null );
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null);
 }

controller/frontend/src/Controller/Frontend/Common/Factory/Base.php

Spacing +35 added lines, -35 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Controller\Frontend\Iface|null $controller Frontend controller object
 	 */
-	public static function injectController( $classname, \Aimeos\Controller\Frontend\Iface $controller = null )
+	public static function injectController($classname, \Aimeos\Controller\Frontend\Iface $controller = null)
 	{
 		self::$objects[$classname] = $controller;
 	}
@@ -46,29 +46,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Controller\Frontend\Basket\Decorator\"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix )
+	protected static function addDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 			}
 
-			$controller = new $classname( $controller, $context );
+			$controller = new $classname($controller, $context);
 
-			if( !( $controller instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($controller instanceof $iface)) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -84,14 +84,14 @@ 
 	 * @param string $domain Domain name in lower case, e.g. "product"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addControllerDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, $domain )
+	protected static function addControllerDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, $domain)
 	{
-		if( !is_string( $domain ) || $domain === '' ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid domain "%1$s"', $domain ) );
+		if (!is_string($domain) || $domain === '') {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid domain "%1$s"', $domain));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $domain ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $domain)));
 		$config = $context->getConfig();
 
 		/** controller/frontend/common/decorators/default
@@ -116,26 +116,26 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'controller/frontend/common/decorators/default', array() );
-		$excludes = $config->get( 'controller/frontend/' . $domain . '/decorators/excludes', array() );
+		$decorators = $config->get('controller/frontend/common/decorators/default', array());
+		$excludes = $config->get('controller/frontend/' . $domain . '/decorators/excludes', array());
 
-		foreach( $decorators as $key => $name )
+		foreach ($decorators as $key => $name)
 		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
+			if (in_array($name, $excludes)) {
+				unset($decorators[$key]);
 			}
 		}
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/global', array() );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/global', array());
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
-		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $localClass ) . '\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/local', array() );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($localClass) . '\\Decorator\\';
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/local', array());
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		return $controller;
 	}
@@ -149,20 +149,20 @@ 
 	 * @param string $interface Name of the controller interface
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function createControllerBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface )
+	protected static function createControllerBase(\Aimeos\MShop\Context\Item\Iface $context, $classname, $interface)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$controller = new $classname( $context );
+		$controller = new $classname($context);
 
-		if( !( $controller instanceof $interface ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (!($controller instanceof $interface)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
 		return $controller;

controller/frontend/src/Controller/Frontend/Common/Decorator/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 * @return void
 	 */
-	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);
 }