aimeos / ai-client-html

client/html/src/Client/Html/Catalog/Detail/Basket/Standard.php

Spacing +28 added lines, -28 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'service', 'selection', 'attribute' );
+	private $subPartNames = array('service', 'selection', 'attribute');
 	private $cache;
 
 
@@ -90,13 +90,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->basketBody = $html;
 
@@ -123,7 +123,7 @@ 
 		$tplconf = 'client/html/catalog/detail/basket/standard/template-body';
 		$default = 'catalog/detail/basket-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -135,13 +135,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->basketHeader = $html;
 
@@ -169,7 +169,7 @@ 
 		$tplconf = 'client/html/catalog/detail/basket/standard/template-header';
 		$default = 'catalog/detail/basket-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -180,7 +180,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/detail/basket/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail basket html client
@@ -256,7 +256,7 @@ 
 		 * @see client/html/catalog/detail/basket/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/basket/' . $type, $name );
+		return $this->createSubClient('catalog/detail/basket/'.$type, $name);
 	}
 
 
@@ -267,11 +267,11 @@ 
 	 * @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)
 	{
-		$content = parent::modifyBody( $content, $uid );
+		$content = parent::modifyBody($content, $uid);
 
-		return $this->replaceSection( $content, $this->getView()->csrf()->formfield(), 'catalog.detail.basket.csrf' );
+		return $this->replaceSection($content, $this->getView()->csrf()->formfield(), 'catalog.detail.basket.csrf');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -294,9 +294,9 @@ 
 	 * @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))
 		{
 			$config = $this->getContext()->getConfig();
 
@@ -321,18 +321,18 @@ 
 			 * @see client/html/catalog/stock/url/action
 			 * @see client/html/catalog/stock/url/config
 			 */
-			if( isset( $view->detailProductItem ) && $config->get( 'client/html/catalog/detail/stock/enable', true ) === true )
+			if (isset($view->detailProductItem) && $config->get('client/html/catalog/detail/stock/enable', true) === true)
 			{
-				$stockTarget = $config->get( 'client/html/catalog/stock/url/target' );
-				$stockController = $config->get( 'client/html/catalog/stock/url/controller', 'catalog' );
-				$stockAction = $config->get( 'client/html/catalog/stock/url/action', 'stock' );
-				$stockConfig = $config->get( 'client/html/catalog/stock/url/config', array() );
+				$stockTarget = $config->get('client/html/catalog/stock/url/target');
+				$stockController = $config->get('client/html/catalog/stock/url/controller', 'catalog');
+				$stockAction = $config->get('client/html/catalog/stock/url/action', 'stock');
+				$stockConfig = $config->get('client/html/catalog/stock/url/config', array());
 
-				$prodIds = array_keys( $view->detailProductItem->getRefItems( 'product', null, 'default' ) );
-				array_unshift( $prodIds, $view->detailProductItem->getId() );
-				$params = array( 's_prodid' => $prodIds );
+				$prodIds = array_keys($view->detailProductItem->getRefItems('product', null, 'default'));
+				array_unshift($prodIds, $view->detailProductItem->getId());
+				$params = array('s_prodid' => $prodIds);
 
-				$view->basketStockUrl = $view->url( $stockTarget, $stockController, $stockAction, $params, array(), $stockConfig );
+				$view->basketStockUrl = $view->url($stockTarget, $stockController, $stockAction, $params, array(), $stockConfig);
 				$view->basketProductIds = $prodIds;
 			}
 

client/html/src/Client/Html/Catalog/Detail/Basket/Selection/Standard.php

Spacing +37 added lines, -37 removed lines

@@ -70,13 +70,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->selectionBody = $html;
 
@@ -103,7 +103,7 @@ 
 		$tplconf = 'client/html/catalog/detail/basket/selection/standard/template-body';
 		$default = 'catalog/detail/basket-selection-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -115,13 +115,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->selectionHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/catalog/detail/basket/selection/standard/template-header';
 		$default = 'catalog/detail/basket-selection-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -160,7 +160,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/detail/basket/selection/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail basket selection html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/catalog/detail/basket/selection/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/basket/selection/' . $type, $name );
+		return $this->createSubClient('catalog/detail/basket/selection/'.$type, $name);
 	}
 
 
@@ -247,7 +247,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -259,16 +259,16 @@ 
 	 * @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))
 		{
-			if( $view->detailProductItem->getType() === 'select' )
+			if ($view->detailProductItem->getType() === 'select')
 			{
 				$context = $this->getContext();
 				$config = $context->getConfig();
-				$domains = array( 'text', 'price', 'media', 'attribute' );
-				$products = $view->detailProductItem->getRefItems( 'product', 'default', 'default' );
+				$domains = array('text', 'price', 'media', 'attribute');
+				$products = $view->detailProductItem->getRefItems('product', 'default', 'default');
 
 				/** client/html/catalog/detail/basket/selection/domains
 				 * A list of domain names whose items should be available in the basket
@@ -287,15 +287,15 @@ 
 				 * @category Developer
 				 * @see client/html/catalog/detail/basket/selection/domains-attributes
 				*/
-				$domains = $config->get( 'client/html/catalog/detail/basket/selection/domains', $domains );
+				$domains = $config->get('client/html/catalog/detail/basket/selection/domains', $domains);
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-				$subproducts = $controller->getProductItems( array_keys( $products ), $domains );
+				$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+				$subproducts = $controller->getProductItems(array_keys($products), $domains);
 				$attrIds = $prodDeps = $attrDeps = $attrTypeDeps = array();
 
-				foreach( $subproducts as $subProdId => $subProduct )
+				foreach ($subproducts as $subProdId => $subProduct)
 				{
-					foreach( $subProduct->getRefItems( 'attribute', null, 'variant' ) as $attrId => $attrItem )
+					foreach ($subProduct->getRefItems('attribute', null, 'variant') as $attrId => $attrItem)
 					{
 						$attrTypeDeps[$attrItem->getType()][$attrId] = $attrItem->getPosition();
 						$attrDeps[$attrId][] = $subProdId;
@@ -304,20 +304,20 @@ 
 					}
 				}
 
-				ksort( $attrTypeDeps );
+				ksort($attrTypeDeps);
 
-				$this->addMetaItem( $subproducts, 'product', $this->expire, $this->tags );
-				$this->addMetaList( array_keys( $subproducts ), 'product', $this->expire );
+				$this->addMetaItem($subproducts, 'product', $this->expire, $this->tags);
+				$this->addMetaList(array_keys($subproducts), 'product', $this->expire);
 
 
-				$attrManager = $controller->createManager( 'attribute' );
+				$attrManager = $controller->createManager('attribute');
 
-				$search = $attrManager->createSearch( true );
+				$search = $attrManager->createSearch(true);
 				$expr = array(
-					$search->compare( '==', 'attribute.id', $attrIds ),
+					$search->compare('==', 'attribute.id', $attrIds),
 					$search->getConditions(),
 				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
+				$search->setConditions($search->combine('&&', $expr));
 
 				/** client/html/catalog/detail/basket/selection/domains-attributes
 				 * A list of domain names whose items should be available for the attributes
@@ -336,13 +336,13 @@ 
 				 * @category Developer
 				 * @see client/html/catalog/detail/basket/selection/domains
 				 */
-				$domains = array( 'text', 'media' );
-				$domains = $config->get( 'client/html/catalog/detail/basket/selection/domains-attributes', $domains );
+				$domains = array('text', 'media');
+				$domains = $config->get('client/html/catalog/detail/basket/selection/domains-attributes', $domains);
 
-				$attributes = $attrManager->searchItems( $search, $domains );
+				$attributes = $attrManager->searchItems($search, $domains);
 
-				$this->addMetaItem( $attributes, 'attribute', $this->expire, $this->tags );
-				$this->addMetaList( array_keys( $attributes ), 'attribute', $this->expire );
+				$this->addMetaItem($attributes, 'attribute', $this->expire, $this->tags);
+				$this->addMetaList(array_keys($attributes), 'attribute', $this->expire);
 
 
 				$view->selectionProducts = $subproducts;
@@ -355,8 +355,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;
 	}

client/html/src/Client/Html/Catalog/Detail/Image/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->imageBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/catalog/detail/image/standard/template-body';
 		$default = 'catalog/detail/image-body-bottom.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->imageHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/catalog/detail/image/standard/template-header';
 		$default = 'catalog/detail/image-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/detail/image/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail image html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/catalog/detail/image/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/image/' . $type, $name );
+		return $this->createSubClient('catalog/detail/image/'.$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/Detail/Suggest/Standard.php

Spacing +26 added lines, -26 removed lines

@@ -70,13 +70,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->suggestBody = $html;
 
@@ -103,7 +103,7 @@ 
 		$tplconf = 'client/html/catalog/detail/suggest/standard/template-body';
 		$default = 'catalog/detail/suggest-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -115,13 +115,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->suggestHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/catalog/detail/suggest/standard/template-header';
 		$default = 'catalog/detail/suggest-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -160,7 +160,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/detail/suggest/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail suggest html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/catalog/detail/suggest/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/suggest/' . $type, $name );
+		return $this->createSubClient('catalog/detail/suggest/'.$type, $name);
 	}
 
 
@@ -247,7 +247,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -259,25 +259,25 @@ 
 	 * @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))
 		{
-			if( isset( $view->detailProductItem ) )
+			if (isset($view->detailProductItem))
 			{
 				$context = $this->getContext();
 				$config = $context->getConfig();
-				$domains = array( 'text', 'price', 'media' );
-				$products = $view->detailProductItem->getRefItems( 'product', null, 'suggestion' );
+				$domains = array('text', 'price', 'media');
+				$products = $view->detailProductItem->getRefItems('product', null, 'suggestion');
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+				$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
 				/** client/html/catalog/detail/domains
 				 * A list of domain names whose items should be available in the catalog view templates
 				 *
 				 * @see client/html/catalog/detail/domains
 				 */
-				$domains = $config->get( 'client/html/catalog/detail/domains', $domains );
+				$domains = $config->get('client/html/catalog/detail/domains', $domains);
 
 				/** client/html/catalog/detail/suggest/domains
 				 * A list of domain names whose items should be available in the suggestion part of the catalog detail view templates
@@ -300,20 +300,20 @@ 
 				 * @category Developer
 				 * @see client/html/catalog/detail/domains
 				 */
-				$domains = $config->get( 'client/html/catalog/detail/suggest/domains', $domains );
+				$domains = $config->get('client/html/catalog/detail/suggest/domains', $domains);
 
-				$view->suggestItems = $controller->getProductItems( array_keys( $products ), $domains );
+				$view->suggestItems = $controller->getProductItems(array_keys($products), $domains);
 				$view->suggestPosItems = $products;
 
-				$this->addMetaItem( $view->suggestItems, 'product', $this->expire, $this->tags );
-				$this->addMetaList( array_keys( $view->suggestItems ), 'product', $this->expire );
+				$this->addMetaItem($view->suggestItems, 'product', $this->expire, $this->tags);
+				$this->addMetaList(array_keys($view->suggestItems), 'product', $this->expire);
 			}
 
 			$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;
 	}

client/html/src/Client/Html/Catalog/Detail/Seen/Standard.php

Spacing +28 added lines, -28 removed lines

@@ -67,7 +67,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)
 	{
 		return '';
 	}
@@ -81,7 +81,7 @@ 
 	 * @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)
 	{
 		return '';
 	}
@@ -94,7 +94,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/detail/seen/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail seen html client
@@ -170,7 +170,7 @@ 
 		 * @see client/html/catalog/detail/seen/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/seen/' . $type, $name );
+		return $this->createSubClient('catalog/detail/seen/'.$type, $name);
 	}
 
 
@@ -181,7 +181,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -192,16 +192,16 @@ 
 	 */
 	public function process()
 	{
-		if( ( $id = $this->getView()->param( 'd_prodid' ) ) !== null )
+		if (($id = $this->getView()->param('d_prodid')) !== null)
 		{
 			$context = $this->getContext();
 			$session = $context->getSession();
-			$lastSeen = $session->get( 'aimeos/catalog/session/seen/list', array() );
+			$lastSeen = $session->get('aimeos/catalog/session/seen/list', array());
 
-			if( isset( $lastSeen[$id] ) )
+			if (isset($lastSeen[$id]))
 			{
 				$html = $lastSeen[$id];
-				unset( $lastSeen[$id] );
+				unset($lastSeen[$id]);
 				$lastSeen[$id] = $html;
 			}
 			else
@@ -218,16 +218,16 @@ 
 				 * @category User
 				 * @category Developer
 				 */
-				$max = $this->getContext()->getConfig()->get( 'client/html/catalog/session/seen/standard/maxitems', 6 );
+				$max = $this->getContext()->getConfig()->get('client/html/catalog/session/seen/standard/maxitems', 6);
 
-				$lastSeen[$id] = $this->getHtml( $id );
-				$lastSeen = array_slice( $lastSeen, -$max, $max, true );
+				$lastSeen[$id] = $this->getHtml($id);
+				$lastSeen = array_slice($lastSeen, -$max, $max, true);
 			}
 
-			$session->set( 'aimeos/catalog/session/seen/list', $lastSeen );
+			$session->set('aimeos/catalog/session/seen/list', $lastSeen);
 
-			foreach( $session->get( 'aimeos/catalog/session/seen/cache', array() ) as $key => $value ) {
-				$session->set( $key, null );
+			foreach ($session->get('aimeos/catalog/session/seen/cache', array()) as $key => $value) {
+				$session->set($key, null);
 			}
 		}
 
@@ -241,21 +241,21 @@ 
 	 * @param string $id Product ID
 	 * @return string HTML of the last seen item for the given product ID
 	 */
-	protected function getHtml( $id )
+	protected function getHtml($id)
 	{
 		$context = $this->getContext();
 		$cache = $context->getCache();
-		$key = md5( $id . 'product:detail-seen' );
+		$key = md5($id.'product:detail-seen');
 
-		if( ( $html = $cache->get( $key ) ) === null )
+		if (($html = $cache->get($key)) === null)
 		{
 			$expire = null;
 			$tags = array();
 			$view = $this->getView();
 			$config = $context->getConfig();
 
-			$default = array( 'media', 'price', 'text' );
-			$domains = $config->get( 'client/html/catalog/domains', $default );
+			$default = array('media', 'price', 'text');
+			$domains = $config->get('client/html/catalog/domains', $default);
 
 			/** client/html/catalog/detail/seen/domains
 			 * A list of domain names whose items should be available in the last seen view template for the product
@@ -275,16 +275,16 @@ 
 			 * @see client/html/catalog/lists/domains
 			 * @see client/html/catalog/detail/domains
 			 */
-			$domains = $config->get( 'client/html/catalog/detail/seen/domains', $domains );
+			$domains = $config->get('client/html/catalog/detail/seen/domains', $domains);
 
-			$view->seenProductItem = \Aimeos\MShop\Factory::createManager( $context, 'product' )->getItem( $id, $domains );
+			$view->seenProductItem = \Aimeos\MShop\Factory::createManager($context, 'product')->getItem($id, $domains);
 
-			$this->addMetaItem( $view->seenProductItem, 'product', $expire, $tags );
-			$this->addMetaList( $view->seenProductItem->getId(), 'product', $expire );
+			$this->addMetaItem($view->seenProductItem, 'product', $expire, $tags);
+			$this->addMetaList($view->seenProductItem->getId(), 'product', $expire);
 
 			$output = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$output .= $subclient->setView( $view )->getBody( '', $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$output .= $subclient->setView($view)->getBody('', $tags, $expire);
 			}
 			$view->seenBody = $output;
 
@@ -311,9 +311,9 @@ 
 			$tplconf = 'client/html/catalog/detail/seen/standard/template-body';
 			$default = 'catalog/detail/seen-body-default.php';
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
+			$html = $view->render($view->config($tplconf, $default));
 
-			$cache->set( $key, $html, $tags, $expire );
+			$cache->set($key, $html, $tags, $expire);
 		}
 
 		return $html;

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

Spacing +69 added lines, -69 removed lines

@@ -32,18 +32,18 @@ 
 	 * @param array $params Associative list of parameters that should be used for filtering
 	 * @param \Aimeos\MW\Criteria\Iface $filter Criteria object for searching
 	 */
-	protected function addAttributeFilterByParam( array $params, \Aimeos\MW\Criteria\Iface $filter )
+	protected function addAttributeFilterByParam(array $params, \Aimeos\MW\Criteria\Iface $filter)
 	{
-		$attrids = ( isset( $params['f_attrid'] ) ? (array) $params['f_attrid'] : array() );
+		$attrids = (isset($params['f_attrid']) ? (array) $params['f_attrid'] : array());
 
-		if( !empty( $attrids ) )
+		if (!empty($attrids))
 		{
-			$func = $filter->createFunction( 'index.attributeaggregate', array( array_keys( $attrids ) ) );
+			$func = $filter->createFunction('index.attributeaggregate', array(array_keys($attrids)));
 			$expr = array(
 				$filter->getConditions(),
-				$filter->compare( '==', $func, count( $attrids ) ),
+				$filter->compare('==', $func, count($attrids)),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 	}
 
@@ -54,9 +54,9 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @param \Aimeos\MW\Criteria\Iface $filter Criteria object for searching
 	 */
-	protected function addAttributeFilter( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Criteria\Iface $filter )
+	protected function addAttributeFilter(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Criteria\Iface $filter)
 	{
-		$this->addAttributeFilterByParam( $view->param(), $filter );
+		$this->addAttributeFilterByParam($view->param(), $filter);
 	}
 
 
@@ -73,28 +73,28 @@ 
 	 * @param boolean $textfilter True to include text criteria in product filter, false if not
 	 * @return \Aimeos\MW\Criteria\Iface Search criteria object
 	 */
-	protected function createProductListFilter( $text, $catid, $sort, $sortdir, $page, $size, $catfilter, $textfilter )
+	protected function createProductListFilter($text, $catid, $sort, $sortdir, $page, $size, $catfilter, $textfilter)
 	{
 		$controller = $this->getCatalogController();
 
-		if( $text !== '' && $textfilter === true )
+		if ($text !== '' && $textfilter === true)
 		{
-			$filter = $controller->createIndexFilterText( $text, $sort, $sortdir, ( $page - 1 ) * $size, $size );
+			$filter = $controller->createIndexFilterText($text, $sort, $sortdir, ($page - 1) * $size, $size);
 
-			if( $catid !== '' && $catfilter === true ) {
-				$filter = $controller->addIndexFilterCategory( $filter, $this->getCatalogIds( $catid ) );
+			if ($catid !== '' && $catfilter === true) {
+				$filter = $controller->addIndexFilterCategory($filter, $this->getCatalogIds($catid));
 			}
 
 			return $filter;
 		}
-		elseif( $catid !== '' && $catfilter === true )
+		elseif ($catid !== '' && $catfilter === true)
 		{
-			$catIds = $this->getCatalogIds( $catid );
-			return $controller->createIndexFilterCategory( $catIds, $sort, $sortdir, ( $page - 1 ) * $size, $size );
+			$catIds = $this->getCatalogIds($catid);
+			return $controller->createIndexFilterCategory($catIds, $sort, $sortdir, ($page - 1) * $size, $size);
 		}
 		else
 		{
-			return $controller->createIndexFilter( $sort, $sortdir, ( $page - 1 ) * $size, $size );
+			return $controller->createIndexFilter($sort, $sortdir, ($page - 1) * $size, $size);
 		}
 	}
 
@@ -106,10 +106,10 @@ 
 	 */
 	protected function getCatalogController()
 	{
-		if( !isset( $this->controller ) )
+		if (!isset($this->controller))
 		{
 			$context = $this->getContext();
-			$this->controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+			$this->controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 		}
 
 		return $this->controller;
@@ -122,7 +122,7 @@ 
 	 * @param string $catId Category ID
 	 * @return string|array Cateogory ID or list of catetory IDs
 	 */
-	protected function getCatalogIds( $catId )
+	protected function getCatalogIds($catId)
 	{
 		$config = $this->getContext()->getConfig();
 		$default = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
@@ -156,12 +156,12 @@ 
 		 * @see client/html/catalog/lists/domains
 		 * @see client/html/catalog/lists/size
 		 */
-		$level = $config->get( 'client/html/catalog/lists/levels', $default );
+		$level = $config->get('client/html/catalog/lists/levels', $default);
 
-		if( $level != $default )
+		if ($level != $default)
 		{
-			$tree = $this->getCatalogController()->getCatalogTree( $catId, array(), $level );
-			$catId = $this->getCatalogIdsFromTree( $tree );
+			$tree = $this->getCatalogController()->getCatalogTree($catId, array(), $level);
+			$catId = $this->getCatalogIdsFromTree($tree);
 		}
 
 		return $catId;
@@ -174,12 +174,12 @@ 
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
 	 * @return array List of catalog IDs
 	 */
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
 	{
-		$list = array( $item->getId() );
+		$list = array($item->getId());
 
-		foreach( $item->getChildren() as $child ) {
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
+		foreach ($item->getChildren() as $child) {
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
 		}
 
 		return $list;
@@ -192,10 +192,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return array List of products implementing \Aimeos\MShop\Product\Item\Iface
 	 */
-	protected function getProductList( \Aimeos\MW\View\Iface $view )
+	protected function getProductList(\Aimeos\MW\View\Iface $view)
 	{
-		if( $this->productList === null ) {
-			$this->searchProducts( $view );
+		if ($this->productList === null) {
+			$this->searchProducts($view);
 		}
 
 		return $this->productList;
@@ -211,16 +211,16 @@ 
 	 * @param boolean $attrfilter True to include attribute criteria in product filter, false if not
 	 * @return \Aimeos\MW\Criteria\Iface Search criteria object
 	 */
-	protected function getProductListFilterByParam( array $params, $catfilter = true, $textfilter = true, $attrfilter = true )
+	protected function getProductListFilterByParam(array $params, $catfilter = true, $textfilter = true, $attrfilter = true)
 	{
 		$sortdir = '+';
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		$text = ( isset( $params['f_search'] ) ? (string) $params['f_search'] : '' );
-		$catid = ( isset( $params['f_catid'] ) ? (string) $params['f_catid'] : '' );
+		$text = (isset($params['f_search']) ? (string) $params['f_search'] : '');
+		$catid = (isset($params['f_catid']) ? (string) $params['f_catid'] : '');
 
-		if( $catid == '' && $catfilter === true )
+		if ($catid == '' && $catfilter === true)
 		{
 			/** client/html/catalog/lists/catid-default
 			 * The default category ID used if none is given as parameter
@@ -241,17 +241,17 @@ 
 			 * @see client/html/catalog/lists/levels
 			 * @see client/html/catalog/detail/prodid-default
 			 */
-			$catid = $config->get( 'client/html/catalog/lists/catid-default', '' );
+			$catid = $config->get('client/html/catalog/lists/catid-default', '');
 		}
 
-		$page = $this->getProductListPageByParam( $params );
-		$size = $this->getProductListSizeByParam( $params );
-		$sort = $this->getProductListSortByParam( $params, $sortdir );
+		$page = $this->getProductListPageByParam($params);
+		$size = $this->getProductListSizeByParam($params);
+		$sort = $this->getProductListSortByParam($params, $sortdir);
 
-		$filter = $this->createProductListFilter( $text, $catid, $sort, $sortdir, $page, $size, $catfilter, $textfilter );
+		$filter = $this->createProductListFilter($text, $catid, $sort, $sortdir, $page, $size, $catfilter, $textfilter);
 
-		if( $attrfilter === true ) {
-			$this->addAttributeFilterByParam( $params, $filter );
+		if ($attrfilter === true) {
+			$this->addAttributeFilterByParam($params, $filter);
 		}
 
 
@@ -268,9 +268,9 @@ 
 	 * @param boolean $attrfilter True to include attribute criteria in product filter, false if not
 	 * @return \Aimeos\MW\Criteria\Iface Search criteria object
 	 */
-	protected function getProductListFilter( \Aimeos\MW\View\Iface $view, $catfilter = true, $textfilter = true, $attrfilter = true )
+	protected function getProductListFilter(\Aimeos\MW\View\Iface $view, $catfilter = true, $textfilter = true, $attrfilter = true)
 	{
-		return $this->getProductListFilterByParam( $view->param(), $catfilter, $textfilter, $attrfilter );
+		return $this->getProductListFilterByParam($view->param(), $catfilter, $textfilter, $attrfilter);
 	}
 
 
@@ -280,10 +280,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Total number of products
 	 */
-	protected function getProductListTotal( \Aimeos\MW\View\Iface $view )
+	protected function getProductListTotal(\Aimeos\MW\View\Iface $view)
 	{
-		if( $this->productList === null ) {
-			$this->searchProducts( $view );
+		if ($this->productList === null) {
+			$this->searchProducts($view);
 		}
 
 		return $this->productTotal;
@@ -296,9 +296,9 @@ 
 	 * @param array $params Associative list of parameters that should be used for filtering
 	 * @return integer Page number starting from 1
 	 */
-	protected function getProductListPageByParam( array $params )
+	protected function getProductListPageByParam(array $params)
 	{
-		return ( isset( $params['l_page'] ) && $params['l_page'] > 0 ? (int) $params['l_page'] : 1 );
+		return (isset($params['l_page']) && $params['l_page'] > 0 ? (int) $params['l_page'] : 1);
 	}
 
 
@@ -308,9 +308,9 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Page number starting from 1
 	 */
-	protected function getProductListPage( \Aimeos\MW\View\Iface $view )
+	protected function getProductListPage(\Aimeos\MW\View\Iface $view)
 	{
-		return $this->getProductListPageByParam( $view->param() );
+		return $this->getProductListPageByParam($view->param());
 	}
 
 
@@ -320,7 +320,7 @@ 
 	 * @param array $params Associative list of parameters that should be used for filtering
 	 * @return integer Page size
 	 */
-	protected function getProductListSizeByParam( array $params )
+	protected function getProductListSizeByParam(array $params)
 	{
 		/** client/html/catalog/lists/size
 		 * The number of products shown in a list page
@@ -343,10 +343,10 @@ 
 		 * @see client/html/catalog/lists/domains
 		 * @see client/html/catalog/lists/levels
 		 */
-		$defaultSize = $this->getContext()->getConfig()->get( 'client/html/catalog/lists/size', 48 );
+		$defaultSize = $this->getContext()->getConfig()->get('client/html/catalog/lists/size', 48);
 
-		$size = ( isset( $params['l_size'] ) ? (int) $params['l_size'] : $defaultSize );
-		return ( $size < 1 || $size > 100 ? $defaultSize : $size );
+		$size = (isset($params['l_size']) ? (int) $params['l_size'] : $defaultSize);
+		return ($size < 1 || $size > 100 ? $defaultSize : $size);
 	}
 
 
@@ -356,9 +356,9 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Page size
 	 */
-	protected function getProductListSize( \Aimeos\MW\View\Iface $view )
+	protected function getProductListSize(\Aimeos\MW\View\Iface $view)
 	{
-		return $this->getProductListSizeByParam( $view->param() );
+		return $this->getProductListSizeByParam($view->param());
 	}
 
 
@@ -369,14 +369,14 @@ 
 	 * @param string &$sortdir Value-result parameter where the sort direction will be stored
 	 * @return string Sortation string (relevance, name, price)
 	 */
-	protected function getProductListSortByParam( array $params, &$sortdir )
+	protected function getProductListSortByParam(array $params, &$sortdir)
 	{
-		$sortation = ( isset( $params['f_sort'] ) ? (string) $params['f_sort'] : 'relevance' );
+		$sortation = (isset($params['f_sort']) ? (string) $params['f_sort'] : 'relevance');
 
-		$sortdir = ( $sortation[0] === '-' ? '-' : '+' );
-		$sort = ltrim( $sortation, '-' );
+		$sortdir = ($sortation[0] === '-' ? '-' : '+');
+		$sort = ltrim($sortation, '-');
 
-		return ( strlen( $sort ) > 0 ? $sort : 'relevance' );
+		return (strlen($sort) > 0 ? $sort : 'relevance');
 	}
 
 
@@ -387,9 +387,9 @@ 
 	 * @param string &$sortdir Value-result parameter where the sort direction will be stored
 	 * @return string Sortation string (relevance, name, price)
 	 */
-	protected function getProductListSort( \Aimeos\MW\View\Iface $view, &$sortdir )
+	protected function getProductListSort(\Aimeos\MW\View\Iface $view, &$sortdir)
 	{
-		return $this->getProductListSortByParam( $view->param(), $sortdir );
+		return $this->getProductListSortByParam($view->param(), $sortdir);
 	}
 
 
@@ -401,7 +401,7 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 */
-	protected function searchProducts( \Aimeos\MW\View\Iface $view )
+	protected function searchProducts(\Aimeos\MW\View\Iface $view)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
@@ -429,7 +429,7 @@ 
 		 * @see client/html/catalog/lists/size
 		 * @see client/html/catalog/lists/levels
 		 */
-		$domains = $config->get( 'client/html/catalog/domains', array( 'media', 'price', 'text' ) );
+		$domains = $config->get('client/html/catalog/domains', array('media', 'price', 'text'));
 
 		/** client/html/catalog/lists/domains
 		 * A list of domain names whose items should be available in the product list view template
@@ -456,11 +456,11 @@ 
 		 * @see client/html/catalog/lists/size
 		 * @see client/html/catalog/lists/levels
 		 */
-		$domains = $config->get( 'client/html/catalog/lists/domains', $domains );
+		$domains = $config->get('client/html/catalog/lists/domains', $domains);
 
 		$controller = $this->getCatalogController();
-		$productFilter = $this->getProductListFilter( $view );
+		$productFilter = $this->getProductListFilter($view);
 
-		$this->productList = $controller->getIndexItems( $productFilter, $domains, $this->productTotal );
+		$this->productList = $controller->getIndexItems($productFilter, $domains, $this->productTotal);
 	}
 }

client/html/src/Client/Html/Catalog/Session/Pinned/Standard.php

Spacing +47 added lines, -47 removed lines

@@ -68,7 +68,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();
 		$session = $context->getSession();
@@ -83,16 +83,16 @@ 
 		 * @category Developer
 		 * @see client/html/catalog/session#pinned
 		 */
-		$config = $context->getConfig()->get( 'client/html/catalog/session/pinned', array() );
-		$key = $this->getParamHash( array(), $uid . ':catalog:session-pinned-body', $config );
+		$config = $context->getConfig()->get('client/html/catalog/session/pinned', array());
+		$key = $this->getParamHash(array(), $uid.':catalog:session-pinned-body', $config);
 
-		if( ( $html = $session->get( $key ) ) === null )
+		if (($html = $session->get($key)) === null)
 		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
+			$view = $this->setViewParams($this->getView(), $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->pinnedBody = $output;
 
@@ -119,11 +119,11 @@ 
 			$tplconf = 'client/html/catalog/session/pinned/standard/template-body';
 			$default = 'catalog/session/pinned-body-default.php';
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
+			$html = $view->render($view->config($tplconf, $default));
 
-			$cached = $session->get( 'aimeos/catalog/session/pinned/cache', array() ) + array( $key => true );
-			$session->set( 'aimeos/catalog/session/pinned/cache', $cached );
-			$session->set( $key, $html );
+			$cached = $session->get('aimeos/catalog/session/pinned/cache', array()) + array($key => true);
+			$session->set('aimeos/catalog/session/pinned/cache', $cached);
+			$session->set($key, $html);
 		}
 
 		return $html;
@@ -138,21 +138,21 @@ 
 	 * @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();
 		$session = $context->getSession();
 
-		$config = $context->getConfig()->get( 'client/html/catalog/session/pinned', array() );
-		$key = $this->getParamHash( array(), $uid . ':catalog:session-pinned-header', $config );
+		$config = $context->getConfig()->get('client/html/catalog/session/pinned', array());
+		$key = $this->getParamHash(array(), $uid.':catalog:session-pinned-header', $config);
 
-		if( ( $html = $session->get( $key ) ) === null )
+		if (($html = $session->get($key)) === null)
 		{
-			$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->pinnedHeader = $output;
 
@@ -180,11 +180,11 @@ 
 			$tplconf = 'client/html/catalog/session/pinned/standard/template-header';
 			$default = 'catalog/session/pinned-header-default.php';
 
-			$html = $view->render( $view->config( $tplconf, $default ) );
+			$html = $view->render($view->config($tplconf, $default));
 
-			$cached = $session->get( 'aimeos/catalog/session/pinned/cache', array() ) + array( $key => true );
-			$session->set( 'aimeos/catalog/session/pinned/cache', $cached );
-			$session->set( $key, $html );
+			$cached = $session->get('aimeos/catalog/session/pinned/cache', array()) + array($key => true);
+			$session->set('aimeos/catalog/session/pinned/cache', $cached);
+			$session->set($key, $html);
 		}
 
 		return $html;
@@ -198,7 +198,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/session/pinned/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog session pinned html client
@@ -274,7 +274,7 @@ 
 		 * @see client/html/catalog/session/pinned/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/session/pinned/' . $type, $name );
+		return $this->createSubClient('catalog/session/pinned/'.$type, $name);
 	}
 
 
@@ -289,13 +289,13 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 		$session = $context->getSession();
-		$pinned = $session->get( 'aimeos/catalog/session/pinned/list', array() );
+		$pinned = $session->get('aimeos/catalog/session/pinned/list', array());
 
-		switch( $view->param( 'pin_action' ) )
+		switch ($view->param('pin_action'))
 		{
 			case 'add':
 
-				foreach( (array) $view->param( 'pin_id', array() ) as $id ) {
+				foreach ((array) $view->param('pin_id', array()) as $id) {
 					$pinned[$id] = $id;
 				}
 
@@ -316,16 +316,16 @@ 
 				 * @category User
 				 * @category Developer
 				 */
-				$max = $context->getConfig()->get( 'client/html/catalog/session/pinned/standard/maxitems', 50 );
+				$max = $context->getConfig()->get('client/html/catalog/session/pinned/standard/maxitems', 50);
 
-				$pinned = array_slice( $pinned, -$max, $max, true );
+				$pinned = array_slice($pinned, -$max, $max, true);
 				$refresh = true;
 				break;
 
 			case 'delete':
 
-				foreach( (array) $view->param( 'pin_id', array() ) as $id ) {
-					unset( $pinned[$id] );
+				foreach ((array) $view->param('pin_id', array()) as $id) {
+					unset($pinned[$id]);
 				}
 
 				$refresh = true;
@@ -333,12 +333,12 @@ 
 		}
 
 
-		if( $refresh )
+		if ($refresh)
 		{
-			$session->set( 'aimeos/catalog/session/pinned/list', $pinned );
+			$session->set('aimeos/catalog/session/pinned/list', $pinned);
 
-			foreach( $session->get( 'aimeos/catalog/session/pinned/cache', array() ) as $key => $value ) {
-				$session->set( $key, null );
+			foreach ($session->get('aimeos/catalog/session/pinned/cache', array()) as $key => $value) {
+				$session->set($key, null);
 			}
 		}
 
@@ -353,7 +353,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -365,9 +365,9 @@ 
 	 * @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))
 		{
 			$expire = null;
 			$tags = $items = array();
@@ -375,8 +375,8 @@ 
 			$config = $context->getConfig();
 			$session = $context->getSession();
 
-			$default = array( 'media', 'price', 'text' );
-			$domains = $config->get( 'client/html/catalog/domains', $default );
+			$default = array('media', 'price', 'text');
+			$domains = $config->get('client/html/catalog/domains', $default);
 
 			/** client/html/catalog/session/pinned/domains
 			 * A list of domain names whose items should be available in the pinned view template for the product
@@ -399,22 +399,22 @@ 
 			 * @see client/html/catalog/lists/domains
 			 * @see client/html/catalog/detail/domains
 			 */
-			$domains = $config->get( 'client/html/catalog/session/pinned/domains', $domains );
+			$domains = $config->get('client/html/catalog/session/pinned/domains', $domains);
 
-			$pinned = $session->get( 'aimeos/catalog/session/pinned/list', array() );
+			$pinned = $session->get('aimeos/catalog/session/pinned/list', array());
 
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-			$result = $controller->getProductItems( $pinned, $domains );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+			$result = $controller->getProductItems($pinned, $domains);
 
-			foreach( array_reverse( $pinned ) as $id )
+			foreach (array_reverse($pinned) as $id)
 			{
-				if( isset( $result[$id] ) ) {
+				if (isset($result[$id])) {
 					$items[$id] = $result[$id];
 				}
 			}
 
 			$view->pinnedProductItems = $items;
-			$view->pinnedParams = $this->getClientParams( $view->param() );
+			$view->pinnedParams = $this->getClientParams($view->param());
 
 			$this->cache = $view;
 		}

client/html/src/Client/Html/Catalog/Session/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/session/name
 		 * Class name of the used catalog session client implementation
@@ -66,22 +66,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/catalog/session/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/catalog/session/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Catalog\\Session\\' . $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\\Session\\'.$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\\Session\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Catalog\\Session\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'catalog/session' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'catalog/session');
 	}
 }
 

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

Spacing +42 added lines, -42 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'pinned', 'seen' );
+	private $subPartNames = array('pinned', 'seen');
 
 
 	/**
@@ -89,42 +89,42 @@ 
 	 * @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();
 		$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 )->getBody( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 			}
 			$view->sessionBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->sessionErrorList = $view->get('sessionErrorList', 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->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->sessionErrorList = $view->get('sessionErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->sessionErrorList = $view->get('sessionErrorList', 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->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->sessionErrorList = $view->get('sessionErrorList', array()) + $error;
 		}
 
 		/** client/html/catalog/session/standard/template-body
@@ -150,7 +150,7 @@ 
 		$tplconf = 'client/html/catalog/session/standard/template-body';
 		$default = 'catalog/session/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -162,15 +162,15 @@ 
 	 * @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)
 	{
 		try
 		{
-			$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->sessionHeader = $html;
 
@@ -198,11 +198,11 @@ 
 			$tplconf = 'client/html/catalog/session/standard/template-header';
 			$default = 'catalog/session/header-default.php';
 
-			return $view->render( $view->config( $tplconf, $default ) );
+			return $view->render($view->config($tplconf, $default));
 		}
-		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());
 		}
 	}
 
@@ -214,7 +214,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/session/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog session html client
@@ -290,7 +290,7 @@ 
 		 * @see client/html/catalog/session/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/session/' . $type, $name );
+		return $this->createSubClient('catalog/session/'.$type, $name);
 	}
 
 
@@ -305,32 +305,32 @@ 
 		{
 			parent::process();
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
 			$view = $this->getView();
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->sessionErrorList = $view->get('sessionErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
 			$view = $this->getView();
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->sessionErrorList = $view->get('sessionErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$view = $this->getView();
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->sessionErrorList = $view->get('sessionErrorList', 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());
 
 			$view = $this->getView();
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->sessionErrorList = $view->get('sessionErrorList', array()) + $error;
 		}
 	}
 
@@ -342,6 +342,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }