aimeos / ai-client-html

client/html/src/Client/Html/Basket/Mini/Product/Standard.php

Spacing +9 added lines, -9 removed lines

@@ -72,8 +72,8 @@ 
 		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->productBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/basket/mini/product/standard/template-body';
 		$default = 'basket/mini/product-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -114,11 +114,11 @@ 
 	 */
 	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->productHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/basket/mini/product/standard/template-header';
 		$default = 'basket/mini/product-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -233,7 +233,7 @@ 
 		 * @see client/html/basket/mini/product/decorators/global
 		 */
 
-		return $this->createSubClient( 'basket/mini/product/' . $type, $name );
+		return $this->createSubClient('basket/mini/product/'.$type, $name);
 	}
 
 
@@ -244,6 +244,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

client/html/src/Client/Html/Basket/Mini/Factory.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
 	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null)
 	{
 		/** client/html/basket/mini/name
 		 * Class name of the used basket mini client implementation
@@ -66,22 +66,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/basket/mini/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/basket/mini/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Basket\\Mini\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\Html\\Basket\\Mini\\'.$name : '<not a string>';
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Basket\\Mini\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Basket\\Mini\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'basket/mini' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'basket/mini');
 	}
 
 }
\ No newline at end of file

client/html/src/Client/Html/Basket/Mini/Standard.php

Spacing +42 added lines, -42 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2015.09
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'main', 'product' );
+	private $subPartNames = array('main', 'product');
 
 	private $cache;
 
@@ -91,7 +91,7 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$context = $this->getContext();
 		$site = $context->getLocale()->getSiteId();
@@ -107,42 +107,42 @@ 
 		 * @category Developer
 		 * @see client/html/basket#mini
 		 */
-		$config = $context->getConfig()->get( 'client/html/basket/mini', array() );
-		$key = $this->getParamHash( array(), $uid . $site . ':basket:mini-body', $config );
+		$config = $context->getConfig()->get('client/html/basket/mini', array());
+		$key = $this->getParamHash(array(), $uid.$site.':basket:mini-body', $config);
 
-		if( ( $html = $this->getBasketCached( $key ) ) === null )
+		if (($html = $this->getBasketCached($key)) === null)
 		{
 			try
 			{
-				$view = $this->setViewParams( $view, $tags, $expire );
+				$view = $this->setViewParams($view, $tags, $expire);
 
 				$output = '';
-				foreach( $this->getSubClients() as $subclient ) {
-					$output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+				foreach ($this->getSubClients() as $subclient) {
+					$output .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 				}
 				$view->miniBody = $output;
 			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			catch (\Aimeos\Client\Html\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('client', $e->getMessage()));
+				$view->miniErrorList = $view->get('miniErrorList', array()) + $error;
 			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			catch (\Aimeos\Controller\Frontend\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+				$view->miniErrorList = $view->get('miniErrorList', array()) + $error;
 			}
-			catch( \Aimeos\MShop\Exception $e )
+			catch (\Aimeos\MShop\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+				$view->miniErrorList = $view->get('miniErrorList', array()) + $error;
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+				$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-				$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+				$view->miniErrorList = $view->get('miniErrorList', array()) + $error;
 			}
 
 			/** client/html/basket/mini/standard/template-body
@@ -168,12 +168,12 @@ 
 			$tplconf = 'client/html/basket/mini/standard/template-body';
 			$default = 'basket/mini/body-default.php';
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
-			$this->setBasketCached( $key, $html );
+			$html = $view->render($view->config($tplconf, $default));
+			$this->setBasketCached($key, $html);
 		}
 		else
 		{
-			$html = $this->modifyBody( $html, $uid );
+			$html = $this->modifyBody($html, $uid);
 		}
 
 		return $html;
@@ -188,24 +188,24 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$context = $this->getContext();
 		$site = $context->getLocale()->getSiteId();
 		$view = $this->getView();
 
-		$config = $context->getConfig()->get( 'client/html/basket/mini', array() );
-		$key = $this->getParamHash( array(), $uid . $site . ':basket:mini-header', $config );
+		$config = $context->getConfig()->get('client/html/basket/mini', array());
+		$key = $this->getParamHash(array(), $uid.$site.':basket:mini-header', $config);
 
-		if( ( $html = $this->getBasketCached( $key ) ) === null )
+		if (($html = $this->getBasketCached($key)) === null)
 		{
 			try
 			{
-				$view = $this->setViewParams( $this->getView(), $tags, $expire );
+				$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 				$output = '';
-				foreach( $this->getSubClients() as $subclient ) {
-					$output .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+				foreach ($this->getSubClients() as $subclient) {
+					$output .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 				}
 				$view->miniHeader = $output;
 
@@ -233,17 +233,17 @@ 
 				$tplconf = 'client/html/basket/mini/standard/template-header';
 				$default = 'basket/mini/header-default.php';
 
-				$html = $view->render( $view->config( $tplconf, $default ) );
-				$this->setBasketCached( $key, $html );
+				$html = $view->render($view->config($tplconf, $default));
+				$this->setBasketCached($key, $html);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+				$this->getContext()->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 			}
 		}
 		else
 		{
-			$html = $this->modifyHeader( $html, $uid );
+			$html = $this->modifyHeader($html, $uid);
 		}
 
 		return $html;
@@ -257,7 +257,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/basket/mini/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket mini html client
@@ -333,7 +333,7 @@ 
 		 * @see client/html/basket/mini/decorators/global
 		 */
 
-		return $this->createSubClient( 'basket/mini/' . $type, $name );
+		return $this->createSubClient('basket/mini/'.$type, $name);
 	}
 
 
@@ -344,7 +344,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -356,11 +356,11 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 			$view->miniBasket = $controller->get();
 
 			$this->cache = $view;

client/html/src/Client/Html/Basket/Mini/Main/Standard.php

Spacing +16 added lines, -16 removed lines

@@ -68,13 +68,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->mainBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/basket/mini/main/standard/template-body';
 		$default = 'basket/mini/main-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,13 +113,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->mainHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/basket/mini/main/standard/template-header';
 		$default = 'basket/mini/main-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/basket/mini/main/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket mini main html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/basket/mini/main/decorators/excludes
 		 * @see client/html/basket/mini/main/decorators/global
 		 */
-		return $this->createSubClient( 'basket/mini/main/' . $type, $name );
+		return $this->createSubClient('basket/mini/main/'.$type, $name);
 	}
 
 
@@ -244,7 +244,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -256,14 +256,14 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$view->mainPriceItem = $view->miniBasket->getPrice();
 
 			$count = 0;
-			foreach( $view->miniBasket->getProducts() as $product ) {
+			foreach ($view->miniBasket->getProducts() as $product) {
 				$count += $product->getQuantity();
 			}
 

client/html/src/Client/Html/Base.php

Spacing +141 added lines, -141 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths)
 	{
 		$this->context = $context;
 		$this->templatePaths = $templatePaths;
@@ -49,8 +49,8 @@ 
 	 */
 	public function getView()
 	{
-		if( !isset( $this->view ) ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'No view available' ) );
+		if (!isset($this->view)) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('No view available'));
 		}
 
 		return $this->view;
@@ -64,14 +64,14 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string Modified body content
 	 */
-	public function modifyBody( $content, $uid )
+	public function modifyBody($content, $uid)
 	{
 		$view = $this->getView();
 
-		foreach( $this->getSubClients() as $subclient )
+		foreach ($this->getSubClients() as $subclient)
 		{
-			$subclient->setView( $view );
-			$content = $subclient->modifyBody( $content, $uid );
+			$subclient->setView($view);
+			$content = $subclient->modifyBody($content, $uid);
 		}
 
 		return $content;
@@ -85,14 +85,14 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string Modified header content
 	 */
-	public function modifyHeader( $content, $uid )
+	public function modifyHeader($content, $uid)
 	{
 		$view = $this->getView();
 
-		foreach( $this->getSubClients() as $subclient )
+		foreach ($this->getSubClients() as $subclient)
 		{
-			$subclient->setView( $view );
-			$content = $subclient->modifyHeader( $content, $uid );
+			$subclient->setView($view);
+			$content = $subclient->modifyHeader($content, $uid);
 		}
 
 		return $content;
@@ -110,11 +110,11 @@ 
 	{
 		$view = $this->getView();
 
-		foreach( $this->getSubClients() as $subclient )
+		foreach ($this->getSubClients() as $subclient)
 		{
-			$subclient->setView( $view );
+			$subclient->setView($view);
 
-			if( $subclient->process() === false ) {
+			if ($subclient->process() === false) {
 				return false;
 			}
 		}
@@ -129,7 +129,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
 	 * @return \Aimeos\Client\Html\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view )
+	public function setView(\Aimeos\MW\View\Iface $view)
 	{
 		$this->view = $view;
 		return $this;
@@ -145,29 +145,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Client\Html\Catalog\Decorator\"
 	 * @return \Aimeos\Client\Html\Iface Client object
 	 */
-	protected function addDecorators( \Aimeos\Client\Html\Iface $client, array $templatePaths,
-		array $decorators, $classprefix )
+	protected function addDecorators(\Aimeos\Client\Html\Iface $client, array $templatePaths,
+		array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Client\\Html\\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\Client\Html\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix.$name : '<not a string>';
+				throw new \Aimeos\Client\Html\Exception(sprintf('Invalid class name "%1$s"', $classname));
 			}
 
-			$classname = $classprefix . $name;
+			$classname = $classprefix.$name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$client = new $classname( $client, $this->context, $this->templatePaths );
+			$client = new $classname($client, $this->context, $this->templatePaths);
 
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ) );
+			if (!($client instanceof $iface)) {
+				throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -183,35 +183,35 @@ 
 	 * @param string $path Client string in lower case, e.g. "catalog/detail/basic"
 	 * @return \Aimeos\Client\Html\Iface Client object
 	 */
-	protected function addClientDecorators( \Aimeos\Client\Html\Iface $client, array $templatePaths, $path )
+	protected function addClientDecorators(\Aimeos\Client\Html\Iface $client, array $templatePaths, $path)
 	{
-		if( !is_string( $path ) || $path === '' ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid domain "%1$s"', $path ) );
+		if (!is_string($path) || $path === '') {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid domain "%1$s"', $path));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 		$config = $this->context->getConfig();
 
-		$decorators = $config->get( 'client/html/common/decorators/default', array() );
-		$excludes = $config->get( 'client/html/' . $path . '/decorators/excludes', array() );
+		$decorators = $config->get('client/html/common/decorators/default', array());
+		$excludes = $config->get('client/html/'.$path.'/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\\Client\\Html\\Common\\Decorator\\';
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
-		$decorators = $config->get( 'client/html/' . $path . '/decorators/global', array() );
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$decorators = $config->get('client/html/'.$path.'/decorators/global', array());
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
-		$classprefix = '\\Aimeos\\Client\\Html\\' . $localClass . '\\Decorator\\';
-		$decorators = $config->get( 'client/html/' . $path . '/decorators/local', array() );
-		$client = $this->addDecorators( $client, $templatePaths, $decorators, $classprefix );
+		$classprefix = '\\Aimeos\\Client\\Html\\'.$localClass.'\\Decorator\\';
+		$decorators = $config->get('client/html/'.$path.'/decorators/local', array());
+		$client = $this->addDecorators($client, $templatePaths, $decorators, $classprefix);
 
 		return $client;
 	}
@@ -225,7 +225,7 @@ 
 	 * @param string|null &$expire Expiration date that will be overwritten if an earlier date is found
 	 * @param array &$tags List of tags the new tags will be added to
 	 */
-	protected function addMetaItem( $items, $domain, &$expire, array &$tags )
+	protected function addMetaItem($items, $domain, &$expire, array &$tags)
 	{
 		/** client/html/common/cache/tag-all
 		 * Adds tags for all items used in a cache entry
@@ -259,18 +259,18 @@ 
 		 * @see madmin/cache/manager/name
 		 * @see madmin/cache/name
 		 */
-		$tagAll = $this->context->getConfig()->get( 'client/html/common/cache/tag-all', false );
+		$tagAll = $this->context->getConfig()->get('client/html/common/cache/tag-all', false);
 
-		if( !is_array( $items ) ) {
-			$items = array( $items );
+		if (!is_array($items)) {
+			$items = array($items);
 		}
 
-		if( $tagAll !== true && !empty( $items ) ) {
+		if ($tagAll !== true && !empty($items)) {
 			$tags[] = $domain;
 		}
 
-		foreach( $items as $item ) {
-			$this->addMetaItemSingle( $item, $domain, $expire, $tags, $tagAll );
+		foreach ($items as $item) {
+			$this->addMetaItemSingle($item, $domain, $expire, $tags, $tagAll);
 		}
 	}
 
@@ -284,35 +284,35 @@ 
 	 * @param array &$tags List of tags the new tags will be added to
 	 * @param boolean $tagAll True of tags for all items should be added, false if only for the main item
 	 */
-	private function addMetaItemSingle( \Aimeos\MShop\Common\Item\Iface $item, $domain, &$expire, array &$tags, $tagAll )
+	private function addMetaItemSingle(\Aimeos\MShop\Common\Item\Iface $item, $domain, &$expire, array &$tags, $tagAll)
 	{
 		$expires = array();
-		$domain = str_replace( '/', '_', $domain ); // maximum compatiblity
+		$domain = str_replace('/', '_', $domain); // maximum compatiblity
 
-		if( $tagAll === true ) {
-			$tags[] = $domain . '-' . $item->getId();
+		if ($tagAll === true) {
+			$tags[] = $domain.'-'.$item->getId();
 		}
 
-		if( $item instanceof \Aimeos\MShop\Common\Item\Time\Iface && ( $date = $item->getDateEnd() ) !== null ) {
+		if ($item instanceof \Aimeos\MShop\Common\Item\Time\Iface && ($date = $item->getDateEnd()) !== null) {
 			$expires[] = $date;
 		}
 
-		if( $item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface )
+		if ($item instanceof \Aimeos\MShop\Common\Item\ListRef\Iface)
 		{
-			foreach( $item->getListItems() as $listitem )
+			foreach ($item->getListItems() as $listitem)
 			{
-				if( $tagAll === true ) {
-					$tags[] = str_replace( '/', '_', $listitem->getDomain() ) . '-' . $listitem->getRefId();
+				if ($tagAll === true) {
+					$tags[] = str_replace('/', '_', $listitem->getDomain()).'-'.$listitem->getRefId();
 				}
 
-				if( ( $date = $listitem->getDateEnd() ) !== null ) {
+				if (($date = $listitem->getDateEnd()) !== null) {
 					$expires[] = $date;
 				}
 			}
 		}
 
-		if( !empty( $expires ) ) {
-			$expire = min( $expires );
+		if (!empty($expires)) {
+			$expire = min($expires);
 		}
 	}
 
@@ -324,21 +324,21 @@ 
 	 * @param string $domain Name of the domain the item IDs are from
 	 * @param string|null &$expire Expiration date that will be overwritten if an start date in the future is available
 	 */
-	protected function addMetaList( $ids, $domain, &$expire )
+	protected function addMetaList($ids, $domain, &$expire)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain . '/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain.'/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', $domain . '.lists.parentid', $ids ),
-			$search->compare( '>', $domain . '.lists.datestart', date( 'Y-m-d H:i:00' ) ),
+			$search->compare('==', $domain.'.lists.parentid', $ids),
+			$search->compare('>', $domain.'.lists.datestart', date('Y-m-d H:i:00')),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', $domain . '.lists.datestart' ) ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', $domain.'.lists.datestart')));
+		$search->setSlice(0, 1);
 
-		foreach( $manager->searchItems( $search ) as $listItem ) {
-			$expire = $this->expires( $expire, $listItem->getDateStart() );
+		foreach ($manager->searchItems($search) as $listItem) {
+			$expire = $this->expires($expire, $listItem->getDateStart());
 		}
 	}
 
@@ -350,34 +350,34 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return \Aimeos\Client\Html\Iface Sub-part object
 	 */
-	protected function createSubClient( $path, $name )
+	protected function createSubClient($path, $name)
 	{
-		$path = strtolower( $path );
+		$path = strtolower($path);
 
-		if( $name === null ) {
-			$name = $this->context->getConfig()->get( 'client/html/' . $path . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $this->context->getConfig()->get('client/html/'.$path.'/name', 'Standard');
 		}
 
-		if( empty( $name ) || ctype_alnum( $name ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in client name "%1$s"', $name ) );
+		if (empty($name) || ctype_alnum($name) === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in client name "%1$s"', $name));
 		}
 
-		$subnames = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$subnames = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 
-		$classname = '\\Aimeos\\Client\\Html\\' . $subnames . '\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\'.$subnames.'\\'.$name;
 		$interface = '\\Aimeos\\Client\\Html\\Iface';
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$object = new $classname( $this->context, $this->templatePaths );
+		$object = new $classname($this->context, $this->templatePaths);
 
-		if( ( $object instanceof $interface ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (($object instanceof $interface) === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
-		return $this->addClientDecorators( $object, $this->templatePaths, $path );
+		return $this->addClientDecorators($object, $this->templatePaths, $path);
 	}
 
 
@@ -388,9 +388,9 @@ 
 	 * @param string|null $second Second expiration date or null
 	 * @return string|null Expiration date
 	 */
-	protected function expires( $first, $second )
+	protected function expires($first, $second)
 	{
-		return ( $first !== null ? ( $second !== null ? min( $first, $second ) : $first ) : $second );
+		return ($first !== null ? ($second !== null ? min($first, $second) : $first) : $second);
 	}
 
 
@@ -401,13 +401,13 @@ 
 	 * @param array $prefixes List of prefixes the parameters must start with
 	 * @return array Associative list of parameters used by the html client
 	 */
-	protected function getClientParams( array $params, array $prefixes = array( 'f', 'l', 'd', 'a' ) )
+	protected function getClientParams(array $params, array $prefixes = array('f', 'l', 'd', 'a'))
 	{
 		$list = array();
 
-		foreach( $params as $key => $value )
+		foreach ($params as $key => $value)
 		{
-			if( in_array( $key[0], $prefixes ) && $key[1] === '_' ) {
+			if (in_array($key[0], $prefixes) && $key[1] === '_') {
 				$list[$key] = $value;
 			}
 		}
@@ -435,17 +435,17 @@ 
 	 * @param array $config Multi-dimensional array of configuration options used by the client and sub-clients
 	 * @return string Unique hash
 	 */
-	protected function getParamHash( array $prefixes = array( 'f', 'l', 'd' ), $key = '', array $config = array() )
+	protected function getParamHash(array $prefixes = array('f', 'l', 'd'), $key = '', array $config = array())
 	{
 		$locale = $this->getContext()->getLocale();
-		$params = $this->getClientParams( $this->getView()->param(), $prefixes );
-		ksort( $params );
+		$params = $this->getClientParams($this->getView()->param(), $prefixes);
+		ksort($params);
 
-		if( ( $pstr = json_encode( $params ) ) === false || ( $cstr = json_encode( $config ) ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( 'Unable to encode parameters or configuration options' );
+		if (($pstr = json_encode($params)) === false || ($cstr = json_encode($config)) === false) {
+			throw new \Aimeos\Client\Html\Exception('Unable to encode parameters or configuration options');
 		}
 
-		return md5( $key . $pstr . $cstr . $locale->getLanguageId() . $locale->getCurrencyId() );
+		return md5($key.$pstr.$cstr.$locale->getLanguageId().$locale->getCurrencyId());
 	}
 
 
@@ -464,12 +464,12 @@ 
 	 */
 	protected function getSubClients()
 	{
-		if( !isset( $this->subclients ) )
+		if (!isset($this->subclients))
 		{
 			$this->subclients = array();
 
-			foreach( $this->getSubClientNames() as $name ) {
-				$this->subclients[] = $this->getSubClient( $name );
+			foreach ($this->getSubClientNames() as $name) {
+				$this->subclients[] = $this->getSubClient($name);
 			}
 		}
 
@@ -498,23 +498,23 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface Type item
 	 * @throws \Aimeos\Controller\Jobs\Exception If no item is found
 	 */
-	protected function getTypeItem( $prefix, $domain, $code )
+	protected function getTypeItem($prefix, $domain, $code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $prefix );
-		$prefix = str_replace( '/', '.', $prefix );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $prefix);
+		$prefix = str_replace('/', '.', $prefix);
 
 		$search = $manager->createSearch();
 		$expr = array(
-				$search->compare( '==', $prefix . '.domain', $domain ),
-				$search->compare( '==', $prefix . '.code', $code ),
+				$search->compare('==', $prefix.'.domain', $domain),
+				$search->compare('==', $prefix.'.code', $code),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$result = $manager->searchItems( $search );
+		$search->setConditions($search->combine('&&', $expr));
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( 'No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $prefix );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $prefix);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		return $item;
@@ -530,9 +530,9 @@ 
 	 * @param string $confkey Configuration key prefix that matches all relevant settings for the component
 	 * @return string Cached entry or empty string if not available
 	 */
-	protected function getCached( $type, $uid, array $prefixes, $confkey )
+	protected function getCached($type, $uid, array $prefixes, $confkey)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$context = $this->getContext();
 			$config = $context->getConfig();
@@ -555,28 +555,28 @@ 
 			 * @category User
 			 * @see client/html/common/cache/tag-all
 			 */
-			$force = $config->get( 'client/html/common/cache/force', false );
+			$force = $config->get('client/html/common/cache/force', false);
 
-			if( $force == false && $context->getUserId() !== null ) {
+			if ($force == false && $context->getUserId() !== null) {
 				return null;
 			}
 
-			$cfg = $config->get( $confkey, array() );
+			$cfg = $config->get($confkey, array());
 
 			$keys = array(
-				'body' => $this->getParamHash( $prefixes, $uid . ':' . $confkey . ':body', $cfg ),
-				'header' => $this->getParamHash( $prefixes, $uid . ':' . $confkey . ':header', $cfg ),
+				'body' => $this->getParamHash($prefixes, $uid.':'.$confkey.':body', $cfg),
+				'header' => $this->getParamHash($prefixes, $uid.':'.$confkey.':header', $cfg),
 			);
 
-			$entries = $context->getCache()->getList( $keys );
+			$entries = $context->getCache()->getList($keys);
 			$this->cache = array();
 
-			foreach( $keys as $key => $hash ) {
-				$this->cache[$key] = ( array_key_exists( $hash, $entries ) ? $entries[$hash] : null );
+			foreach ($keys as $key => $hash) {
+				$this->cache[$key] = (array_key_exists($hash, $entries) ? $entries[$hash] : null);
 			}
 		}
 
-		return ( array_key_exists( $type, $this->cache ) ? $this->cache[$type] : null );
+		return (array_key_exists($type, $this->cache) ? $this->cache[$type] : null);
 	}
 
 
@@ -593,28 +593,28 @@ 
 	 * @param string|null $expire Date/time string in "YYYY-MM-DD HH:mm:ss"
 	 * 	format when the cache entry expires
 	 */
-	protected function setCached( $type, $uid, array $prefixes, $confkey, $value, array $tags, $expire )
+	protected function setCached($type, $uid, array $prefixes, $confkey, $value, array $tags, $expire)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		$force = $config->get( 'client/html/common/cache/force', false );
+		$force = $config->get('client/html/common/cache/force', false);
 
-		if( $force == false && $context->getUserId() !== null ) {
+		if ($force == false && $context->getUserId() !== null) {
 			return;
 		}
 
 		try
 		{
-			$cfg = $config->get( $confkey, array() );
-			$key = $this->getParamHash( $prefixes, $uid . ':' . $confkey . ':' . $type, $cfg );
+			$cfg = $config->get($confkey, array());
+			$key = $this->getParamHash($prefixes, $uid.':'.$confkey.':'.$type, $cfg);
 
-			$context->getCache()->set( $key, $value, array_unique( $tags ), $expire );
+			$context->getCache()->set($key, $value, array_unique($tags), $expire);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$msg = sprintf( 'Unable to set cache entry: %1$s', $e->getMessage() );
-			$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Unable to set cache entry: %1$s', $e->getMessage());
+			$context->getLogger()->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 		}
 	}
 
@@ -626,19 +626,19 @@ 
 	 * @param string $section New section content
 	 * @param string $marker Name of the section marker without "<!-- " and " -->" parts
 	 */
-	protected function replaceSection( $content, $section, $marker )
+	protected function replaceSection($content, $section, $marker)
 	{
 		$start = 0;
-		$len = strlen( $section );
-		$marker = '<!-- ' . $marker . ' -->';
+		$len = strlen($section);
+		$marker = '<!-- '.$marker.' -->';
 
-		while( ( $start = @strpos( $content, $marker, $start ) ) !== false )
+		while (($start = @strpos($content, $marker, $start)) !== false)
 		{
-			if( ( $end = strpos( $content, $marker, $start + 1 ) ) !== false ) {
-				$content = substr_replace( $content, $section, $start, $end - $start + strlen( $marker ) );
+			if (($end = strpos($content, $marker, $start + 1)) !== false) {
+				$content = substr_replace($content, $section, $start, $end - $start + strlen($marker));
 			}
 
-			$start += 2 * strlen( $marker ) + $len;
+			$start += 2 * strlen($marker) + $len;
 		}
 
 		return $content;
@@ -653,7 +653,7 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
 		return $view;
 	}
@@ -665,17 +665,17 @@ 
 	 * @param array $codes Associative list of scope and object as key and error code as value
 	 * @return array List of translated error messages
 	 */
-	protected function translatePluginErrorCodes( array $codes )
+	protected function translatePluginErrorCodes(array $codes)
 	{
 		$errors = array();
 		$i18n = $this->context->getI18n();
 
-		foreach( $codes as $scope => $list )
+		foreach ($codes as $scope => $list)
 		{
-			foreach( $list as $object => $errcode )
+			foreach ($list as $object => $errcode)
 			{
-				$key = $scope . ( $scope !== 'product' ? '.' . $object : '' ) . '.' . $errcode;
-				$errors[] = $i18n->dt( 'mshop/code', $key );
+				$key = $scope.($scope !== 'product' ? '.'.$object : '').'.'.$errcode;
+				$errors[] = $i18n->dt('mshop/code', $key);
 			}
 		}
 

client/html/src/Client/Html/Catalog/Stage/Breadcrumb/Standard.php

Spacing +13 added lines, -13 removed lines

@@ -67,13 +67,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->breadcrumbBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/catalog/stage/breadcrumb/standard/template-body';
 		$default = 'catalog/stage/breadcrumb-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -112,13 +112,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->breadcrumbHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/catalog/stage/breadcrumb/standard/template-header';
 		$default = 'catalog/stage/breadcrumb-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/catalog/stage/breadcrumb/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog stage breadcrumb html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/catalog/stage/breadcrumb/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/stage/breadcrumb/' . $type, $name );
+		return $this->createSubClient('catalog/stage/breadcrumb/'.$type, $name);
 	}
 
 
@@ -244,6 +244,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

client/html/src/Client/Html/Catalog/Stage/Navigator/Standard.php

Spacing +38 added lines, -38 removed lines

@@ -68,13 +68,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->navigatorBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/catalog/stage/navigator/standard/template-body';
 		$default = 'catalog/stage/navigator-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,13 +113,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->navigatorHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/catalog/stage/navigator/standard/template-header';
 		$default = 'catalog/stage/navigator-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/catalog/stage/navigator/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog stage navigator html client
@@ -234,7 +234,7 @@ 
 		 * @see client/html/catalog/stage/navigator/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/stage/navigator/' . $type, $name );
+		return $this->createSubClient('catalog/stage/navigator/'.$type, $name);
 	}
 
 
@@ -245,9 +245,9 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string Modified body content
 	 */
-	public function modifyBody( $content, $uid )
+	public function modifyBody($content, $uid)
 	{
-		return $this->replaceSection( $content, $this->getBody( $uid ), 'catalog.stage.navigator' );
+		return $this->replaceSection($content, $this->getBody($uid), 'catalog.stage.navigator');
 	}
 
 
@@ -258,9 +258,9 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string Modified body content
 	 */
-	public function modifyHeader( $content, $uid )
+	public function modifyHeader($content, $uid)
 	{
-		return $this->replaceSection( $content, $this->getHeader( $uid ), 'catalog.stage.navigator' );
+		return $this->replaceSection($content, $this->getHeader($uid), 'catalog.stage.navigator');
 	}
 
 
@@ -271,7 +271,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -283,13 +283,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->view ) )
+		if (!isset($this->view))
 		{
-			if( ( $pos = $view->param( 'l_pos' ) ) !== null && ( $pid = $view->param( 'd_prodid' ) ) !== null )
+			if (($pos = $view->param('l_pos')) !== null && ($pid = $view->param('d_prodid')) !== null)
 			{
-				if( $pos < 1 ) {
+				if ($pos < 1) {
 					$start = 0; $size = 2;
 				} else {
 					$start = $pos - 1; $size = 3;
@@ -297,43 +297,43 @@ 
 
 				$context = $this->getContext();
 				$site = $context->getLocale()->getSite()->getCode();
-				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last/' . $site, array() );
+				$params = $context->getSession()->get('aimeos/catalog/lists/params/last/'.$site, array());
 
-				$filter = $this->getProductListFilterByParam( $params );
-				$filter->setSlice( $start, $size );
+				$filter = $this->getProductListFilterByParam($params);
+				$filter->setSlice($start, $size);
 				$total = null;
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-				$products = $controller->getIndexItems( $filter, array( 'text' ), $total );
+				$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+				$products = $controller->getIndexItems($filter, array('text'), $total);
 
-				if( ( $count = count( $products ) ) > 1 )
+				if (($count = count($products)) > 1)
 				{
 					$enc = $view->encoder();
-					$listPos = array_search( $pid, array_keys( $products ) );
+					$listPos = array_search($pid, array_keys($products));
 
-					$target = $view->config( 'client/html/catalog/detail/url/target' );
-					$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
-					$action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
-					$config = $view->config( 'client/html/catalog/detail/url/config', array() );
+					$target = $view->config('client/html/catalog/detail/url/target');
+					$controller = $view->config('client/html/catalog/detail/url/controller', 'catalog');
+					$action = $view->config('client/html/catalog/detail/url/action', 'detail');
+					$config = $view->config('client/html/catalog/detail/url/config', array());
 
-					if( $listPos > 0 && ( $product = reset( $products ) ) !== false )
+					if ($listPos > 0 && ($product = reset($products)) !== false)
 					{
 						$param = array(
 							'd_prodid' => $product->getId(),
-							'd_name' => $enc->url( $product->getName( 'url ' ) ),
+							'd_name' => $enc->url($product->getName('url ')),
 							'l_pos' => $pos - 1
 						);
-						$view->navigationPrev = $view->url( $target, $controller, $action, $param, array(), $config );
+						$view->navigationPrev = $view->url($target, $controller, $action, $param, array(), $config);
 					}
 
-					if( $listPos < $count - 1 && ( $product = end( $products ) ) !== false )
+					if ($listPos < $count - 1 && ($product = end($products)) !== false)
 					{
 						$param = array(
 							'd_prodid' => $product->getId(),
-							'd_name' => $enc->url( $product->getName( 'url' ) ),
+							'd_name' => $enc->url($product->getName('url')),
 							'l_pos' => $pos + 1
 						);
-						$view->navigationNext = $view->url( $target, $controller, $action, $param, array(), $config );
+						$view->navigationNext = $view->url($target, $controller, $action, $param, array(), $config);
 					}
 				}
 			}

client/html/src/Client/Html/Catalog/Stage/Factory.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
 	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null)
 	{
 		/** client/html/catalog/stage/name
 		 * Class name of the used catalog stage client implementation
@@ -66,22 +66,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/catalog/stage/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/catalog/stage/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Catalog\\Stage\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\Html\\Catalog\\Stage\\'.$name : '<not a string>';
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Catalog\\Stage\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Catalog\\Stage\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'catalog/stage' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'catalog/stage');
 	}
 }
 

client/html/src/Client/Html/Catalog/Stage/Standard.php

Spacing +68 added lines, -68 removed lines

@@ -89,7 +89,7 @@ 
 	 * @since 2014.09
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'image', 'breadcrumb', 'navigator' );
+	private $subPartNames = array('image', 'breadcrumb', 'navigator');
 
 	private $tags = array();
 	private $expire;
@@ -104,9 +104,9 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$prefixes = array( 'f' );
+		$prefixes = array('f');
 		$context = $this->getContext();
 
 		/** client/html/catalog/stage
@@ -121,41 +121,41 @@ 
 		 */
 		$confkey = 'client/html/catalog/stage';
 
-		if( $context->getUserId() != null || ( $html = $this->getCached( 'body', $uid, $prefixes, $confkey ) ) === null )
+		if ($context->getUserId() != null || ($html = $this->getCached('body', $uid, $prefixes, $confkey)) === null)
 		{
 			$view = $this->getView();
 
 			try
 			{
-				$view = $this->setViewParams( $view, $tags, $expire );
+				$view = $this->setViewParams($view, $tags, $expire);
 
 				$output = '';
-				foreach( $this->getSubClients() as $subclient ) {
-					$output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+				foreach ($this->getSubClients() as $subclient) {
+					$output .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 				}
 				$view->stageBody = $output;
 			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			catch (\Aimeos\Client\Html\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-				$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('client', $e->getMessage()));
+				$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			catch (\Aimeos\Controller\Frontend\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-				$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+				$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 			}
-			catch( \Aimeos\MShop\Exception $e )
+			catch (\Aimeos\MShop\Exception $e)
 			{
-				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-				$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+				$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+				$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-				$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-				$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+				$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+				$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 			}
 
 			/** client/html/catalog/stage/standard/template-body
@@ -181,13 +181,13 @@ 
 			$tplconf = 'client/html/catalog/stage/standard/template-body';
 			$default = 'catalog/stage/body-default.php';
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
+			$html = $view->render($view->config($tplconf, $default));
 
-			$this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire );
+			$this->setCached('body', $uid, $prefixes, $confkey, $html, $tags, $expire);
 		}
 		else
 		{
-			$html = $this->modifyBody( $html, $uid );
+			$html = $this->modifyBody($html, $uid);
 		}
 
 		return $html;
@@ -202,29 +202,29 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$prefixes = array( 'f' );
+		$prefixes = array('f');
 		$context = $this->getContext();
 		$confkey = 'client/html/catalog/stage';
 
-		if( $context->getUserId() != null || ( $html = $this->getCached( 'header', $uid, $prefixes, $confkey ) ) === null )
+		if ($context->getUserId() != null || ($html = $this->getCached('header', $uid, $prefixes, $confkey)) === null)
 		{
 			$view = $this->getView();
 
 			try
 			{
-				$view = $this->setViewParams( $view, $tags, $expire );
+				$view = $this->setViewParams($view, $tags, $expire);
 
 				$html = '';
-				foreach( $this->getSubClients() as $subclient ) {
-					$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+				foreach ($this->getSubClients() as $subclient) {
+					$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 				}
 				$view->stageHeader = $html;
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+				$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 			}
 
 			/** client/html/catalog/stage/standard/template-header
@@ -251,13 +251,13 @@ 
 			$tplconf = 'client/html/catalog/stage/standard/template-header';
 			$default = 'catalog/stage/header-default.php';
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
+			$html = $view->render($view->config($tplconf, $default));
 
-			$this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire );
+			$this->setCached('header', $uid, $prefixes, $confkey, $html, $tags, $expire);
 		}
 		else
 		{
-			$html = $this->modifyHeader( $html, $uid );
+			$html = $this->modifyHeader($html, $uid);
 		}
 
 		return $html;
@@ -271,7 +271,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/catalog/stage/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog stage html client
@@ -346,7 +346,7 @@ 
 		 * @see client/html/catalog/stage/decorators/excludes
 		 * @see client/html/catalog/stage/decorators/global
 		 */
-		return $this->createSubClient( 'catalog/stage/' . $type, $name );
+		return $this->createSubClient('catalog/stage/'.$type, $name);
 	}
 
 
@@ -363,28 +363,28 @@ 
 		{
 			parent::process();
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$context = $this->getContext();
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->stageErrorList = $view->get( 'stageErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->stageErrorList = $view->get('stageErrorList', array()) + $error;
 		}
 	}
 
@@ -396,15 +396,15 @@ 
 	 * @param array $prefixes List of prefixes the parameters must start with
 	 * @return array Associative list of parameters used by the html client
 	 */
-	protected function getClientParams( array $params, array $prefixes = array( 'f', 'l', 'd', 'a' ) )
+	protected function getClientParams(array $params, array $prefixes = array('f', 'l', 'd', 'a'))
 	{
-		$list = parent::getClientParams( $params, array_merge( $prefixes, array( 'l', 'd' ) ) );
+		$list = parent::getClientParams($params, array_merge($prefixes, array('l', 'd')));
 
-		if( isset( $list['l_pos'] ) && isset( $list['d_prodid'] ) )
+		if (isset($list['l_pos']) && isset($list['d_prodid']))
 		{
 			$context = $this->getContext();
 			$site = $context->getLocale()->getSite()->getCode();
-			$list += (array) $context->getSession()->get( 'aimeos/catalog/lists/params/last/' . $site, array() );
+			$list += (array) $context->getSession()->get('aimeos/catalog/lists/params/last/'.$site, array());
 		}
 
 		return $list;
@@ -418,7 +418,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -430,26 +430,26 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
-			$params = $this->getClientParams( $view->param(), array( 'f' ) );
+			$params = $this->getClientParams($view->param(), array('f'));
 
-			if( isset( $params['f_catid'] ) && $params['f_catid'] != '' )
+			if (isset($params['f_catid']) && $params['f_catid'] != '')
 			{
 				$context = $this->getContext();
 				$config = $context->getConfig();
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+				$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-				$default = array( 'attribute', 'media', 'text' );
+				$default = array('attribute', 'media', 'text');
 
 				/** client/html/catalog/domains
 				 * A list of domain names whose items should be available in the catalog view templates
 				 *
 				 * @see client/html/catalog/stage/domains
 				 */
-				$domains = $config->get( 'client/html/catalog/domains', $default );
+				$domains = $config->get('client/html/catalog/domains', $default);
 
 				/** client/html/catalog/stage/standard/domains
 				 * A list of domain names whose items should be available in the catalog stage view template
@@ -472,15 +472,15 @@ 
 				 * @see client/html/catalog/detail/domains
 				 * @see client/html/catalog/lists/domains
 				 */
-				$domains = $config->get( 'client/html/catalog/stage/standard/domains', $domains );
-				$stageCatPath = $controller->getCatalogPath( $params['f_catid'], $domains );
+				$domains = $config->get('client/html/catalog/stage/standard/domains', $domains);
+				$stageCatPath = $controller->getCatalogPath($params['f_catid'], $domains);
 
-				if( ( $categoryItem = end( $stageCatPath ) ) !== false ) {
+				if (($categoryItem = end($stageCatPath)) !== false) {
 					$view->stageCurrentCatItem = $categoryItem;
 				}
 
-				$this->addMetaItem( $stageCatPath, 'catalog', $this->expire, $this->tags );
-				$this->addMetaList( array_keys( $stageCatPath ), 'catalog', $this->expire );
+				$this->addMetaItem($stageCatPath, 'catalog', $this->expire, $this->tags);
+				$this->addMetaList(array_keys($stageCatPath), 'catalog', $this->expire);
 
 				$view->stageCatPath = $stageCatPath;
 			}
@@ -490,8 +490,8 @@ 
 			$this->cache = $view;
 		}
 
-		$expire = $this->expires( $this->expire, $expire );
-		$tags = array_merge( $tags, $this->tags );
+		$expire = $this->expires($this->expire, $expire);
+		$tags = array_merge($tags, $this->tags);
 
 		return $this->cache;
 	}