aimeos / ai-client-html

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

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +287 added lines, -287 removed lines

@@ -19,292 +19,292 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Basket\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Basket\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/standard/coupon/standard/subparts
-	 * List of HTML sub-clients rendered within the basket standard coupon section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/basket/standard/coupon/standard/subparts';
-	private $subPartNames = array();
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->couponBody = $html;
-
-		/** client/html/basket/standard/coupon/standard/template-body
-		 * Relative path to the HTML body template of the basket standard coupon client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/basket/standard/coupon/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/standard/coupon/standard/template-body';
-		$default = 'basket/standard/coupon-body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->couponHeader = $html;
-
-		/** client/html/basket/standard/coupon/standard/template-header
-		 * Relative path to the HTML header template of the basket standard coupon client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/basket/standard/coupon/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/standard/coupon/standard/template-header';
-		$default = 'basket/standard/coupon-header-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/basket/standard/coupon/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket standard coupon html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/basket/standard/coupon/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/coupon/decorators/global
-		 * @see client/html/basket/standard/coupon/decorators/local
-		 */
-
-		/** client/html/basket/standard/coupon/decorators/global
-		 * Adds a list of globally available decorators only to the basket standard coupon html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/basket/standard/coupon/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/coupon/decorators/excludes
-		 * @see client/html/basket/standard/coupon/decorators/local
-		 */
-
-		/** client/html/basket/standard/coupon/decorators/local
-		 * Adds a list of local decorators only to the basket standard coupon html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
-		 *
-		 *  client/html/basket/standard/coupon/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/coupon/decorators/excludes
-		 * @see client/html/basket/standard/coupon/decorators/global
-		 */
-		return $this->createSubClient( 'basket/standard/coupon/' . $type, $name );
-	}
-
-
-	/**
-	 * Processes the input, e.g. store given values.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$context = $this->getContext();
-
-		switch( $view->param( 'b_action' ) )
-		{
-			case 'coupon-delete':
-
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
-				{
-					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-					$cntl->deleteCoupon( $coupon );
-				}
-
-				break;
-
-			default:
-
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
-				{
-					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-
-					/** client/html/basket/standard/coupon/allowed
-					 * Number of coupon codes a customer is allowed to enter
-					 *
-					 * This configuration option enables shop owners to limit the number of coupon
-					 * codes that can be added by a customer to his current basket. By default, only
-					 * one coupon code is allowed per order.
-					 *
-					 * Coupon codes are valid until a payed order is placed by the customer. The
-					 * "count" of the codes is decreased afterwards. If codes are not personalized
-					 * the codes can be reused in the next order until their "count" reaches zero.
-					 *
-					 * @param integer Positive number of coupon codes including zero
-					 * @since 2014.05
-					 * @category User
-					 * @category Developer
-					 */
-					$allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 );
-
-					if( $allowed <= count( $cntl->get()->getCoupons() ) ) {
-						throw new \Aimeos\Client\Html\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
-					}
-
-					$cntl->addCoupon( $coupon );
-				}
-
-				break;
-		}
-
-		parent::process();
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /** client/html/basket/standard/coupon/standard/subparts
+     * List of HTML sub-clients rendered within the basket standard coupon section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/basket/standard/coupon/standard/subparts';
+    private $subPartNames = array();
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->couponBody = $html;
+
+        /** client/html/basket/standard/coupon/standard/template-body
+         * Relative path to the HTML body template of the basket standard coupon client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/basket/standard/coupon/standard/template-header
+         */
+        $tplconf = 'client/html/basket/standard/coupon/standard/template-body';
+        $default = 'basket/standard/coupon-body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->couponHeader = $html;
+
+        /** client/html/basket/standard/coupon/standard/template-header
+         * Relative path to the HTML header template of the basket standard coupon client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/basket/standard/coupon/standard/template-body
+         */
+        $tplconf = 'client/html/basket/standard/coupon/standard/template-header';
+        $default = 'basket/standard/coupon-header-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/basket/standard/coupon/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket standard coupon html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/basket/standard/coupon/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/coupon/decorators/global
+         * @see client/html/basket/standard/coupon/decorators/local
+         */
+
+        /** client/html/basket/standard/coupon/decorators/global
+         * Adds a list of globally available decorators only to the basket standard coupon html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/basket/standard/coupon/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/coupon/decorators/excludes
+         * @see client/html/basket/standard/coupon/decorators/local
+         */
+
+        /** client/html/basket/standard/coupon/decorators/local
+         * Adds a list of local decorators only to the basket standard coupon html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
+         *
+         *  client/html/basket/standard/coupon/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/coupon/decorators/excludes
+         * @see client/html/basket/standard/coupon/decorators/global
+         */
+        return $this->createSubClient( 'basket/standard/coupon/' . $type, $name );
+    }
+
+
+    /**
+     * Processes the input, e.g. store given values.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $context = $this->getContext();
+
+        switch( $view->param( 'b_action' ) )
+        {
+            case 'coupon-delete':
+
+                if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+                {
+                    $this->clearCached();
+                    $cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+                    $cntl->deleteCoupon( $coupon );
+                }
+
+                break;
+
+            default:
+
+                if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+                {
+                    $this->clearCached();
+                    $cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+
+                    /** client/html/basket/standard/coupon/allowed
+                     * Number of coupon codes a customer is allowed to enter
+                     *
+                     * This configuration option enables shop owners to limit the number of coupon
+                     * codes that can be added by a customer to his current basket. By default, only
+                     * one coupon code is allowed per order.
+                     *
+                     * Coupon codes are valid until a payed order is placed by the customer. The
+                     * "count" of the codes is decreased afterwards. If codes are not personalized
+                     * the codes can be reused in the next order until their "count" reaches zero.
+                     *
+                     * @param integer Positive number of coupon codes including zero
+                     * @since 2014.05
+                     * @category User
+                     * @category Developer
+                     */
+                    $allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 );
+
+                    if( $allowed <= count( $cntl->get()->getCoupons() ) ) {
+                        throw new \Aimeos\Client\Html\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
+                    }
+
+                    $cntl->addCoupon( $coupon );
+                }
+
+                break;
+        }
+
+        parent::process();
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 }
\ No newline at end of file

Spacing +23 added lines, -23 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->couponBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/basket/standard/coupon/standard/template-body';
 		$default = 'basket/standard/coupon-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->couponHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/basket/standard/coupon/standard/template-header';
 		$default = 'basket/standard/coupon-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/basket/standard/coupon/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket standard coupon html client
@@ -232,7 +232,7 @@ 
 		 * @see client/html/basket/standard/coupon/decorators/excludes
 		 * @see client/html/basket/standard/coupon/decorators/global
 		 */
-		return $this->createSubClient( 'basket/standard/coupon/' . $type, $name );
+		return $this->createSubClient('basket/standard/coupon/'.$type, $name);
 	}
 
 
@@ -246,25 +246,25 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		switch( $view->param( 'b_action' ) )
+		switch ($view->param('b_action'))
 		{
 			case 'coupon-delete':
 
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+				if (($coupon = $view->param('b_coupon')) != '')
 				{
 					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-					$cntl->deleteCoupon( $coupon );
+					$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+					$cntl->deleteCoupon($coupon);
 				}
 
 				break;
 
 			default:
 
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+				if (($coupon = $view->param('b_coupon')) != '')
 				{
 					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+					$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
 					/** client/html/basket/standard/coupon/allowed
 					 * Number of coupon codes a customer is allowed to enter
@@ -282,13 +282,13 @@ 
 					 * @category User
 					 * @category Developer
 					 */
-					$allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 );
+					$allowed = $context->getConfig()->get('client/html/basket/standard/coupon/allowed', 1);
 
-					if( $allowed <= count( $cntl->get()->getCoupons() ) ) {
-						throw new \Aimeos\Client\Html\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
+					if ($allowed <= count($cntl->get()->getCoupons())) {
+						throw new \Aimeos\Client\Html\Exception(sprintf('Number of coupon codes exceeds the limit'));
 					}
 
-					$cntl->addCoupon( $coupon );
+					$cntl->addCoupon($coupon);
 				}
 
 				break;
@@ -305,6 +305,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/Standard/Detail/Standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +240 added lines, -240 removed lines

@@ -19,268 +19,268 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Summary\Detail\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Summary\Detail\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/standard/detail/standard/subparts
-	 * List of HTML sub-clients rendered within the basket standard detail section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2015.11
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/basket/standard/detail/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/basket/standard/detail/standard/subparts
+     * List of HTML sub-clients rendered within the basket standard detail section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2015.11
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/basket/standard/detail/standard/subparts';
+    private $subPartNames = array();
+    private $cache;
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->detailBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->detailBody = $html;
 
-		/** client/html/basket/standard/detail/standard/template-body
-		 * Relative path to the HTML body template of the basket standard detail client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * (second one) should be replaced by the name of the new class in lower
-		 * case.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2015.11
-		 * @category Developer
-		 * @see client/html/basket/standard/detail/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/standard/detail/standard/template-body';
-		$default = 'common/summary/detail-body-default.php';
+        /** client/html/basket/standard/detail/standard/template-body
+         * Relative path to the HTML body template of the basket standard detail client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * (second one) should be replaced by the name of the new class in lower
+         * case.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2015.11
+         * @category Developer
+         * @see client/html/basket/standard/detail/standard/template-header
+         */
+        $tplconf = 'client/html/basket/standard/detail/standard/template-body';
+        $default = 'common/summary/detail-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->detailHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->detailHeader = $html;
 
-		/** client/html/basket/standard/detail/standard/template-header
-		 * Relative path to the HTML header template of the basket standard detail client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * (second one) should be replaced by the name of the new class in lower
-		 * case.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2015.11
-		 * @category Developer
-		 * @see client/html/basket/standard/detail/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/standard/detail/standard/template-header';
-		$default = 'common/summary/detail-header-default.php';
+        /** client/html/basket/standard/detail/standard/template-header
+         * Relative path to the HTML header template of the basket standard detail client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * (second one) should be replaced by the name of the new class in lower
+         * case.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2015.11
+         * @category Developer
+         * @see client/html/basket/standard/detail/standard/template-body
+         */
+        $tplconf = 'client/html/basket/standard/detail/standard/template-header';
+        $default = 'common/summary/detail-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/basket/standard/detail/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket standard detail html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/basket/standard/detail/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/detail/decorators/global
-		 * @see client/html/basket/standard/detail/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/basket/standard/detail/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket standard detail html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/basket/standard/detail/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/detail/decorators/global
+         * @see client/html/basket/standard/detail/decorators/local
+         */
 
-		/** client/html/basket/standard/detail/decorators/global
-		 * Adds a list of globally available decorators only to the basket standard detail html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/basket/standard/detail/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/detail/decorators/excludes
-		 * @see client/html/basket/standard/detail/decorators/local
-		 */
+        /** client/html/basket/standard/detail/decorators/global
+         * Adds a list of globally available decorators only to the basket standard detail html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/basket/standard/detail/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/detail/decorators/excludes
+         * @see client/html/basket/standard/detail/decorators/local
+         */
 
-		/** client/html/basket/standard/detail/decorators/local
-		 * Adds a list of local decorators only to the basket standard detail html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
-		 *
-		 *  client/html/basket/standard/detail/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/detail/decorators/excludes
-		 * @see client/html/basket/standard/detail/decorators/global
-		 */
-		return $this->createSubClient( 'basket/standard/detail/' . $type, $name );
-	}
+        /** client/html/basket/standard/detail/decorators/local
+         * Adds a list of local decorators only to the basket standard detail html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
+         *
+         *  client/html/basket/standard/detail/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/detail/decorators/excludes
+         * @see client/html/basket/standard/detail/decorators/global
+         */
+        return $this->createSubClient( 'basket/standard/detail/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 
 
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = parent::setViewParams( $view );
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = parent::setViewParams( $view );
 
-		if( !isset( $this->cache ) )
-		{
-			$basket = $view->standardBasket;
+        if( !isset( $this->cache ) )
+        {
+            $basket = $view->standardBasket;
 
-			$target = $view->config( 'client/html/checkout/standard/url/target' );
-			$cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
-			$action = $view->config( 'client/html/checkout/standard/url/action', 'index' );
-			$config = $view->config( 'client/html/checkout/standard/url/config', array() );
+            $target = $view->config( 'client/html/checkout/standard/url/target' );
+            $cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
+            $action = $view->config( 'client/html/checkout/standard/url/action', 'index' );
+            $config = $view->config( 'client/html/checkout/standard/url/config', array() );
 
-			$view->summaryParams = $view->get( 'standardParams', array() );
-			$view->summaryUrlServicePayment = $view->url( $target, $cntl, $action, array( 'c_step' => 'payment' ), array(), $config );
-			$view->summaryUrlServiceDelivery = $view->url( $target, $cntl, $action, array( 'c_step' => 'delivery' ), array(), $config );
-			$view->summaryTaxRates = $this->getTaxRates( $basket );
-			$view->summaryEnableModify = true;
-			$view->summaryBasket = $basket;
+            $view->summaryParams = $view->get( 'standardParams', array() );
+            $view->summaryUrlServicePayment = $view->url( $target, $cntl, $action, array( 'c_step' => 'payment' ), array(), $config );
+            $view->summaryUrlServiceDelivery = $view->url( $target, $cntl, $action, array( 'c_step' => 'delivery' ), array(), $config );
+            $view->summaryTaxRates = $this->getTaxRates( $basket );
+            $view->summaryEnableModify = true;
+            $view->summaryBasket = $basket;
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +24 added lines, -24 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->detailBody = $html;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/basket/standard/detail/standard/template-body';
 		$default = 'common/summary/detail-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -114,13 +114,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->detailHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/basket/standard/detail/standard/template-header';
 		$default = 'common/summary/detail-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/basket/standard/detail/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket standard detail html client
@@ -235,7 +235,7 @@ 
 		 * @see client/html/basket/standard/detail/decorators/excludes
 		 * @see client/html/basket/standard/detail/decorators/global
 		 */
-		return $this->createSubClient( 'basket/standard/detail/' . $type, $name );
+		return $this->createSubClient('basket/standard/detail/'.$type, $name);
 	}
 
 
@@ -246,7 +246,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -258,23 +258,23 @@ 
 	 * @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)
 	{
-		$view = parent::setViewParams( $view );
+		$view = parent::setViewParams($view);
 
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$basket = $view->standardBasket;
 
-			$target = $view->config( 'client/html/checkout/standard/url/target' );
-			$cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
-			$action = $view->config( 'client/html/checkout/standard/url/action', 'index' );
-			$config = $view->config( 'client/html/checkout/standard/url/config', array() );
+			$target = $view->config('client/html/checkout/standard/url/target');
+			$cntl = $view->config('client/html/checkout/standard/url/controller', 'checkout');
+			$action = $view->config('client/html/checkout/standard/url/action', 'index');
+			$config = $view->config('client/html/checkout/standard/url/config', array());
 
-			$view->summaryParams = $view->get( 'standardParams', array() );
-			$view->summaryUrlServicePayment = $view->url( $target, $cntl, $action, array( 'c_step' => 'payment' ), array(), $config );
-			$view->summaryUrlServiceDelivery = $view->url( $target, $cntl, $action, array( 'c_step' => 'delivery' ), array(), $config );
-			$view->summaryTaxRates = $this->getTaxRates( $basket );
+			$view->summaryParams = $view->get('standardParams', array());
+			$view->summaryUrlServicePayment = $view->url($target, $cntl, $action, array('c_step' => 'payment'), array(), $config);
+			$view->summaryUrlServiceDelivery = $view->url($target, $cntl, $action, array('c_step' => 'delivery'), array(), $config);
+			$view->summaryTaxRates = $this->getTaxRates($basket);
 			$view->summaryEnableModify = true;
 			$view->summaryBasket = $basket;
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +531 added lines, -531 removed lines

@@ -19,536 +19,536 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Basket\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Basket\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/standard/standard/subparts
-	 * List of HTML sub-clients rendered within the basket standard section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/basket/standard/standard/subparts';
-
-	/** client/html/basket/standard/detail/name
-	 * Name of the detail part used by the basket standard detail client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\Detail\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2014.03
-	 * @category Developer
-	 */
-
-	/** client/html/basket/standard/coupon/name
-	 * Name of the detail part used by the basket standard coupon client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\Detail\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartNames = array( 'detail', 'coupon' );
-	private $cache;
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$context = $this->getContext();
-		$view = $this->getView();
-
-		try
-		{
-			$view = $this->setViewParams( $view, $tags, $expire );
-
-			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-			}
-			$view->standardBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
-		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-
-		/** client/html/basket/standard/standard/template-body
-		 * Relative path to the HTML body template of the basket standard client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/basket/standard/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/standard/standard/template-body';
-		$default = 'basket/standard/body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		try
-		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-			}
-			$view->standardHeader = $html;
-		}
-		catch( \Exception $e )
-		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-			return '';
-		}
-
-		/** client/html/basket/standard/standard/template-header
-		 * Relative path to the HTML header template of the basket standard client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/basket/standard/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/standard/standard/template-header';
-		$default = 'basket/standard/header-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/basket/standard/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket standard html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/basket/standard/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/decorators/global
-		 * @see client/html/basket/standard/decorators/local
-		 */
-
-		/** client/html/basket/standard/decorators/global
-		 * Adds a list of globally available decorators only to the basket standard html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/basket/standard/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/decorators/excludes
-		 * @see client/html/basket/standard/decorators/local
-		 */
-
-		/** client/html/basket/standard/decorators/local
-		 * Adds a list of local decorators only to the basket standard html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
-		 *
-		 *  client/html/basket/standard/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/decorators/excludes
-		 * @see client/html/basket/standard/decorators/global
-		 */
-
-		return $this->createSubClient( 'basket/standard/' . $type, $name );
-	}
-
-
-	/**
-	 * Sets the necessary parameter values in the view.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$context = $this->getContext();
-
-		try
-		{
-			$options = array(
-
-				/** client/html/basket/require-stock
-				 * Customers can order products only if there are enough products in stock
-				 *
-				 * Checks that the requested product quantity is in stock before
-				 * the customer can add them to his basket and order them. If there
-				 * are not enough products available, the customer will get a notice.
-				 *
-				 * @param boolean True if products must be in stock, false if products can be sold without stock
-				 * @since 2014.03
-				 * @category Developer
-				 * @category User
-				 */
-				'stock' => $view->config( 'client/html/basket/require-stock', true ),
-
-				/** client/html/basket/require-variant
-				 * A variant of a selection product must be chosen
-				 *
-				 * Selection products normally consist of several article variants and by default
-				 * exactly one article variant of a selection product can be put into the basket.
-				 *
-				 * By setting this option to false, the selection product including the chosen
-				 * attributes (if any attribute values were selected) can be put into the basket
-				 * as well. This makes it possible to get all articles or a subset of articles
-				 * (e.g. all of a color) at once.
-				 *
-				 * @param boolean True if a variant must be chosen, false if also the selection product with attributes can be added
-				 * @since 2014.03
-				 * @category Developer
-				 * @category User
-				 */
-				'variant' => $view->config( 'client/html/basket/require-variant', true ),
-			);
-
-			switch( $view->param( 'b_action' ) )
-			{
-				case 'add':
-					$this->addProducts( $view, $options );
-					break;
-				case 'delete':
-					$this->deleteProducts( $view );
-					break;
-				default:
-					$this->editProducts( $view, $options );
-			}
-
-			parent::process();
-
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
-		{
-			$errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
-
-			$view->summaryErrorCodes = $e->getErrorCodes();
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
-		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
-
-
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$context = $this->getContext();
-			$site = $context->getLocale()->getSite()->getCode();
-
-			if( ( $params = $context->getSession()->get( 'aimeos/catalog/detail/params/last' . $site ) ) !== null )
-			{
-				$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() );
-			}
-			else
-			{
-				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
-
-				$target = $view->config( 'client/html/catalog/lists/url/target' );
-				$controller = $view->config( 'client/html/catalog/lists/url/controller', 'catalog' );
-				$action = $view->config( 'client/html/catalog/lists/url/action', 'list' );
-				$config = $view->config( 'client/html/catalog/lists/url/config', array() );
-
-			}
-
-			if( empty( $params ) === false )
-			{
-				$view->standardParams = $this->getClientParams( $view->param() );
-				$view->standardBackUrl = $view->url( $target, $controller, $action, $params, array(), $config );
-			}
-
-			$view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->get();
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
-
-
-	/**
-	 * Adds the products specified by the view parameters to the basket.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $options List of options for addProducts() in basket controller
-	 */
-	protected function addProducts( \Aimeos\MW\View\Iface $view, array $options )
-	{
-		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-
-		if( ( $prodid = $view->param( 'b_prodid', '' ) ) !== '' )
-		{
-			$products[] = array(
-				'prodid' => $prodid,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrvarid' => array_filter( (array) $view->param( 'b_attrvarid', array() ) ),
-				'attrconfid' => array_filter( (array) $view->param( 'b_attrconfid', array() ) ),
-				'attrhideid' => array_filter( (array) $view->param( 'b_attrhideid', array() ) ),
-				'attrcustid' => array_filter( (array) $view->param( 'b_attrcustid', array() ) ),
-				'warehouse' => $view->param( 'b_warehouse', 'default' ),
-			);
-		}
-
-		foreach( $products as $values ) {
-			$this->addProduct( $controller, $values, $options );
-		}
-	}
-
-
-	/**
-	 * Adds a single product specified by its values to the basket.
-	 *
-	 * @param \Aimeos\Controller\Frontend\Iface $controller Basket frontend controller
-	 * @param array $values Associative list of key/value pairs from the view specifying the product
-	 * @param array $options List of options for addProducts() in basket frontend controller
-	 */
-	protected function addProduct( \Aimeos\Controller\Frontend\Iface $controller, array $values, array $options )
-	{
-		$controller->addProduct(
-			( isset( $values['prodid'] ) ? (string) $values['prodid'] : '' ),
-			( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
-			$options,
-			( isset( $values['attrvarid'] ) ? array_filter( (array) $values['attrvarid'] ) : array() ),
-			( isset( $values['attrconfid'] ) ? array_filter( (array) $values['attrconfid'] ) : array() ),
-			( isset( $values['attrhideid'] ) ? array_filter( (array) $values['attrhideid'] ) : array() ),
-			( isset( $values['attrcustid'] ) ? array_filter( (array) $values['attrcustid'] ) : array() ),
-			( isset( $values['warehouse'] ) ? (string) $values['warehouse'] : 'default' )
-		);
-	}
-
-
-	/**
-	 * Removes the products specified by the view parameters from the basket.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 */
-	protected function deleteProducts( \Aimeos\MW\View\Iface $view )
-	{
-		$this->clearCached();
-		$products = (array) $view->param( 'b_position', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-
-		foreach( $products as $position ) {
-			$controller->deleteProduct( $position );
-		}
-	}
-
-
-	/**
-	 * Edits the products specified by the view parameters to the basket.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $options List of options for editProducts() in basket controller
-	 */
-	protected function editProducts( \Aimeos\MW\View\Iface $view, array $options )
-	{
-		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-
-		if( ( $position = $view->param( 'b_position', '' ) ) !== '' )
-		{
-			$products[] = array(
-				'position' => $position,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrconf-code' => array_filter( (array) $view->param( 'b_attrconfcode', array() ) )
-			);
-		}
-
-		foreach( $products as $values )
-		{
-			$controller->editProduct(
-				( isset( $values['position'] ) ? (int) $values['position'] : 0 ),
-				( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
-				$options,
-				( isset( $values['attrconf-code'] ) ? array_filter( (array) $values['attrconf-code'] ) : array() )
-			);
-		}
-	}
+    /** client/html/basket/standard/standard/subparts
+     * List of HTML sub-clients rendered within the basket standard section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/basket/standard/standard/subparts';
+
+    /** client/html/basket/standard/detail/name
+     * Name of the detail part used by the basket standard detail client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\Detail\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2014.03
+     * @category Developer
+     */
+
+    /** client/html/basket/standard/coupon/name
+     * Name of the detail part used by the basket standard coupon client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\Detail\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartNames = array( 'detail', 'coupon' );
+    private $cache;
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $context = $this->getContext();
+        $view = $this->getView();
+
+        try
+        {
+            $view = $this->setViewParams( $view, $tags, $expire );
+
+            $html = '';
+            foreach( $this->getSubClients() as $subclient ) {
+                $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+            }
+            $view->standardBody = $html;
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Exception $e )
+        {
+            $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+
+            $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+
+        /** client/html/basket/standard/standard/template-body
+         * Relative path to the HTML body template of the basket standard client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/basket/standard/standard/template-header
+         */
+        $tplconf = 'client/html/basket/standard/standard/template-body';
+        $default = 'basket/standard/body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        try
+        {
+            $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+            $html = '';
+            foreach( $this->getSubClients() as $subclient ) {
+                $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+            }
+            $view->standardHeader = $html;
+        }
+        catch( \Exception $e )
+        {
+            $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+            return '';
+        }
+
+        /** client/html/basket/standard/standard/template-header
+         * Relative path to the HTML header template of the basket standard client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/basket/standard/standard/template-body
+         */
+        $tplconf = 'client/html/basket/standard/standard/template-header';
+        $default = 'basket/standard/header-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/basket/standard/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket standard html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/basket/standard/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/decorators/global
+         * @see client/html/basket/standard/decorators/local
+         */
+
+        /** client/html/basket/standard/decorators/global
+         * Adds a list of globally available decorators only to the basket standard html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/basket/standard/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/decorators/excludes
+         * @see client/html/basket/standard/decorators/local
+         */
+
+        /** client/html/basket/standard/decorators/local
+         * Adds a list of local decorators only to the basket standard html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
+         *
+         *  client/html/basket/standard/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/decorators/excludes
+         * @see client/html/basket/standard/decorators/global
+         */
+
+        return $this->createSubClient( 'basket/standard/' . $type, $name );
+    }
+
+
+    /**
+     * Sets the necessary parameter values in the view.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $context = $this->getContext();
+
+        try
+        {
+            $options = array(
+
+                /** client/html/basket/require-stock
+                 * Customers can order products only if there are enough products in stock
+                 *
+                 * Checks that the requested product quantity is in stock before
+                 * the customer can add them to his basket and order them. If there
+                 * are not enough products available, the customer will get a notice.
+                 *
+                 * @param boolean True if products must be in stock, false if products can be sold without stock
+                 * @since 2014.03
+                 * @category Developer
+                 * @category User
+                 */
+                'stock' => $view->config( 'client/html/basket/require-stock', true ),
+
+                /** client/html/basket/require-variant
+                 * A variant of a selection product must be chosen
+                 *
+                 * Selection products normally consist of several article variants and by default
+                 * exactly one article variant of a selection product can be put into the basket.
+                 *
+                 * By setting this option to false, the selection product including the chosen
+                 * attributes (if any attribute values were selected) can be put into the basket
+                 * as well. This makes it possible to get all articles or a subset of articles
+                 * (e.g. all of a color) at once.
+                 *
+                 * @param boolean True if a variant must be chosen, false if also the selection product with attributes can be added
+                 * @since 2014.03
+                 * @category Developer
+                 * @category User
+                 */
+                'variant' => $view->config( 'client/html/basket/require-variant', true ),
+            );
+
+            switch( $view->param( 'b_action' ) )
+            {
+                case 'add':
+                    $this->addProducts( $view, $options );
+                    break;
+                case 'delete':
+                    $this->deleteProducts( $view );
+                    break;
+                default:
+                    $this->editProducts( $view, $options );
+            }
+
+            parent::process();
+
+            $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+            $controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+        {
+            $errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
+
+            $view->summaryErrorCodes = $e->getErrorCodes();
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Exception $e )
+        {
+            $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+
+            $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
+
+
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $context = $this->getContext();
+            $site = $context->getLocale()->getSite()->getCode();
+
+            if( ( $params = $context->getSession()->get( 'aimeos/catalog/detail/params/last' . $site ) ) !== null )
+            {
+                $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() );
+            }
+            else
+            {
+                $params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
+
+                $target = $view->config( 'client/html/catalog/lists/url/target' );
+                $controller = $view->config( 'client/html/catalog/lists/url/controller', 'catalog' );
+                $action = $view->config( 'client/html/catalog/lists/url/action', 'list' );
+                $config = $view->config( 'client/html/catalog/lists/url/config', array() );
+
+            }
+
+            if( empty( $params ) === false )
+            {
+                $view->standardParams = $this->getClientParams( $view->param() );
+                $view->standardBackUrl = $view->url( $target, $controller, $action, $params, array(), $config );
+            }
+
+            $view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->get();
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
+
+
+    /**
+     * Adds the products specified by the view parameters to the basket.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $options List of options for addProducts() in basket controller
+     */
+    protected function addProducts( \Aimeos\MW\View\Iface $view, array $options )
+    {
+        $this->clearCached();
+        $products = (array) $view->param( 'b_prod', array() );
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+
+        if( ( $prodid = $view->param( 'b_prodid', '' ) ) !== '' )
+        {
+            $products[] = array(
+                'prodid' => $prodid,
+                'quantity' => $view->param( 'b_quantity', 1 ),
+                'attrvarid' => array_filter( (array) $view->param( 'b_attrvarid', array() ) ),
+                'attrconfid' => array_filter( (array) $view->param( 'b_attrconfid', array() ) ),
+                'attrhideid' => array_filter( (array) $view->param( 'b_attrhideid', array() ) ),
+                'attrcustid' => array_filter( (array) $view->param( 'b_attrcustid', array() ) ),
+                'warehouse' => $view->param( 'b_warehouse', 'default' ),
+            );
+        }
+
+        foreach( $products as $values ) {
+            $this->addProduct( $controller, $values, $options );
+        }
+    }
+
+
+    /**
+     * Adds a single product specified by its values to the basket.
+     *
+     * @param \Aimeos\Controller\Frontend\Iface $controller Basket frontend controller
+     * @param array $values Associative list of key/value pairs from the view specifying the product
+     * @param array $options List of options for addProducts() in basket frontend controller
+     */
+    protected function addProduct( \Aimeos\Controller\Frontend\Iface $controller, array $values, array $options )
+    {
+        $controller->addProduct(
+            ( isset( $values['prodid'] ) ? (string) $values['prodid'] : '' ),
+            ( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+            $options,
+            ( isset( $values['attrvarid'] ) ? array_filter( (array) $values['attrvarid'] ) : array() ),
+            ( isset( $values['attrconfid'] ) ? array_filter( (array) $values['attrconfid'] ) : array() ),
+            ( isset( $values['attrhideid'] ) ? array_filter( (array) $values['attrhideid'] ) : array() ),
+            ( isset( $values['attrcustid'] ) ? array_filter( (array) $values['attrcustid'] ) : array() ),
+            ( isset( $values['warehouse'] ) ? (string) $values['warehouse'] : 'default' )
+        );
+    }
+
+
+    /**
+     * Removes the products specified by the view parameters from the basket.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     */
+    protected function deleteProducts( \Aimeos\MW\View\Iface $view )
+    {
+        $this->clearCached();
+        $products = (array) $view->param( 'b_position', array() );
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+
+        foreach( $products as $position ) {
+            $controller->deleteProduct( $position );
+        }
+    }
+
+
+    /**
+     * Edits the products specified by the view parameters to the basket.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $options List of options for editProducts() in basket controller
+     */
+    protected function editProducts( \Aimeos\MW\View\Iface $view, array $options )
+    {
+        $this->clearCached();
+        $products = (array) $view->param( 'b_prod', array() );
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+
+        if( ( $position = $view->param( 'b_position', '' ) ) !== '' )
+        {
+            $products[] = array(
+                'position' => $position,
+                'quantity' => $view->param( 'b_quantity', 1 ),
+                'attrconf-code' => array_filter( (array) $view->param( 'b_attrconfcode', array() ) )
+            );
+        }
+
+        foreach( $products as $values )
+        {
+            $controller->editProduct(
+                ( isset( $values['position'] ) ? (int) $values['position'] : 0 ),
+                ( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+                $options,
+                ( isset( $values['attrconf-code'] ) ? array_filter( (array) $values['attrconf-code'] ) : array() )
+            );
+        }
+    }
 }
\ No newline at end of file

Spacing +105 added lines, -105 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'detail', 'coupon' );
+	private $subPartNames = array('detail', 'coupon');
 	private $cache;
 
 
@@ -90,42 +90,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->standardBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
 
 		/** client/html/basket/standard/standard/template-body
@@ -151,7 +151,7 @@ 
 		$tplconf = 'client/html/basket/standard/standard/template-body';
 		$default = 'basket/standard/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -163,21 +163,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)
 	{
 		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->standardHeader = $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());
 			return '';
 		}
 
@@ -205,7 +205,7 @@ 
 		$tplconf = 'client/html/basket/standard/standard/template-header';
 		$default = 'basket/standard/header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -216,7 +216,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/standard/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket standard html client
@@ -292,7 +292,7 @@ 
 		 * @see client/html/basket/standard/decorators/global
 		 */
 
-		return $this->createSubClient( 'basket/standard/' . $type, $name );
+		return $this->createSubClient('basket/standard/'.$type, $name);
 	}
 
 
@@ -320,7 +320,7 @@ 
 				 * @category Developer
 				 * @category User
 				 */
-				'stock' => $view->config( 'client/html/basket/require-stock', true ),
+				'stock' => $view->config('client/html/basket/require-stock', true),
 
 				/** client/html/basket/require-variant
 				 * A variant of a selection product must be chosen
@@ -338,55 +338,55 @@ 
 				 * @category Developer
 				 * @category User
 				 */
-				'variant' => $view->config( 'client/html/basket/require-variant', true ),
+				'variant' => $view->config('client/html/basket/require-variant', true),
 			);
 
-			switch( $view->param( 'b_action' ) )
+			switch ($view->param('b_action'))
 			{
 				case 'add':
-					$this->addProducts( $view, $options );
+					$this->addProducts($view, $options);
 					break;
 				case 'delete':
-					$this->deleteProducts( $view );
+					$this->deleteProducts($view);
 					break;
 				default:
-					$this->editProducts( $view, $options );
+					$this->editProducts($view, $options);
 			}
 
 			parent::process();
 
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+			$controller->get()->check(\Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT);
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+		catch (\Aimeos\MShop\Plugin\Provider\Exception $e)
 		{
-			$errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
+			$errors = array($context->getI18n()->dt('mshop', $e->getMessage()));
+			$errors = array_merge($errors, $this->translatePluginErrorCodes($e->getErrorCodes()));
 
 			$view->summaryErrorCodes = $e->getErrorCodes();
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $errors;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
 	}
 
@@ -398,7 +398,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -410,38 +410,38 @@ 
 	 * @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))
 		{
 			$context = $this->getContext();
 			$site = $context->getLocale()->getSite()->getCode();
 
-			if( ( $params = $context->getSession()->get( 'aimeos/catalog/detail/params/last' . $site ) ) !== null )
+			if (($params = $context->getSession()->get('aimeos/catalog/detail/params/last'.$site)) !== null)
 			{
-				$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());
 			}
 			else
 			{
-				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
+				$params = $context->getSession()->get('aimeos/catalog/lists/params/last'.$site, array());
 
-				$target = $view->config( 'client/html/catalog/lists/url/target' );
-				$controller = $view->config( 'client/html/catalog/lists/url/controller', 'catalog' );
-				$action = $view->config( 'client/html/catalog/lists/url/action', 'list' );
-				$config = $view->config( 'client/html/catalog/lists/url/config', array() );
+				$target = $view->config('client/html/catalog/lists/url/target');
+				$controller = $view->config('client/html/catalog/lists/url/controller', 'catalog');
+				$action = $view->config('client/html/catalog/lists/url/action', 'list');
+				$config = $view->config('client/html/catalog/lists/url/config', array());
 
 			}
 
-			if( empty( $params ) === false )
+			if (empty($params) === false)
 			{
-				$view->standardParams = $this->getClientParams( $view->param() );
-				$view->standardBackUrl = $view->url( $target, $controller, $action, $params, array(), $config );
+				$view->standardParams = $this->getClientParams($view->param());
+				$view->standardBackUrl = $view->url($target, $controller, $action, $params, array(), $config);
 			}
 
-			$view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->get();
+			$view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket')->get();
 
 			$this->cache = $view;
 		}
@@ -456,27 +456,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param array $options List of options for addProducts() in basket controller
 	 */
-	protected function addProducts( \Aimeos\MW\View\Iface $view, array $options )
+	protected function addProducts(\Aimeos\MW\View\Iface $view, array $options)
 	{
 		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+		$products = (array) $view->param('b_prod', array());
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
-		if( ( $prodid = $view->param( 'b_prodid', '' ) ) !== '' )
+		if (($prodid = $view->param('b_prodid', '')) !== '')
 		{
 			$products[] = array(
 				'prodid' => $prodid,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrvarid' => array_filter( (array) $view->param( 'b_attrvarid', array() ) ),
-				'attrconfid' => array_filter( (array) $view->param( 'b_attrconfid', array() ) ),
-				'attrhideid' => array_filter( (array) $view->param( 'b_attrhideid', array() ) ),
-				'attrcustid' => array_filter( (array) $view->param( 'b_attrcustid', array() ) ),
-				'warehouse' => $view->param( 'b_warehouse', 'default' ),
+				'quantity' => $view->param('b_quantity', 1),
+				'attrvarid' => array_filter((array) $view->param('b_attrvarid', array())),
+				'attrconfid' => array_filter((array) $view->param('b_attrconfid', array())),
+				'attrhideid' => array_filter((array) $view->param('b_attrhideid', array())),
+				'attrcustid' => array_filter((array) $view->param('b_attrcustid', array())),
+				'warehouse' => $view->param('b_warehouse', 'default'),
 			);
 		}
 
-		foreach( $products as $values ) {
-			$this->addProduct( $controller, $values, $options );
+		foreach ($products as $values) {
+			$this->addProduct($controller, $values, $options);
 		}
 	}
 
@@ -488,17 +488,17 @@ 
 	 * @param array $values Associative list of key/value pairs from the view specifying the product
 	 * @param array $options List of options for addProducts() in basket frontend controller
 	 */
-	protected function addProduct( \Aimeos\Controller\Frontend\Iface $controller, array $values, array $options )
+	protected function addProduct(\Aimeos\Controller\Frontend\Iface $controller, array $values, array $options)
 	{
 		$controller->addProduct(
-			( isset( $values['prodid'] ) ? (string) $values['prodid'] : '' ),
-			( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+			(isset($values['prodid']) ? (string) $values['prodid'] : ''),
+			(isset($values['quantity']) ? (int) $values['quantity'] : 1),
 			$options,
-			( isset( $values['attrvarid'] ) ? array_filter( (array) $values['attrvarid'] ) : array() ),
-			( isset( $values['attrconfid'] ) ? array_filter( (array) $values['attrconfid'] ) : array() ),
-			( isset( $values['attrhideid'] ) ? array_filter( (array) $values['attrhideid'] ) : array() ),
-			( isset( $values['attrcustid'] ) ? array_filter( (array) $values['attrcustid'] ) : array() ),
-			( isset( $values['warehouse'] ) ? (string) $values['warehouse'] : 'default' )
+			(isset($values['attrvarid']) ? array_filter((array) $values['attrvarid']) : array()),
+			(isset($values['attrconfid']) ? array_filter((array) $values['attrconfid']) : array()),
+			(isset($values['attrhideid']) ? array_filter((array) $values['attrhideid']) : array()),
+			(isset($values['attrcustid']) ? array_filter((array) $values['attrcustid']) : array()),
+			(isset($values['warehouse']) ? (string) $values['warehouse'] : 'default')
 		);
 	}
 
@@ -508,14 +508,14 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 */
-	protected function deleteProducts( \Aimeos\MW\View\Iface $view )
+	protected function deleteProducts(\Aimeos\MW\View\Iface $view)
 	{
 		$this->clearCached();
-		$products = (array) $view->param( 'b_position', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+		$products = (array) $view->param('b_position', array());
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
-		foreach( $products as $position ) {
-			$controller->deleteProduct( $position );
+		foreach ($products as $position) {
+			$controller->deleteProduct($position);
 		}
 	}
 
@@ -526,28 +526,28 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param array $options List of options for editProducts() in basket controller
 	 */
-	protected function editProducts( \Aimeos\MW\View\Iface $view, array $options )
+	protected function editProducts(\Aimeos\MW\View\Iface $view, array $options)
 	{
 		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+		$products = (array) $view->param('b_prod', array());
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
-		if( ( $position = $view->param( 'b_position', '' ) ) !== '' )
+		if (($position = $view->param('b_position', '')) !== '')
 		{
 			$products[] = array(
 				'position' => $position,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrconf-code' => array_filter( (array) $view->param( 'b_attrconfcode', array() ) )
+				'quantity' => $view->param('b_quantity', 1),
+				'attrconf-code' => array_filter((array) $view->param('b_attrconfcode', array()))
 			);
 		}
 
-		foreach( $products as $values )
+		foreach ($products as $values)
 		{
 			$controller->editProduct(
-				( isset( $values['position'] ) ? (int) $values['position'] : 0 ),
-				( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+				(isset($values['position']) ? (int) $values['position'] : 0),
+				(isset($values['quantity']) ? (int) $values['quantity'] : 1),
 				$options,
-				( isset( $values['attrconf-code'] ) ? array_filter( (array) $values['attrconf-code'] ) : array() )
+				(isset($values['attrconf-code']) ? array_filter((array) $values['attrconf-code']) : array())
 			);
 		}
 	}

Braces +11 added lines, -22 removed lines

@@ -104,23 +104,19 @@ 
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 			}
 			$view->standardBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -174,8 +170,7 @@ 
 				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
 			}
 			$view->standardHeader = $html;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			return '';
@@ -357,31 +352,26 @@ 
 
 			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
 			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+		} catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
 		{
 			$errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
 
 			$view->summaryErrorCodes = $e->getErrorCodes();
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -423,8 +413,7 @@ 
 				$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() );
-			}
-			else
+			} else
 			{
 				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
 

client/html/src/Client/Html/Catalog/Count/Attribute/Standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +271 added lines, -271 removed lines

@@ -19,299 +19,299 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Catalog\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Catalog\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/catalog/count/attribute/standard/subparts
-	 * List of HTML sub-clients rendered within the catalog count attribute section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/catalog/count/attribute/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/catalog/count/attribute/standard/subparts
+     * List of HTML sub-clients rendered within the catalog count attribute section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/catalog/count/attribute/standard/subparts';
+    private $subPartNames = array();
+    private $cache;
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->attributeBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->attributeBody = $html;
 
-		/** client/html/catalog/count/attribute/standard/template-body
-		 * Relative path to the HTML body template of the catalog count attribute client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/count/attribute/standard/template-header
-		 */
-		$tplconf = 'client/html/catalog/count/attribute/standard/template-body';
-		$default = 'catalog/count/attribute-body-default.php';
+        /** client/html/catalog/count/attribute/standard/template-body
+         * Relative path to the HTML body template of the catalog count attribute client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/count/attribute/standard/template-header
+         */
+        $tplconf = 'client/html/catalog/count/attribute/standard/template-body';
+        $default = 'catalog/count/attribute-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->attributeHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->attributeHeader = $html;
 
-		/** client/html/catalog/count/attribute/standard/template-header
-		 * Relative path to the HTML header template of the catalog count attribute client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/count/attribute/standard/template-body
-		 */
-		$tplconf = 'client/html/catalog/count/attribute/standard/template-header';
-		$default = 'catalog/count/attribute-header-default.php';
+        /** client/html/catalog/count/attribute/standard/template-header
+         * Relative path to the HTML header template of the catalog count attribute client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/count/attribute/standard/template-body
+         */
+        $tplconf = 'client/html/catalog/count/attribute/standard/template-header';
+        $default = 'catalog/count/attribute-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/catalog/count/attribute/decorators/excludes
-		 * Excludes decorators added by the "common" option from the catalog count attribute html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/catalog/count/attribute/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/count/attribute/decorators/global
-		 * @see client/html/catalog/count/attribute/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/catalog/count/attribute/decorators/excludes
+         * Excludes decorators added by the "common" option from the catalog count attribute html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/catalog/count/attribute/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/count/attribute/decorators/global
+         * @see client/html/catalog/count/attribute/decorators/local
+         */
 
-		/** client/html/catalog/count/attribute/decorators/global
-		 * Adds a list of globally available decorators only to the catalog count attribute html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/count/attribute/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/count/attribute/decorators/excludes
-		 * @see client/html/catalog/count/attribute/decorators/local
-		 */
+        /** client/html/catalog/count/attribute/decorators/global
+         * Adds a list of globally available decorators only to the catalog count attribute html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/count/attribute/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/count/attribute/decorators/excludes
+         * @see client/html/catalog/count/attribute/decorators/local
+         */
 
-		/** client/html/catalog/count/attribute/decorators/local
-		 * Adds a list of local decorators only to the catalog count attribute html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/count/attribute/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/count/attribute/decorators/excludes
-		 * @see client/html/catalog/count/attribute/decorators/global
-		 */
+        /** client/html/catalog/count/attribute/decorators/local
+         * Adds a list of local decorators only to the catalog count attribute html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/count/attribute/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/count/attribute/decorators/excludes
+         * @see client/html/catalog/count/attribute/decorators/global
+         */
 
-		return $this->createSubClient( 'catalog/count/attribute/' . $type, $name );
-	}
+        return $this->createSubClient( 'catalog/count/attribute/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 
 
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$context = $this->getContext();
-			$config = $context->getConfig();
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $context = $this->getContext();
+            $config = $context->getConfig();
 
-			/** client/html/catalog/count/attribute/aggregate
-			 * Enables or disables generating product counts for the attribute catalog filter
-			 *
-			 * This configuration option allows shop owners to enable or disable product counts
-			 * for the attribute section of the catalog filter HTML client.
-			 *
-			 * @param boolean Disabled if "0", enabled if "1"
-			 * @since 2014.03
-			 * @see client/html/catalog/count/limit
-			 * @category Developer
-			 * @category User
-			 */
-			if( $config->get( 'client/html/catalog/count/attribute/aggregate', true ) == true )
-			{
-				/** client/html/catalog/count/limit
-				 * Limits the number of records that are used for product counts in the catalog filter
-				 *
-				 * The product counts in the catalog filter are generated by searching for all
-				 * products that match the criteria and then counting the number of products
-				 * that are available for each attribute or category.
-				 *
-				 * As counting huge amount of records (several 10 000 records) takes a long time,
-				 * the limit can cut down response times so the counts are available more quickly
-				 * in the front-end and the server load is reduced.
-				 *
-				 * Using a low limit can lead to incorrect numbers if the amount of found products
-				 * is very high. Approximate product counts are normally not a problem but it can
-				 * lead to the situation that visitors see that no products are available for
-				 * an attribute or in a category despite the fact that there would be at least
-				 * one.
-				 *
-				 * @param integer Number of records
-				 * @since 2014.03
-				 * @see client/html/catalog/count/attribute/aggregate
-				 * @category Developer
-				 * @category User
-				 */
-				$filter = $this->getProductListFilter( $view );
-				$filter->setSlice( 0, $config->get( 'client/html/catalog/count/limit', 10000 ) );
-				$filter->setSortations( array() ); // it's not necessary and slows down the query
+            /** client/html/catalog/count/attribute/aggregate
+             * Enables or disables generating product counts for the attribute catalog filter
+             *
+             * This configuration option allows shop owners to enable or disable product counts
+             * for the attribute section of the catalog filter HTML client.
+             *
+             * @param boolean Disabled if "0", enabled if "1"
+             * @since 2014.03
+             * @see client/html/catalog/count/limit
+             * @category Developer
+             * @category User
+             */
+            if( $config->get( 'client/html/catalog/count/attribute/aggregate', true ) == true )
+            {
+                /** client/html/catalog/count/limit
+                 * Limits the number of records that are used for product counts in the catalog filter
+                 *
+                 * The product counts in the catalog filter are generated by searching for all
+                 * products that match the criteria and then counting the number of products
+                 * that are available for each attribute or category.
+                 *
+                 * As counting huge amount of records (several 10 000 records) takes a long time,
+                 * the limit can cut down response times so the counts are available more quickly
+                 * in the front-end and the server load is reduced.
+                 *
+                 * Using a low limit can lead to incorrect numbers if the amount of found products
+                 * is very high. Approximate product counts are normally not a problem but it can
+                 * lead to the situation that visitors see that no products are available for
+                 * an attribute or in a category despite the fact that there would be at least
+                 * one.
+                 *
+                 * @param integer Number of records
+                 * @since 2014.03
+                 * @see client/html/catalog/count/attribute/aggregate
+                 * @category Developer
+                 * @category User
+                 */
+                $filter = $this->getProductListFilter( $view );
+                $filter->setSlice( 0, $config->get( 'client/html/catalog/count/limit', 10000 ) );
+                $filter->setSortations( array() ); // it's not necessary and slows down the query
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-				$view->attributeCountList = $controller->aggregateIndex( $filter, 'index.attribute.id' );
-			}
+                $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+                $view->attributeCountList = $controller->aggregateIndex( $filter, 'index.attribute.id' );
+            }
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +21 added lines, -21 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->attributeBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/catalog/count/attribute/standard/template-body';
 		$default = 'catalog/count/attribute-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->attributeHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/catalog/count/attribute/standard/template-header';
 		$default = 'catalog/count/attribute-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/count/attribute/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog count attribute html client
@@ -234,7 +234,7 @@ 
 		 * @see client/html/catalog/count/attribute/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/count/attribute/' . $type, $name );
+		return $this->createSubClient('catalog/count/attribute/'.$type, $name);
 	}
 
 
@@ -245,7 +245,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -257,9 +257,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))
 		{
 			$context = $this->getContext();
 			$config = $context->getConfig();
@@ -276,7 +276,7 @@ 
 			 * @category Developer
 			 * @category User
 			 */
-			if( $config->get( 'client/html/catalog/count/attribute/aggregate', true ) == true )
+			if ($config->get('client/html/catalog/count/attribute/aggregate', true) == true)
 			{
 				/** client/html/catalog/count/limit
 				 * Limits the number of records that are used for product counts in the catalog filter
@@ -301,12 +301,12 @@ 
 				 * @category Developer
 				 * @category User
 				 */
-				$filter = $this->getProductListFilter( $view );
-				$filter->setSlice( 0, $config->get( 'client/html/catalog/count/limit', 10000 ) );
-				$filter->setSortations( array() ); // it's not necessary and slows down the query
+				$filter = $this->getProductListFilter($view);
+				$filter->setSlice(0, $config->get('client/html/catalog/count/limit', 10000));
+				$filter->setSortations(array()); // it's not necessary and slows down the query
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-				$view->attributeCountList = $controller->aggregateIndex( $filter, 'index.attribute.id' );
+				$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+				$view->attributeCountList = $controller->aggregateIndex($filter, 'index.attribute.id');
 			}
 
 			$this->cache = $view;

client/html/src/Client/Html/Catalog/Count/Tree/Standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +249 added lines, -249 removed lines

@@ -19,277 +19,277 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Catalog\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Catalog\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/catalog/count/tree/standard/subparts
-	 * List of HTML sub-clients rendered within the catalog count tree section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/catalog/count/tree/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/catalog/count/tree/standard/subparts
+     * List of HTML sub-clients rendered within the catalog count tree section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/catalog/count/tree/standard/subparts';
+    private $subPartNames = array();
+    private $cache;
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->treeBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->treeBody = $html;
 
-		/** client/html/catalog/count/tree/standard/template-body
-		 * Relative path to the HTML body template of the catalog count tree client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/count/tree/standard/template-header
-		 */
-		$tplconf = 'client/html/catalog/count/tree/standard/template-body';
-		$default = 'catalog/count/tree-body-default.php';
+        /** client/html/catalog/count/tree/standard/template-body
+         * Relative path to the HTML body template of the catalog count tree client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/count/tree/standard/template-header
+         */
+        $tplconf = 'client/html/catalog/count/tree/standard/template-body';
+        $default = 'catalog/count/tree-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->treeHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->treeHeader = $html;
 
-		/** client/html/catalog/count/tree/standard/template-header
-		 * Relative path to the HTML header template of the catalog count tree client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/count/tree/standard/template-body
-		 */
-		$tplconf = 'client/html/catalog/count/tree/standard/template-header';
-		$default = 'catalog/count/tree-header-default.php';
+        /** client/html/catalog/count/tree/standard/template-header
+         * Relative path to the HTML header template of the catalog count tree client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/count/tree/standard/template-body
+         */
+        $tplconf = 'client/html/catalog/count/tree/standard/template-header';
+        $default = 'catalog/count/tree-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/catalog/count/tree/decorators/excludes
-		 * Excludes decorators added by the "common" option from the catalog count tree html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/catalog/count/tree/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/count/tree/decorators/global
-		 * @see client/html/catalog/count/tree/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/catalog/count/tree/decorators/excludes
+         * Excludes decorators added by the "common" option from the catalog count tree html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/catalog/count/tree/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/count/tree/decorators/global
+         * @see client/html/catalog/count/tree/decorators/local
+         */
 
-		/** client/html/catalog/count/tree/decorators/global
-		 * Adds a list of globally available decorators only to the catalog count tree html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/count/tree/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/count/tree/decorators/excludes
-		 * @see client/html/catalog/count/tree/decorators/local
-		 */
+        /** client/html/catalog/count/tree/decorators/global
+         * Adds a list of globally available decorators only to the catalog count tree html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/count/tree/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/count/tree/decorators/excludes
+         * @see client/html/catalog/count/tree/decorators/local
+         */
 
-		/** client/html/catalog/count/tree/decorators/local
-		 * Adds a list of local decorators only to the catalog count tree html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/count/tree/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/count/tree/decorators/excludes
-		 * @see client/html/catalog/count/tree/decorators/global
-		 */
+        /** client/html/catalog/count/tree/decorators/local
+         * Adds a list of local decorators only to the catalog count tree html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/count/tree/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/count/tree/decorators/excludes
+         * @see client/html/catalog/count/tree/decorators/global
+         */
 
-		return $this->createSubClient( 'catalog/count/tree/' . $type, $name );
-	}
+        return $this->createSubClient( 'catalog/count/tree/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 
 
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$context = $this->getContext();
-			$config = $context->getConfig();
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $context = $this->getContext();
+            $config = $context->getConfig();
 
-			/** client/html/catalog/count/tree/aggregate
-			 * Enables or disables generating product counts for the category catalog filter
-			 *
-			 * This configuration option allows shop owners to enable or disable product counts
-			 * for the tree section of the catalog filter HTML client.
-			 *
-			 * @param boolean Disabled if "0", enabled if "1"
-			 * @since 2014.03
-			 * @see client/html/catalog/count/limit
-			 */
-			if( $config->get( 'client/html/catalog/count/tree/aggregate', true ) == true )
-			{
-				/** client/html/catalog/count/limit
-				 * @see client/html/catalog/count/tree/aggregate
-				 */
-				$filter = $this->getProductListFilter( $view, false );
-				$filter->setSlice( 0, $config->get( 'client/html/catalog/count/limit', 10000 ) );
-				$filter->setSortations( array() ); // it's not necessary and slows down the query
+            /** client/html/catalog/count/tree/aggregate
+             * Enables or disables generating product counts for the category catalog filter
+             *
+             * This configuration option allows shop owners to enable or disable product counts
+             * for the tree section of the catalog filter HTML client.
+             *
+             * @param boolean Disabled if "0", enabled if "1"
+             * @since 2014.03
+             * @see client/html/catalog/count/limit
+             */
+            if( $config->get( 'client/html/catalog/count/tree/aggregate', true ) == true )
+            {
+                /** client/html/catalog/count/limit
+                 * @see client/html/catalog/count/tree/aggregate
+                 */
+                $filter = $this->getProductListFilter( $view, false );
+                $filter->setSlice( 0, $config->get( 'client/html/catalog/count/limit', 10000 ) );
+                $filter->setSortations( array() ); // it's not necessary and slows down the query
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-				$view->treeCountList = $controller->aggregateIndex( $filter, 'index.catalog.id' );
-			}
+                $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+                $view->treeCountList = $controller->aggregateIndex( $filter, 'index.catalog.id' );
+            }
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }

Spacing +21 added lines, -21 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->treeBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/catalog/count/tree/standard/template-body';
 		$default = 'catalog/count/tree-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->treeHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/catalog/count/tree/standard/template-header';
 		$default = 'catalog/count/tree-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/count/tree/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog count tree html client
@@ -234,7 +234,7 @@ 
 		 * @see client/html/catalog/count/tree/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/count/tree/' . $type, $name );
+		return $this->createSubClient('catalog/count/tree/'.$type, $name);
 	}
 
 
@@ -245,7 +245,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -257,9 +257,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))
 		{
 			$context = $this->getContext();
 			$config = $context->getConfig();
@@ -274,17 +274,17 @@ 
 			 * @since 2014.03
 			 * @see client/html/catalog/count/limit
 			 */
-			if( $config->get( 'client/html/catalog/count/tree/aggregate', true ) == true )
+			if ($config->get('client/html/catalog/count/tree/aggregate', true) == true)
 			{
 				/** client/html/catalog/count/limit
 				 * @see client/html/catalog/count/tree/aggregate
 				 */
-				$filter = $this->getProductListFilter( $view, false );
-				$filter->setSlice( 0, $config->get( 'client/html/catalog/count/limit', 10000 ) );
-				$filter->setSortations( array() ); // it's not necessary and slows down the query
+				$filter = $this->getProductListFilter($view, false);
+				$filter->setSlice(0, $config->get('client/html/catalog/count/limit', 10000));
+				$filter->setSortations(array()); // it's not necessary and slows down the query
 
-				$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-				$view->treeCountList = $controller->aggregateIndex( $filter, 'index.catalog.id' );
+				$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+				$view->treeCountList = $controller->aggregateIndex($filter, 'index.catalog.id');
 			}
 
 			$this->cache = $view;

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

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +239 added lines, -239 removed lines

@@ -19,267 +19,267 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/catalog/detail/actions/standard/subparts
-	 * List of HTML sub-clients rendered within the catalog detail actions section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.09
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/catalog/detail/actions/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/catalog/detail/actions/standard/subparts
+     * List of HTML sub-clients rendered within the catalog detail actions section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.09
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/catalog/detail/actions/standard/subparts';
+    private $subPartNames = array();
+    private $cache;
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->actionsBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->actionsBody = $html;
 
-		/** client/html/catalog/detail/actions/standard/template-body
-		 * Relative path to the HTML body template of the catalog detail actions client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.09
-		 * @category Developer
-		 * @see client/html/catalog/detail/actions/standard/template-header
-		 */
-		$tplconf = 'client/html/catalog/detail/actions/standard/template-body';
-		$default = 'catalog/detail/actions-body-default.php';
+        /** client/html/catalog/detail/actions/standard/template-body
+         * Relative path to the HTML body template of the catalog detail actions client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.09
+         * @category Developer
+         * @see client/html/catalog/detail/actions/standard/template-header
+         */
+        $tplconf = 'client/html/catalog/detail/actions/standard/template-body';
+        $default = 'catalog/detail/actions-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->actionsHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->actionsHeader = $html;
 
-		/** client/html/catalog/detail/actions/standard/template-header
-		 * Relative path to the HTML header template of the catalog detail actions client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.09
-		 * @category Developer
-		 * @see client/html/catalog/detail/actions/standard/template-body
-		 */
-		$tplconf = 'client/html/catalog/detail/actions/standard/template-header';
-		$default = 'catalog/detail/actions-header-default.php';
+        /** client/html/catalog/detail/actions/standard/template-header
+         * Relative path to the HTML header template of the catalog detail actions client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.09
+         * @category Developer
+         * @see client/html/catalog/detail/actions/standard/template-body
+         */
+        $tplconf = 'client/html/catalog/detail/actions/standard/template-header';
+        $default = 'catalog/detail/actions-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Modifies the cached body content to replace content based on sessions or cookies.
-	 *
-	 * @param string $content Cached content
-	 * @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 )
-	{
-		return $this->replaceSection( $content, $this->getBody( $uid ), 'catalog.detail.actions' );
-	}
+    /**
+     * Modifies the cached body content to replace content based on sessions or cookies.
+     *
+     * @param string $content Cached content
+     * @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 )
+    {
+        return $this->replaceSection( $content, $this->getBody( $uid ), 'catalog.detail.actions' );
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/catalog/detail/actions/decorators/excludes
-		 * Excludes decorators added by the "common" option from the catalog detail actions html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/catalog/detail/actions/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/actions/decorators/global
-		 * @see client/html/catalog/detail/actions/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/catalog/detail/actions/decorators/excludes
+         * Excludes decorators added by the "common" option from the catalog detail actions html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/catalog/detail/actions/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/actions/decorators/global
+         * @see client/html/catalog/detail/actions/decorators/local
+         */
 
-		/** client/html/catalog/detail/actions/decorators/global
-		 * Adds a list of globally available decorators only to the catalog detail actions html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/actions/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/actions/decorators/excludes
-		 * @see client/html/catalog/detail/actions/decorators/local
-		 */
+        /** client/html/catalog/detail/actions/decorators/global
+         * Adds a list of globally available decorators only to the catalog detail actions html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/actions/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/actions/decorators/excludes
+         * @see client/html/catalog/detail/actions/decorators/local
+         */
 
-		/** client/html/catalog/detail/actions/decorators/local
-		 * Adds a list of local decorators only to the catalog detail actions html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/actions/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/actions/decorators/excludes
-		 * @see client/html/catalog/detail/actions/decorators/global
-		 */
+        /** client/html/catalog/detail/actions/decorators/local
+         * Adds a list of local decorators only to the catalog detail actions html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/actions/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/actions/decorators/excludes
+         * @see client/html/catalog/detail/actions/decorators/global
+         */
 
-		return $this->createSubClient( 'catalog/detail/actions/' . $type, $name );
-	}
+        return $this->createSubClient( 'catalog/detail/actions/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 
 
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$view->actionsParams = $this->getClientParams( $view->param() );
-			$view->actionsUserId = $this->getContext()->getUserId();
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $view->actionsParams = $this->getClientParams( $view->param() );
+            $view->actionsUserId = $this->getContext()->getUserId();
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +18 added lines, -18 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->actionsBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/catalog/detail/actions/standard/template-body';
 		$default = 'catalog/detail/actions-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->actionsHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/catalog/detail/actions/standard/template-header';
 		$default = 'catalog/detail/actions-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -158,9 +158,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.detail.actions' );
+		return $this->replaceSection($content, $this->getBody($uid), 'catalog.detail.actions');
 	}
 
 
@@ -171,7 +171,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/actions/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail actions html client
@@ -247,7 +247,7 @@ 
 		 * @see client/html/catalog/detail/actions/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/actions/' . $type, $name );
+		return $this->createSubClient('catalog/detail/actions/'.$type, $name);
 	}
 
 
@@ -258,7 +258,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -270,11 +270,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))
 		{
-			$view->actionsParams = $this->getClientParams( $view->param() );
+			$view->actionsParams = $this->getClientParams($view->param());
 			$view->actionsUserId = $this->getContext()->getUserId();
 
 			$this->cache = $view;

client/html/src/Client/Html/Catalog/Detail/Additional/Attribute/Standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +368 added lines, -368 removed lines

@@ -19,373 +19,373 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/catalog/detail/additional/attribute/standard/subparts
-	 * List of HTML sub-clients rendered within the catalog detail additional attribute section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/catalog/detail/additional/attribute/standard/subparts';
-	private $subPartNames = array();
-	private $tags = array();
-	private $expire;
-	private $cache;
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->attributeBody = $html;
-
-		/** client/html/catalog/detail/additional/attribute/standard/template-body
-		 * Relative path to the HTML body template of the catalog detail additional attribute client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/detail/additional/attribute/standard/template-header
-		 */
-		$tplconf = 'client/html/catalog/detail/additional/attribute/standard/template-body';
-		$default = 'catalog/detail/additional-attribute-body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->attributeHeader = $html;
-
-		/** client/html/catalog/detail/additional/attribute/standard/template-header
-		 * Relative path to the HTML header template of the catalog detail additional attribute client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/detail/additional/attribute/standard/template-body
-		 */
-		$tplconf = 'client/html/catalog/detail/additional/attribute/standard/template-header';
-		$default = 'catalog/detail/additional-attribute-header-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/catalog/detail/additional/attribute/decorators/excludes
-		 * Excludes decorators added by the "common" option from the catalog detail additional attribute html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/attribute/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/attribute/decorators/global
-		 * @see client/html/catalog/detail/additional/attribute/decorators/local
-		 */
-
-		/** client/html/catalog/detail/additional/attribute/decorators/global
-		 * Adds a list of globally available decorators only to the catalog detail additional attribute html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/attribute/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/attribute/decorators/excludes
-		 * @see client/html/catalog/detail/additional/attribute/decorators/local
-		 */
-
-		/** client/html/catalog/detail/additional/attribute/decorators/local
-		 * Adds a list of local decorators only to the catalog detail additional attribute html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/attribute/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/attribute/decorators/excludes
-		 * @see client/html/catalog/detail/additional/attribute/decorators/global
-		 */
-
-		return $this->createSubClient( 'catalog/detail/additional/attribute/' . $type, $name );
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
-
-
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$context = $this->getContext();
-			$config = $context->getConfig();
-			$attrIds = $attributeMap = $subAttrDeps = array();
-
-			/** client/html/catalog/detail/additional/attribute/variants
-			 * If variant attributes should be displayed in the additional section too
-			 *
-			 * The additional attribute section of the catalog details views contains
-			 * all attributes of type "default" that have been assigned to the product.
-			 * By default, this also includes variant attributes assigned to the article
-			 * of selection products and the ones for the selected variant are displayed
-			 * as well.
-			 *
-			 * This setting can disable displaying them in the additional attribute
-			 * section.
-			 *
-			 * @param boolean True to also display variant attibutes, false to hide them
-			 * @since 2016.05
-			 * @category Developer
-			*/
-			$variants = (bool) $config->get( 'client/html/catalog/detail/additional/attribute/variants', true );
-
-			if( isset( $view->detailProductItem ) )
-			{
-				$attrIds = array_keys( $view->detailProductItem->getRefItems( 'attribute', null, 'default' ) );
-
-				if( $variants === true ) {
-					$attrIds += array_keys( $view->detailProductItem->getRefItems( 'attribute', null, 'variant' ) );
-				}
-			}
-
-
-			$products = $view->detailProductItem->getRefItems( 'product', 'default', 'default' );
-
-			/** client/html/catalog/detail/additional/attribute/domains
-			 * A list of domain names whose items should be available in the additional attribute part of the catalog detail view templates
-			 *
-			 * The templates rendering additional attribute related data usually add
-			 * the images and texts associated to each item. If you want to
-			 * display additional content like the attributes, you can configure
-			 * your own list of domains (attribute, media, price, product, text,
-			 * etc. are domains) whose items are fetched from the storage.
-			 * Please keep in mind that the more domains you add to the
-			 * configuration, the more time is required for fetching the content!
-			 *
-			 * @param array List of domain names
-			 * @since 2015.09
-			 * @category Developer
-			 * @see client/html/catalog/detail/basket/selection/domains-attributes
-			*/
-			$domains = $config->get( 'client/html/catalog/detail/basket/selection/domains', array( 'attribute' ) );
-
-			// find regular attributes from sub-products
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-			$products = $controller->getProductItems( array_keys( $products ), $domains );
-
-			foreach( $products as $subProdId => $subProduct )
-			{
-				$subItems = $subProduct->getRefItems( 'attribute', null, 'default' );
-
-				if( $variants === true ) {
-					$subItems += $subProduct->getRefItems( 'attribute', null, 'variant' );
-				}
-
-				foreach( $subItems as $attrId => $attrItem )
-				{
-					$subAttrDeps[$attrId][] = $subProdId;
-					$attrIds[] = $attrId;
-				}
-			}
-
-			$this->addMetaItem( $products, 'product', $this->expire, $this->tags );
-			$this->addMetaList( array_keys( $products ), 'product', $this->expire );
-
-
-			$attrManager = $controller->createManager( 'attribute' );
-
-			$search = $attrManager->createSearch( true );
-			$expr = array(
-				$search->compare( '==', 'attribute.id', $attrIds ),
-				$search->getConditions(),
-			);
-			$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 in the
-			 * additional attribute part of the catalog detail view templates
-			 *
-			 * The templates rendering additional attribute related data usually add
-			 * the images and texts associated to each item. If you want to
-			 * display additional content like the attributes, you can configure
-			 * your own list of domains (attribute, media, price, product, text,
-			 * etc. are domains) whose items are fetched from the storage.
-			 * Please keep in mind that the more domains you add to the
-			 * configuration, the more time is required for fetching the content!
-			 *
-			 * @param array List of domain names
-			 * @since 2015.09
-			 * @category Developer
-			 * @see client/html/catalog/detail/basket/selection/domains
-			*/
-			$domains = $config->get( 'client/html/catalog/detail/basket/selection/domains-attributes', array( 'text', 'media' ) );
-
-			$attributes = $attrManager->searchItems( $search, $domains );
-
-			foreach( $attributes as $id => $item ) {
-				$attributeMap[$item->getType()][$id] = $item;
-			}
-
-			$this->addMetaItem( $attributes, 'attribute', $this->expire, $this->tags );
-			$this->addMetaList( array_keys( $attributes ), 'attribute', $this->expire );
-
-
-			$view->attributeMap = $attributeMap;
-			$view->subAttributeDependencies = $subAttrDeps;
-
-			$this->cache = $view;
-		}
-
-		$expire = $this->expires( $this->expire, $expire );
-		$tags = array_merge( $tags, $this->tags );
-
-		return $this->cache;
-	}
+    /** client/html/catalog/detail/additional/attribute/standard/subparts
+     * List of HTML sub-clients rendered within the catalog detail additional attribute section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/catalog/detail/additional/attribute/standard/subparts';
+    private $subPartNames = array();
+    private $tags = array();
+    private $expire;
+    private $cache;
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->attributeBody = $html;
+
+        /** client/html/catalog/detail/additional/attribute/standard/template-body
+         * Relative path to the HTML body template of the catalog detail additional attribute client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/detail/additional/attribute/standard/template-header
+         */
+        $tplconf = 'client/html/catalog/detail/additional/attribute/standard/template-body';
+        $default = 'catalog/detail/additional-attribute-body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->attributeHeader = $html;
+
+        /** client/html/catalog/detail/additional/attribute/standard/template-header
+         * Relative path to the HTML header template of the catalog detail additional attribute client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/detail/additional/attribute/standard/template-body
+         */
+        $tplconf = 'client/html/catalog/detail/additional/attribute/standard/template-header';
+        $default = 'catalog/detail/additional-attribute-header-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/catalog/detail/additional/attribute/decorators/excludes
+         * Excludes decorators added by the "common" option from the catalog detail additional attribute html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/catalog/detail/additional/attribute/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/attribute/decorators/global
+         * @see client/html/catalog/detail/additional/attribute/decorators/local
+         */
+
+        /** client/html/catalog/detail/additional/attribute/decorators/global
+         * Adds a list of globally available decorators only to the catalog detail additional attribute html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/additional/attribute/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/attribute/decorators/excludes
+         * @see client/html/catalog/detail/additional/attribute/decorators/local
+         */
+
+        /** client/html/catalog/detail/additional/attribute/decorators/local
+         * Adds a list of local decorators only to the catalog detail additional attribute html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/additional/attribute/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/attribute/decorators/excludes
+         * @see client/html/catalog/detail/additional/attribute/decorators/global
+         */
+
+        return $this->createSubClient( 'catalog/detail/additional/attribute/' . $type, $name );
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
+
+
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $context = $this->getContext();
+            $config = $context->getConfig();
+            $attrIds = $attributeMap = $subAttrDeps = array();
+
+            /** client/html/catalog/detail/additional/attribute/variants
+             * If variant attributes should be displayed in the additional section too
+             *
+             * The additional attribute section of the catalog details views contains
+             * all attributes of type "default" that have been assigned to the product.
+             * By default, this also includes variant attributes assigned to the article
+             * of selection products and the ones for the selected variant are displayed
+             * as well.
+             *
+             * This setting can disable displaying them in the additional attribute
+             * section.
+             *
+             * @param boolean True to also display variant attibutes, false to hide them
+             * @since 2016.05
+             * @category Developer
+             */
+            $variants = (bool) $config->get( 'client/html/catalog/detail/additional/attribute/variants', true );
+
+            if( isset( $view->detailProductItem ) )
+            {
+                $attrIds = array_keys( $view->detailProductItem->getRefItems( 'attribute', null, 'default' ) );
+
+                if( $variants === true ) {
+                    $attrIds += array_keys( $view->detailProductItem->getRefItems( 'attribute', null, 'variant' ) );
+                }
+            }
+
+
+            $products = $view->detailProductItem->getRefItems( 'product', 'default', 'default' );
+
+            /** client/html/catalog/detail/additional/attribute/domains
+             * A list of domain names whose items should be available in the additional attribute part of the catalog detail view templates
+             *
+             * The templates rendering additional attribute related data usually add
+             * the images and texts associated to each item. If you want to
+             * display additional content like the attributes, you can configure
+             * your own list of domains (attribute, media, price, product, text,
+             * etc. are domains) whose items are fetched from the storage.
+             * Please keep in mind that the more domains you add to the
+             * configuration, the more time is required for fetching the content!
+             *
+             * @param array List of domain names
+             * @since 2015.09
+             * @category Developer
+             * @see client/html/catalog/detail/basket/selection/domains-attributes
+             */
+            $domains = $config->get( 'client/html/catalog/detail/basket/selection/domains', array( 'attribute' ) );
+
+            // find regular attributes from sub-products
+            $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+            $products = $controller->getProductItems( array_keys( $products ), $domains );
+
+            foreach( $products as $subProdId => $subProduct )
+            {
+                $subItems = $subProduct->getRefItems( 'attribute', null, 'default' );
+
+                if( $variants === true ) {
+                    $subItems += $subProduct->getRefItems( 'attribute', null, 'variant' );
+                }
+
+                foreach( $subItems as $attrId => $attrItem )
+                {
+                    $subAttrDeps[$attrId][] = $subProdId;
+                    $attrIds[] = $attrId;
+                }
+            }
+
+            $this->addMetaItem( $products, 'product', $this->expire, $this->tags );
+            $this->addMetaList( array_keys( $products ), 'product', $this->expire );
+
+
+            $attrManager = $controller->createManager( 'attribute' );
+
+            $search = $attrManager->createSearch( true );
+            $expr = array(
+                $search->compare( '==', 'attribute.id', $attrIds ),
+                $search->getConditions(),
+            );
+            $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 in the
+             * additional attribute part of the catalog detail view templates
+             *
+             * The templates rendering additional attribute related data usually add
+             * the images and texts associated to each item. If you want to
+             * display additional content like the attributes, you can configure
+             * your own list of domains (attribute, media, price, product, text,
+             * etc. are domains) whose items are fetched from the storage.
+             * Please keep in mind that the more domains you add to the
+             * configuration, the more time is required for fetching the content!
+             *
+             * @param array List of domain names
+             * @since 2015.09
+             * @category Developer
+             * @see client/html/catalog/detail/basket/selection/domains
+             */
+            $domains = $config->get( 'client/html/catalog/detail/basket/selection/domains-attributes', array( 'text', 'media' ) );
+
+            $attributes = $attrManager->searchItems( $search, $domains );
+
+            foreach( $attributes as $id => $item ) {
+                $attributeMap[$item->getType()][$id] = $item;
+            }
+
+            $this->addMetaItem( $attributes, 'attribute', $this->expire, $this->tags );
+            $this->addMetaList( array_keys( $attributes ), 'attribute', $this->expire );
+
+
+            $view->attributeMap = $attributeMap;
+            $view->subAttributeDependencies = $subAttrDeps;
+
+            $this->cache = $view;
+        }
+
+        $expire = $this->expires( $this->expire, $expire );
+        $tags = array_merge( $tags, $this->tags );
+
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +42 added lines, -42 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->attributeBody = $html;
 
@@ -103,7 +103,7 @@ 
 		$tplconf = 'client/html/catalog/detail/additional/attribute/standard/template-body';
 		$default = 'catalog/detail/additional-attribute-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->attributeHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/catalog/detail/additional/attribute/standard/template-header';
 		$default = 'catalog/detail/additional-attribute-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/additional/attribute/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail additional attribute html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/catalog/detail/additional/attribute/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/additional/attribute/' . $type, $name );
+		return $this->createSubClient('catalog/detail/additional/attribute/'.$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,9 +259,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))
 		{
 			$context = $this->getContext();
 			$config = $context->getConfig();
@@ -283,19 +283,19 @@ 
 			 * @since 2016.05
 			 * @category Developer
 			*/
-			$variants = (bool) $config->get( 'client/html/catalog/detail/additional/attribute/variants', true );
+			$variants = (bool) $config->get('client/html/catalog/detail/additional/attribute/variants', true);
 
-			if( isset( $view->detailProductItem ) )
+			if (isset($view->detailProductItem))
 			{
-				$attrIds = array_keys( $view->detailProductItem->getRefItems( 'attribute', null, 'default' ) );
+				$attrIds = array_keys($view->detailProductItem->getRefItems('attribute', null, 'default'));
 
-				if( $variants === true ) {
-					$attrIds += array_keys( $view->detailProductItem->getRefItems( 'attribute', null, 'variant' ) );
+				if ($variants === true) {
+					$attrIds += array_keys($view->detailProductItem->getRefItems('attribute', null, 'variant'));
 				}
 			}
 
 
-			$products = $view->detailProductItem->getRefItems( 'product', 'default', 'default' );
+			$products = $view->detailProductItem->getRefItems('product', 'default', 'default');
 
 			/** client/html/catalog/detail/additional/attribute/domains
 			 * A list of domain names whose items should be available in the additional attribute part of the catalog detail view templates
@@ -313,39 +313,39 @@ 
 			 * @category Developer
 			 * @see client/html/catalog/detail/basket/selection/domains-attributes
 			*/
-			$domains = $config->get( 'client/html/catalog/detail/basket/selection/domains', array( 'attribute' ) );
+			$domains = $config->get('client/html/catalog/detail/basket/selection/domains', array('attribute'));
 
 			// find regular attributes from sub-products
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-			$products = $controller->getProductItems( array_keys( $products ), $domains );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+			$products = $controller->getProductItems(array_keys($products), $domains);
 
-			foreach( $products as $subProdId => $subProduct )
+			foreach ($products as $subProdId => $subProduct)
 			{
-				$subItems = $subProduct->getRefItems( 'attribute', null, 'default' );
+				$subItems = $subProduct->getRefItems('attribute', null, 'default');
 
-				if( $variants === true ) {
-					$subItems += $subProduct->getRefItems( 'attribute', null, 'variant' );
+				if ($variants === true) {
+					$subItems += $subProduct->getRefItems('attribute', null, 'variant');
 				}
 
-				foreach( $subItems as $attrId => $attrItem )
+				foreach ($subItems as $attrId => $attrItem)
 				{
 					$subAttrDeps[$attrId][] = $subProdId;
 					$attrIds[] = $attrId;
 				}
 			}
 
-			$this->addMetaItem( $products, 'product', $this->expire, $this->tags );
-			$this->addMetaList( array_keys( $products ), 'product', $this->expire );
+			$this->addMetaItem($products, 'product', $this->expire, $this->tags);
+			$this->addMetaList(array_keys($products), '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
@@ -365,16 +365,16 @@ 
 			 * @category Developer
 			 * @see client/html/catalog/detail/basket/selection/domains
 			*/
-			$domains = $config->get( 'client/html/catalog/detail/basket/selection/domains-attributes', array( 'text', 'media' ) );
+			$domains = $config->get('client/html/catalog/detail/basket/selection/domains-attributes', array('text', 'media'));
 
-			$attributes = $attrManager->searchItems( $search, $domains );
+			$attributes = $attrManager->searchItems($search, $domains);
 
-			foreach( $attributes as $id => $item ) {
+			foreach ($attributes as $id => $item) {
 				$attributeMap[$item->getType()][$id] = $item;
 			}
 
-			$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->attributeMap = $attributeMap;
@@ -383,8 +383,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/Additional/Download/Standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +226 added lines, -226 removed lines

@@ -19,231 +19,231 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/catalog/detail/additional/download/standard/subparts
-	 * List of HTML sub-clients rendered within the catalog detail additional download section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/catalog/detail/additional/download/standard/subparts';
-	private $subPartNames = array();
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->downloadBody = $html;
-
-		/** client/html/catalog/detail/additional/download/standard/template-body
-		 * Relative path to the HTML body template of the catalog detail additional download client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/detail/additional/download/standard/template-header
-		 */
-		$tplconf = 'client/html/catalog/detail/additional/download/standard/template-body';
-		$default = 'catalog/detail/additional-download-body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->downloadHeader = $html;
-
-		/** client/html/catalog/detail/additional/download/standard/template-header
-		 * Relative path to the HTML header template of the catalog detail additional download client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/catalog/detail/additional/download/standard/template-body
-		 */
-		$tplconf = 'client/html/catalog/detail/additional/download/standard/template-header';
-		$default = 'catalog/detail/additional-download-header-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/catalog/detail/additional/download/decorators/excludes
-		 * Excludes decorators added by the "common" option from the catalog detail additional download html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/download/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/download/decorators/global
-		 * @see client/html/catalog/detail/additional/download/decorators/local
-		 */
-
-		/** client/html/catalog/detail/additional/download/decorators/global
-		 * Adds a list of globally available decorators only to the catalog detail additional download html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/download/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/download/decorators/excludes
-		 * @see client/html/catalog/detail/additional/download/decorators/local
-		 */
-
-		/** client/html/catalog/detail/additional/download/decorators/local
-		 * Adds a list of local decorators only to the catalog detail additional download html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/download/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/download/decorators/excludes
-		 * @see client/html/catalog/detail/additional/download/decorators/global
-		 */
-
-		return $this->createSubClient( 'catalog/detail/additional/download/' . $type, $name );
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /** client/html/catalog/detail/additional/download/standard/subparts
+     * List of HTML sub-clients rendered within the catalog detail additional download section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/catalog/detail/additional/download/standard/subparts';
+    private $subPartNames = array();
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->downloadBody = $html;
+
+        /** client/html/catalog/detail/additional/download/standard/template-body
+         * Relative path to the HTML body template of the catalog detail additional download client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/detail/additional/download/standard/template-header
+         */
+        $tplconf = 'client/html/catalog/detail/additional/download/standard/template-body';
+        $default = 'catalog/detail/additional-download-body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->downloadHeader = $html;
+
+        /** client/html/catalog/detail/additional/download/standard/template-header
+         * Relative path to the HTML header template of the catalog detail additional download client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/catalog/detail/additional/download/standard/template-body
+         */
+        $tplconf = 'client/html/catalog/detail/additional/download/standard/template-header';
+        $default = 'catalog/detail/additional-download-header-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/catalog/detail/additional/download/decorators/excludes
+         * Excludes decorators added by the "common" option from the catalog detail additional download html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/catalog/detail/additional/download/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/download/decorators/global
+         * @see client/html/catalog/detail/additional/download/decorators/local
+         */
+
+        /** client/html/catalog/detail/additional/download/decorators/global
+         * Adds a list of globally available decorators only to the catalog detail additional download html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/additional/download/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/download/decorators/excludes
+         * @see client/html/catalog/detail/additional/download/decorators/local
+         */
+
+        /** client/html/catalog/detail/additional/download/decorators/local
+         * Adds a list of local decorators only to the catalog detail additional download html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/additional/download/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/download/decorators/excludes
+         * @see client/html/catalog/detail/additional/download/decorators/global
+         */
+
+        return $this->createSubClient( 'catalog/detail/additional/download/' . $type, $name );
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 }
\ No newline at end of file

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->downloadBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/catalog/detail/additional/download/standard/template-body';
 		$default = 'catalog/detail/additional-download-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->downloadHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/catalog/detail/additional/download/standard/template-header';
 		$default = 'catalog/detail/additional-download-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/additional/download/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail additional download html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/catalog/detail/additional/download/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/additional/download/' . $type, $name );
+		return $this->createSubClient('catalog/detail/additional/download/'.$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/Additional/Property/Standard.php

Doc Comments +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +240 added lines, -240 removed lines

@@ -18,269 +18,269 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/catalog/detail/additional/property/standard/subparts
-	 * List of HTML sub-clients rendered within the catalog detail additional property section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2015.01
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/catalog/detail/additional/property/standard/subparts';
-	private $subPartNames = array();
-	private $tags = array();
-	private $expire;
-	private $cache;
+    /** client/html/catalog/detail/additional/property/standard/subparts
+     * List of HTML sub-clients rendered within the catalog detail additional property section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2015.01
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/catalog/detail/additional/property/standard/subparts';
+    private $subPartNames = array();
+    private $tags = array();
+    private $expire;
+    private $cache;
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->propertyBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->propertyBody = $html;
 
-		/** client/html/catalog/detail/additional/property/standard/template-body
-		 * Relative path to the HTML body template of the catalog detail additional property client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2015.01
-		 * @category Developer
-		 * @see client/html/catalog/detail/additional/property/standard/template-header
-		 */
-		$tplconf = 'client/html/catalog/detail/additional/property/standard/template-body';
-		$default = 'catalog/detail/additional-property-body-default.php';
+        /** client/html/catalog/detail/additional/property/standard/template-body
+         * Relative path to the HTML body template of the catalog detail additional property client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2015.01
+         * @category Developer
+         * @see client/html/catalog/detail/additional/property/standard/template-header
+         */
+        $tplconf = 'client/html/catalog/detail/additional/property/standard/template-body';
+        $default = 'catalog/detail/additional-property-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->propertyHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->propertyHeader = $html;
 
-		/** client/html/catalog/detail/additional/property/standard/template-header
-		 * Relative path to the HTML header template of the catalog detail additional property client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2015.01
-		 * @category Developer
-		 * @see client/html/catalog/detail/additional/property/standard/template-body
-		 */
-		$tplconf = 'client/html/catalog/detail/additional/property/standard/template-header';
-		$default = 'catalog/detail/additional-property-header-default.php';
+        /** client/html/catalog/detail/additional/property/standard/template-header
+         * Relative path to the HTML header template of the catalog detail additional property client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2015.01
+         * @category Developer
+         * @see client/html/catalog/detail/additional/property/standard/template-body
+         */
+        $tplconf = 'client/html/catalog/detail/additional/property/standard/template-header';
+        $default = 'catalog/detail/additional-property-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @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 )
-	{
-		/** client/html/catalog/detail/additional/property/decorators/excludes
-		 * Excludes decorators added by the "common" option from the catalog detail additional property html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/property/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/property/decorators/global
-		 * @see client/html/catalog/detail/additional/property/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @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 )
+    {
+        /** client/html/catalog/detail/additional/property/decorators/excludes
+         * Excludes decorators added by the "common" option from the catalog detail additional property html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/catalog/detail/additional/property/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/property/decorators/global
+         * @see client/html/catalog/detail/additional/property/decorators/local
+         */
 
-		/** client/html/catalog/detail/additional/property/decorators/global
-		 * Adds a list of globally available decorators only to the catalog detail additional property html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/property/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/property/decorators/excludes
-		 * @see client/html/catalog/detail/additional/property/decorators/local
-		 */
+        /** client/html/catalog/detail/additional/property/decorators/global
+         * Adds a list of globally available decorators only to the catalog detail additional property html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/additional/property/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/property/decorators/excludes
+         * @see client/html/catalog/detail/additional/property/decorators/local
+         */
 
-		/** client/html/catalog/detail/additional/property/decorators/local
-		 * Adds a list of local decorators only to the catalog detail additional property html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
-		 *
-		 *  client/html/catalog/detail/additional/property/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/catalog/detail/additional/property/decorators/excludes
-		 * @see client/html/catalog/detail/additional/property/decorators/global
-		 */
+        /** client/html/catalog/detail/additional/property/decorators/local
+         * Adds a list of local decorators only to the catalog detail additional property html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Catalog\Decorator\*") around the html client.
+         *
+         *  client/html/catalog/detail/additional/property/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Catalog\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/catalog/detail/additional/property/decorators/excludes
+         * @see client/html/catalog/detail/additional/property/decorators/global
+         */
 
-		return $this->createSubClient( 'catalog/detail/additional/property/' . $type, $name );
-	}
+        return $this->createSubClient( 'catalog/detail/additional/property/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 
 
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @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 )
-	{
-		if( !isset( $this->cache ) )
-		{
-			if( isset( $view->detailProductItem ) )
-			{
-				$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @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 )
+    {
+        if( !isset( $this->cache ) )
+        {
+            if( isset( $view->detailProductItem ) )
+            {
+                $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
 
-				$search = $manager->createSearch( true );
-				$expr = array(
-					$search->compare( '==', 'product.property.parentid', $view->detailProductItem->getId() ),
-					$search->getConditions(),
-				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
+                $search = $manager->createSearch( true );
+                $expr = array(
+                    $search->compare( '==', 'product.property.parentid', $view->detailProductItem->getId() ),
+                    $search->getConditions(),
+                );
+                $search->setConditions( $search->combine( '&&', $expr ) );
 
-				$properties = $manager->searchItems( $search );
+                $properties = $manager->searchItems( $search );
 
-				$view->propertyItems = $properties;
-			}
+                $view->propertyItems = $properties;
+            }
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -69,13 +69,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->propertyBody = $html;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/catalog/detail/additional/property/standard/template-body';
 		$default = 'catalog/detail/additional-property-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -114,13 +114,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->propertyHeader = $html;
 
@@ -148,7 +148,7 @@ 
 		$tplconf = 'client/html/catalog/detail/additional/property/standard/template-header';
 		$default = 'catalog/detail/additional-property-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -159,7 +159,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/additional/property/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog detail additional property html client
@@ -235,7 +235,7 @@ 
 		 * @see client/html/catalog/detail/additional/property/decorators/global
 		 */
 
-		return $this->createSubClient( 'catalog/detail/additional/property/' . $type, $name );
+		return $this->createSubClient('catalog/detail/additional/property/'.$type, $name);
 	}
 
 
@@ -246,7 +246,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -258,22 +258,22 @@ 
 	 * @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))
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+				$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
-				$search = $manager->createSearch( true );
+				$search = $manager->createSearch(true);
 				$expr = array(
-					$search->compare( '==', 'product.property.parentid', $view->detailProductItem->getId() ),
+					$search->compare('==', 'product.property.parentid', $view->detailProductItem->getId()),
 					$search->getConditions(),
 				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
+				$search->setConditions($search->combine('&&', $expr));
 
-				$properties = $manager->searchItems( $search );
+				$properties = $manager->searchItems($search);
 
 				$view->propertyItems = $properties;
 			}