aimeos / ai-client-html

client/html/src/Client/Html/Common/Summary/Detail/Base.php

Indentation +73 added lines, -73 removed lines

@@ -19,88 +19,88 @@
  * @subpackage Html
  */
 abstract class Base
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
 {
-	/**
-	 * Returns a list of tax rates and values for the given basket.
-	 *
-	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket containing the products, services, etc.
-	 * @return array Associative list of tax rates as key and corresponding amounts as value
-	 */
-	protected function getTaxRates( \Aimeos\MShop\Order\Item\Base\Iface $basket )
-	{
-		$taxrates = array();
+    /**
+     * Returns a list of tax rates and values for the given basket.
+     *
+     * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket containing the products, services, etc.
+     * @return array Associative list of tax rates as key and corresponding amounts as value
+     */
+    protected function getTaxRates( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+    {
+        $taxrates = array();
 
-		foreach( $basket->getProducts() as $product )
-		{
-			$price = clone $product->getPrice();
-			$taxrate = $price->getTaxrate();
+        foreach( $basket->getProducts() as $product )
+        {
+            $price = clone $product->getPrice();
+            $taxrate = $price->getTaxrate();
 
-			if( isset( $taxrates[$taxrate] ) ) {
-				$taxrates[$taxrate]->addItem( $price, $product->getQuantity() );
-			} else {
-				$taxrates[$taxrate] = $price->addItem( $price, $product->getQuantity() - 1 );
-			}
-		}
+            if( isset( $taxrates[$taxrate] ) ) {
+                $taxrates[$taxrate]->addItem( $price, $product->getQuantity() );
+            } else {
+                $taxrates[$taxrate] = $price->addItem( $price, $product->getQuantity() - 1 );
+            }
+        }
 
-		try
-		{
-			$price = clone $basket->getService( 'delivery' )->getPrice();
-			$taxrate = $price->getTaxrate();
+        try
+        {
+            $price = clone $basket->getService( 'delivery' )->getPrice();
+            $taxrate = $price->getTaxrate();
 
-			if( isset( $taxrates[$taxrate] ) ) {
-				$taxrates[$taxrate]->addItem( $price );
-			} else {
-				$taxrates[$taxrate] = $price;
-			}
-		}
-		catch( \Exception $e ) { ; } // if delivery service isn't available
+            if( isset( $taxrates[$taxrate] ) ) {
+                $taxrates[$taxrate]->addItem( $price );
+            } else {
+                $taxrates[$taxrate] = $price;
+            }
+        }
+        catch( \Exception $e ) { ; } // if delivery service isn't available
 
-		try
-		{
-			$price = clone $basket->getService( 'payment' )->getPrice();
-			$taxrate = $price->getTaxrate();
+        try
+        {
+            $price = clone $basket->getService( 'payment' )->getPrice();
+            $taxrate = $price->getTaxrate();
 
-			if( isset( $taxrates[$taxrate] ) ) {
-				$taxrates[$taxrate]->addItem( $price );
-			} else {
-				$taxrates[$taxrate] = $price;
-			}
-		}
-		catch( \Exception $e ) { ; } // if payment service isn't available
+            if( isset( $taxrates[$taxrate] ) ) {
+                $taxrates[$taxrate]->addItem( $price );
+            } else {
+                $taxrates[$taxrate] = $price;
+            }
+        }
+        catch( \Exception $e ) { ; } // if payment service isn't available
 
-		return $taxrates;
-	}
+        return $taxrates;
+    }
 
 
-	/**
-	 * Returns the payment status at which download files are shown
-	 *
-	 * @return integer Payment status from \Aimeos\MShop\Order\Item\Base
-	 */
-	protected function getDownloadPaymentStatus()
-	{
-		$config = $this->getContext()->getConfig();
-		$default = \Aimeos\MShop\Order\Item\Base::PAY_RECEIVED;
+    /**
+     * Returns the payment status at which download files are shown
+     *
+     * @return integer Payment status from \Aimeos\MShop\Order\Item\Base
+     */
+    protected function getDownloadPaymentStatus()
+    {
+        $config = $this->getContext()->getConfig();
+        $default = \Aimeos\MShop\Order\Item\Base::PAY_RECEIVED;
 
-		/** client/html/common/summary/detail/download/payment-status
-		 * Minium payment status value for product download files
-		 *
-		 * This setting specifies the payment status value of an order for which
-		 * links to bought product download files are shown on the "thank you"
-		 * page, in the "MyAccount" and in the e-mails sent to the customers.
-		 *
-		 * The value is one of the payment constant values from
-		 * {@link https://github.com/aimeos/aimeos-core/blob/master/lib/mshoplib/src/MShop/Order/Item/Base.php#L105}.
-		 * Most of the time, only two values are of interest:
-		 * * 5: payment authorized
-		 * * 6: payment received
-		 *
-		 * @param integer Order payment constant value
-		 * @since 2016.3
-		 * @category User
-		 * @category Developer
-		 */
-		return $config->get( 'client/html/common/summary/detail/download/payment-status', $default );
-	}
+        /** client/html/common/summary/detail/download/payment-status
+         * Minium payment status value for product download files
+         *
+         * This setting specifies the payment status value of an order for which
+         * links to bought product download files are shown on the "thank you"
+         * page, in the "MyAccount" and in the e-mails sent to the customers.
+         *
+         * The value is one of the payment constant values from
+         * {@link https://github.com/aimeos/aimeos-core/blob/master/lib/mshoplib/src/MShop/Order/Item/Base.php#L105}.
+         * Most of the time, only two values are of interest:
+         * * 5: payment authorized
+         * * 6: payment received
+         *
+         * @param integer Order payment constant value
+         * @since 2016.3
+         * @category User
+         * @category Developer
+         */
+        return $config->get( 'client/html/common/summary/detail/download/payment-status', $default );
+    }
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -27,47 +27,47 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket containing the products, services, etc.
 	 * @return array Associative list of tax rates as key and corresponding amounts as value
 	 */
-	protected function getTaxRates( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function getTaxRates(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$taxrates = array();
 
-		foreach( $basket->getProducts() as $product )
+		foreach ($basket->getProducts() as $product)
 		{
 			$price = clone $product->getPrice();
 			$taxrate = $price->getTaxrate();
 
-			if( isset( $taxrates[$taxrate] ) ) {
-				$taxrates[$taxrate]->addItem( $price, $product->getQuantity() );
+			if (isset($taxrates[$taxrate])) {
+				$taxrates[$taxrate]->addItem($price, $product->getQuantity());
 			} else {
-				$taxrates[$taxrate] = $price->addItem( $price, $product->getQuantity() - 1 );
+				$taxrates[$taxrate] = $price->addItem($price, $product->getQuantity() - 1);
 			}
 		}
 
 		try
 		{
-			$price = clone $basket->getService( 'delivery' )->getPrice();
+			$price = clone $basket->getService('delivery')->getPrice();
 			$taxrate = $price->getTaxrate();
 
-			if( isset( $taxrates[$taxrate] ) ) {
-				$taxrates[$taxrate]->addItem( $price );
+			if (isset($taxrates[$taxrate])) {
+				$taxrates[$taxrate]->addItem($price);
 			} else {
 				$taxrates[$taxrate] = $price;
 			}
 		}
-		catch( \Exception $e ) { ; } // if delivery service isn't available
+		catch (\Exception $e) {; } // if delivery service isn't available
 
 		try
 		{
-			$price = clone $basket->getService( 'payment' )->getPrice();
+			$price = clone $basket->getService('payment')->getPrice();
 			$taxrate = $price->getTaxrate();
 
-			if( isset( $taxrates[$taxrate] ) ) {
-				$taxrates[$taxrate]->addItem( $price );
+			if (isset($taxrates[$taxrate])) {
+				$taxrates[$taxrate]->addItem($price);
 			} else {
 				$taxrates[$taxrate] = $price;
 			}
 		}
-		catch( \Exception $e ) { ; } // if payment service isn't available
+		catch (\Exception $e) {; } // if payment service isn't available
 
 		return $taxrates;
 	}
@@ -101,6 +101,6 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		return $config->get( 'client/html/common/summary/detail/download/payment-status', $default );
+		return $config->get('client/html/common/summary/detail/download/payment-status', $default);
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
 			} else {
 				$taxrates[$taxrate] = $price;
 			}
-		}
-		catch( \Exception $e ) { ; } // if delivery service isn't available
+		} catch( \Exception $e ) { ; } // if delivery service isn't available
 
 		try
 		{
@@ -66,8 +65,7 @@ 
 			} else {
 				$taxrates[$taxrate] = $price;
 			}
-		}
-		catch( \Exception $e ) { ; } // if payment service isn't available
+		} catch( \Exception $e ) { ; } // if payment service isn't available
 
 		return $taxrates;
 	}

client/html/src/Client/Html/Common/Summary/Address/Base.php

Indentation +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
  * @subpackage Html
  */
 abstract class Base
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
 {
 }
\ No newline at end of file

client/html/src/Client/Html/Common/Client/Factory/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
 	 * 	and a list of relative paths inside the core or the extension as values
 	 * @return void
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths);
 }

Indentation +9 added lines, -9 removed lines

@@ -19,14 +19,14 @@
  * @subpackage Html
  */
 interface Iface
-	extends \Aimeos\Client\Html\Iface
+    extends \Aimeos\Client\Html\Iface
 {
-	/**
-	 * Initializes the class instance.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
-	 * 	and a list of relative paths inside the core or the extension as values
-	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
+    /**
+     * Initializes the class instance.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context object
+     * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
+     * 	and a list of relative paths inside the core or the extension as values
+     */
+    public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
 }

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

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 	 * 	and a list of relative paths inside the core or the extension as values
 	 * @param \Aimeos\Client\Html\Iface $client Client object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths)
 	{
-		parent::__construct( $context, $templatePaths );
+		parent::__construct($context, $templatePaths);
 	}
 }
\ No newline at end of file

Indentation +13 added lines, -13 removed lines

@@ -18,18 +18,18 @@
  * @subpackage Html
  */
 abstract class Base
-	extends \Aimeos\Client\Html\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/**
-	 * Initializes the object instance
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
-	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
-	 * 	and a list of relative paths inside the core or the extension as values
-	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
-	{
-		parent::__construct( $context, $templatePaths );
-	}
+    /**
+     * Initializes the object instance
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
+     * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
+     * 	and a list of relative paths inside the core or the extension as values
+     */
+    public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
+    {
+        parent::__construct( $context, $templatePaths );
+    }
 }
\ No newline at end of file

client/html/src/Client/Html/Common/Decorator/Iface.php

Indentation +11 added lines, -11 removed lines

@@ -19,16 +19,16 @@
  * @subpackage Html
  */
 interface Iface
-	extends \Aimeos\Client\Html\Iface
+    extends \Aimeos\Client\Html\Iface
 {
-	/**
-	 * Initializes a new client decorator object.
-	 *
-	 * @param \Aimeos\Client\Html\Iface $client Client object
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
-	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
-	 * 	and a list of relative paths inside the core or the extension as values
-	 */
-	public function __construct( \Aimeos\Client\Html\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
+    /**
+     * Initializes a new client decorator object.
+     *
+     * @param \Aimeos\Client\Html\Iface $client Client object
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
+     * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
+     * 	and a list of relative paths inside the core or the extension as values
+     */
+    public function __construct( \Aimeos\Client\Html\Iface $client,
+        \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -29,6 +29,6 @@
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
 	 */
-	public function __construct( \Aimeos\Client\Html\Iface $client,
-		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths );
+	public function __construct(\Aimeos\Client\Html\Iface $client,
+		\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths);
 }
\ No newline at end of file

client/html/src/Client/Html/Common/Factory/Iface.php

Indentation +9 added lines, -9 removed lines

@@ -20,13 +20,13 @@
  */
 interface Iface
 {
-	/**
-	 *	Creates a client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
-	 * @param array List of file system paths where the templates are stored
-	 * @param string $name Client name (from configuration or "Standard" if null)
-	 * @return \Aimeos\Client\Html\Iface New client object
-	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null );
+    /**
+     *	Creates a client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
+     * @param array List of file system paths where the templates are stored
+     * @param string $name Client name (from configuration or "Standard" if null)
+     * @return \Aimeos\Client\Html\Iface New client object
+     */
+    public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null );
 }

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 	 * @param string $name Client name (from configuration or "Standard" if null)
 	 * @return \Aimeos\Client\Html\Iface New client object
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null );
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null);
 }

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

Indentation +151 added lines, -151 removed lines

@@ -20,155 +20,155 @@
  */
 class Base
 {
-	private static $objects = array();
-
-
-	/**
-	 * Injects a client object.
-	 * The object is returned via createClient() if an instance of the class
-	 * with the name name is requested.
-	 *
-	 * @param string $classname Full name of the class for which the object should be returned
-	 * @param \Aimeos\Client\Html\Iface|null $client ExtJS client object
-	 */
-	public static function injectClient( $classname, \Aimeos\Client\Html\Iface $client = null )
-	{
-		self::$objects[$classname] = $client;
-	}
-
-
-	/**
-	 * Adds the decorators to the client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
-	 * @param \Aimeos\Client\Html\Iface $client Client object
-	 * @param array $templatePaths List of file system paths where the templates are stored
-	 * @param array $decorators List of decorator name that should be wrapped around the client
-	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Client\Html\Catalog\Decorator\"
-	 * @return \Aimeos\Client\Html\Iface Client object
-	 */
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Client\Html\Iface $client, array $templatePaths, array $decorators, $classprefix )
-	{
-		$iface = '\\Aimeos\\Client\\Html\\Common\\Decorator\\Iface';
-
-		foreach( $decorators as $name )
-		{
-			if( ctype_alnum( $name ) === false )
-			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
-			}
-
-			$classname = $classprefix . $name;
-
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
-			}
-
-			$client = new $classname( $client, $context, $templatePaths );
-
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ) );
-			}
-		}
-
-		return $client;
-	}
-
-
-	/**
-	 * Adds the decorators to the client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
-	 * @param \Aimeos\Client\Html\Iface $client Client object
-	 * @param array $templatePaths List of file system paths where the templates are stored
-	 * @param string $path Path of the client in lower case, e.g. "catalog/detail"
-	 * @return \Aimeos\Client\Html\Iface Client object
-	 */
-	protected static function addClientDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Client\Html\Iface $client, array $templatePaths, $path )
-	{
-		if( !is_string( $path ) || $path === '' ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid domain "%1$s"', $path ) );
-		}
-
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
-		$config = $context->getConfig();
-
-		/** client/html/common/decorators/default
-		 * Configures the list of decorators applied to all html clients
-		 *
-		 * 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 configure a list of decorator names that should
-		 * be wrapped around the original instance of all created clients:
-		 *
-		 *  client/html/common/decorators/default = array( 'decorator1', 'decorator2' )
-		 *
-		 * This would wrap the decorators named "decorator1" and "decorator2" around
-		 * all client instances in that order. The decorator classes would be
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" and
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator2".
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.03
-		 * @category Developer
-		 */
-		$decorators = $config->get( 'client/html/common/decorators/default', array() );
-		$excludes = $config->get( 'client/html/' . $path . '/decorators/excludes', array() );
-
-		foreach( $decorators as $key => $name )
-		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
-			}
-		}
-
-		$classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
-		$client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
-
-		$classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
-		$decorators = $config->get( 'client/html/' . $path . '/decorators/global', array() );
-		$client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
-
-		$classprefix = '\\Aimeos\\Client\\Html\\' . $localClass . '\\Decorator\\';
-		$decorators = $config->get( 'client/html/' . $path . '/decorators/local', array() );
-		$client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
-
-		return $client;
-	}
-
-
-	/**
-	 * Creates a client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
-	 * @param string $classname Name of the client class
-	 * @param string $interface Name of the client interface
-	 * @param array $templatePaths List of file system paths where the templates are stored
-	 * @return \Aimeos\Client\Html\\Iface Client object
-	 * @throws \Aimeos\Client\Html\Exception If client couldn't be found or doesn't implement the interface
-	 */
-	protected static function createClientBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface, $templatePaths )
-	{
-		if( isset( self::$objects[$classname] ) ) {
-			return self::$objects[$classname];
-		}
-
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
-		}
-
-		$client = new $classname( $context, $templatePaths );
-
-		if( !( $client instanceof $interface ) ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
-		}
-
-		return $client;
-	}
+    private static $objects = array();
+
+
+    /**
+     * Injects a client object.
+     * The object is returned via createClient() if an instance of the class
+     * with the name name is requested.
+     *
+     * @param string $classname Full name of the class for which the object should be returned
+     * @param \Aimeos\Client\Html\Iface|null $client ExtJS client object
+     */
+    public static function injectClient( $classname, \Aimeos\Client\Html\Iface $client = null )
+    {
+        self::$objects[$classname] = $client;
+    }
+
+
+    /**
+     * Adds the decorators to the client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
+     * @param \Aimeos\Client\Html\Iface $client Client object
+     * @param array $templatePaths List of file system paths where the templates are stored
+     * @param array $decorators List of decorator name that should be wrapped around the client
+     * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Client\Html\Catalog\Decorator\"
+     * @return \Aimeos\Client\Html\Iface Client object
+     */
+    protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
+        \Aimeos\Client\Html\Iface $client, array $templatePaths, array $decorators, $classprefix )
+    {
+        $iface = '\\Aimeos\\Client\\Html\\Common\\Decorator\\Iface';
+
+        foreach( $decorators as $name )
+        {
+            if( ctype_alnum( $name ) === false )
+            {
+                $classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
+                throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+            }
+
+            $classname = $classprefix . $name;
+
+            if( class_exists( $classname ) === false ) {
+                throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+            }
+
+            $client = new $classname( $client, $context, $templatePaths );
+
+            if( !( $client instanceof $iface ) ) {
+                throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ) );
+            }
+        }
+
+        return $client;
+    }
+
+
+    /**
+     * Adds the decorators to the client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
+     * @param \Aimeos\Client\Html\Iface $client Client object
+     * @param array $templatePaths List of file system paths where the templates are stored
+     * @param string $path Path of the client in lower case, e.g. "catalog/detail"
+     * @return \Aimeos\Client\Html\Iface Client object
+     */
+    protected static function addClientDecorators( \Aimeos\MShop\Context\Item\Iface $context,
+        \Aimeos\Client\Html\Iface $client, array $templatePaths, $path )
+    {
+        if( !is_string( $path ) || $path === '' ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid domain "%1$s"', $path ) );
+        }
+
+        $localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+        $config = $context->getConfig();
+
+        /** client/html/common/decorators/default
+         * Configures the list of decorators applied to all html clients
+         *
+         * 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 configure a list of decorator names that should
+         * be wrapped around the original instance of all created clients:
+         *
+         *  client/html/common/decorators/default = array( 'decorator1', 'decorator2' )
+         *
+         * This would wrap the decorators named "decorator1" and "decorator2" around
+         * all client instances in that order. The decorator classes would be
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" and
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator2".
+         *
+         * @param array List of decorator names
+         * @since 2014.03
+         * @category Developer
+         */
+        $decorators = $config->get( 'client/html/common/decorators/default', array() );
+        $excludes = $config->get( 'client/html/' . $path . '/decorators/excludes', array() );
+
+        foreach( $decorators as $key => $name )
+        {
+            if( in_array( $name, $excludes ) ) {
+                unset( $decorators[$key] );
+            }
+        }
+
+        $classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
+        $client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
+
+        $classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
+        $decorators = $config->get( 'client/html/' . $path . '/decorators/global', array() );
+        $client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
+
+        $classprefix = '\\Aimeos\\Client\\Html\\' . $localClass . '\\Decorator\\';
+        $decorators = $config->get( 'client/html/' . $path . '/decorators/local', array() );
+        $client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
+
+        return $client;
+    }
+
+
+    /**
+     * Creates a client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context instance with necessary objects
+     * @param string $classname Name of the client class
+     * @param string $interface Name of the client interface
+     * @param array $templatePaths List of file system paths where the templates are stored
+     * @return \Aimeos\Client\Html\\Iface Client object
+     * @throws \Aimeos\Client\Html\Exception If client couldn't be found or doesn't implement the interface
+     */
+    protected static function createClientBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface, $templatePaths )
+    {
+        if( isset( self::$objects[$classname] ) ) {
+            return self::$objects[$classname];
+        }
+
+        if( class_exists( $classname ) === false ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+        }
+
+        $client = new $classname( $context, $templatePaths );
+
+        if( !( $client instanceof $interface ) ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+        }
+
+        return $client;
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Client\Html\Iface|null $client ExtJS client object
 	 */
-	public static function injectClient( $classname, \Aimeos\Client\Html\Iface $client = null )
+	public static function injectClient($classname, \Aimeos\Client\Html\Iface $client = null)
 	{
 		self::$objects[$classname] = $client;
 	}
@@ -47,29 +47,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Client\Html\Catalog\Decorator\"
 	 * @return \Aimeos\Client\Html\Iface Client object
 	 */
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Client\Html\Iface $client, array $templatePaths, array $decorators, $classprefix )
+	protected static function addDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Client\Html\Iface $client, array $templatePaths, array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Client\\Html\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix.$name : '<not a string>';
+				throw new \Aimeos\Client\Html\Exception(sprintf('Invalid class name "%1$s"', $classname));
 			}
 
-			$classname = $classprefix . $name;
+			$classname = $classprefix.$name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$client = new $classname( $client, $context, $templatePaths );
+			$client = new $classname($client, $context, $templatePaths);
 
-			if( !( $client instanceof $iface ) ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ) );
+			if (!($client instanceof $iface)) {
+				throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -86,14 +86,14 @@ 
 	 * @param string $path Path of the client in lower case, e.g. "catalog/detail"
 	 * @return \Aimeos\Client\Html\Iface Client object
 	 */
-	protected static function addClientDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Client\Html\Iface $client, array $templatePaths, $path )
+	protected static function addClientDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Client\Html\Iface $client, array $templatePaths, $path)
 	{
-		if( !is_string( $path ) || $path === '' ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid domain "%1$s"', $path ) );
+		if (!is_string($path) || $path === '') {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid domain "%1$s"', $path));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path)));
 		$config = $context->getConfig();
 
 		/** client/html/common/decorators/default
@@ -118,26 +118,26 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'client/html/common/decorators/default', array() );
-		$excludes = $config->get( 'client/html/' . $path . '/decorators/excludes', array() );
+		$decorators = $config->get('client/html/common/decorators/default', array());
+		$excludes = $config->get('client/html/'.$path.'/decorators/excludes', array());
 
-		foreach( $decorators as $key => $name )
+		foreach ($decorators as $key => $name)
 		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
+			if (in_array($name, $excludes)) {
+				unset($decorators[$key]);
 			}
 		}
 
 		$classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
-		$client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
+		$client = self::addDecorators($context, $client, $templatePaths, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Client\\Html\\Common\\Decorator\\';
-		$decorators = $config->get( 'client/html/' . $path . '/decorators/global', array() );
-		$client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
+		$decorators = $config->get('client/html/'.$path.'/decorators/global', array());
+		$client = self::addDecorators($context, $client, $templatePaths, $decorators, $classprefix);
 
-		$classprefix = '\\Aimeos\\Client\\Html\\' . $localClass . '\\Decorator\\';
-		$decorators = $config->get( 'client/html/' . $path . '/decorators/local', array() );
-		$client = self::addDecorators( $context, $client, $templatePaths, $decorators, $classprefix );
+		$classprefix = '\\Aimeos\\Client\\Html\\'.$localClass.'\\Decorator\\';
+		$decorators = $config->get('client/html/'.$path.'/decorators/local', array());
+		$client = self::addDecorators($context, $client, $templatePaths, $decorators, $classprefix);
 
 		return $client;
 	}
@@ -153,20 +153,20 @@ 
 	 * @return \Aimeos\Client\Html\\Iface Client object
 	 * @throws \Aimeos\Client\Html\Exception If client couldn't be found or doesn't implement the interface
 	 */
-	protected static function createClientBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface, $templatePaths )
+	protected static function createClientBase(\Aimeos\MShop\Context\Item\Iface $context, $classname, $interface, $templatePaths)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$client = new $classname( $context, $templatePaths );
+		$client = new $classname($context, $templatePaths);
 
-		if( !( $client instanceof $interface ) ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (!($client instanceof $interface)) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
 		return $client;

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

Indentation +63 added lines, -63 removed lines

@@ -20,74 +20,74 @@
  */
 interface Iface
 {
-	/**
-	 * 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 );
+    /**
+     * 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 );
 
-	/**
-	 * 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 );
+    /**
+     * 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 );
 
-	/**
-	 * 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 );
+    /**
+     * 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 );
 
-	/**
-	 * Returns the view object that will generate the HTML output.
-	 *
-	 * @return \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 */
-	public function getView();
+    /**
+     * Returns the view object that will generate the HTML output.
+     *
+     * @return \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     */
+    public function getView();
 
-	/**
-	 * Sets the view object that will generate the HTML output.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @return \Aimeos\Client\Html\Iface Reference to this object for fluent calls
-	 */
-	public function setView( \Aimeos\MW\View\Iface $view );
+    /**
+     * Sets the view object that will generate the HTML output.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @return \Aimeos\Client\Html\Iface Reference to this object for fluent calls
+     */
+    public function setView( \Aimeos\MW\View\Iface $view );
 
-	/**
-	 * 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 );
+    /**
+     * 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 );
 
-	/**
-	 * Modifies the cached header 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 header content
-	 */
-	public function modifyHeader( $content, $uid );
+    /**
+     * Modifies the cached header 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 header content
+     */
+    public function modifyHeader( $content, $uid );
 
-	/**
-	 * 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.
-	 *
-	 * @return boolean False if processing is stopped, otherwise all processing was completed successfully
-	 */
-	public function process();
+    /**
+     * 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.
+     *
+     * @return boolean False if processing is stopped, otherwise all processing was completed successfully
+     */
+    public function process();
 }

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,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);
 
 	/**
 	 * Returns the HTML string for insertion into the header.
@@ -37,7 +37,7 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null );
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null);
 
 	/**
 	 * Returns the HTML code for insertion into the body.
@@ -47,7 +47,7 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null );
+	public function getBody($uid = '', array &$tags = array(), &$expire = null);
 
 	/**
 	 * Returns the view object that will generate the HTML output.
@@ -62,7 +62,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
 	 * @return \Aimeos\Client\Html\Iface Reference to this object for fluent calls
 	 */
-	public function setView( \Aimeos\MW\View\Iface $view );
+	public function setView(\Aimeos\MW\View\Iface $view);
 
 	/**
 	 * Modifies the cached body content to replace content based on sessions or cookies.
@@ -71,7 +71,7 @@ 
 	 * @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);
 
 	/**
 	 * Modifies the cached header content to replace content based on sessions or cookies.
@@ -80,7 +80,7 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @return string Modified header content
 	 */
-	public function modifyHeader( $content, $uid );
+	public function modifyHeader($content, $uid);
 
 	/**
 	 * Processes the input, e.g. store given values.

client/html/src/Client/Html/Locale/Select/Currency/Standard.php

Indentation +226 added lines, -226 removed lines

@@ -19,253 +19,253 @@
  * @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/locale/select/currency/standard/subparts
-	 * List of HTML sub-clients rendered within the locale select currency 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/locale/select/currency/standard/subparts';
-	private $subPartNames = array();
+    /** client/html/locale/select/currency/standard/subparts
+     * List of HTML sub-clients rendered within the locale select currency 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/locale/select/currency/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 );
+    /**
+     * 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->currencyBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->currencyBody = $html;
 
-		/** client/html/locale/select/currency/standard/template-body
-		 * Relative path to the HTML body template of the locale select currency 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/locale/select/currency/standard/template-header
-		 */
-		$tplconf = 'client/html/locale/select/currency/standard/template-body';
-		$default = 'locale/select/currency-body-default.php';
+        /** client/html/locale/select/currency/standard/template-body
+         * Relative path to the HTML body template of the locale select currency 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/locale/select/currency/standard/template-header
+         */
+        $tplconf = 'client/html/locale/select/currency/standard/template-body';
+        $default = 'locale/select/currency-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->currencyHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->currencyHeader = $html;
 
-		/** client/html/locale/select/currency/standard/template-header
-		 * Relative path to the HTML header template of the locale select currency 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/locale/select/currency/standard/template-body
-		 */
-		$tplconf = 'client/html/locale/select/currency/standard/template-header';
-		$default = 'locale/select/currency-header-default.php';
+        /** client/html/locale/select/currency/standard/template-header
+         * Relative path to the HTML header template of the locale select currency 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/locale/select/currency/standard/template-body
+         */
+        $tplconf = 'client/html/locale/select/currency/standard/template-header';
+        $default = 'locale/select/currency-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/locale/select/currency/decorators/excludes
-		 * Excludes decorators added by the "common" option from the locale select currency 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/locale/select/currency/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/locale/select/currency/decorators/global
-		 * @see client/html/locale/select/currency/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/locale/select/currency/decorators/excludes
+         * Excludes decorators added by the "common" option from the locale select currency 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/locale/select/currency/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/locale/select/currency/decorators/global
+         * @see client/html/locale/select/currency/decorators/local
+         */
 
-		/** client/html/locale/select/currency/decorators/global
-		 * Adds a list of globally available decorators only to the locale select currency 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/locale/select/currency/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/locale/select/currency/decorators/excludes
-		 * @see client/html/locale/select/currency/decorators/local
-		 */
+        /** client/html/locale/select/currency/decorators/global
+         * Adds a list of globally available decorators only to the locale select currency 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/locale/select/currency/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/locale/select/currency/decorators/excludes
+         * @see client/html/locale/select/currency/decorators/local
+         */
 
-		/** client/html/locale/select/currency/decorators/local
-		 * Adds a list of local decorators only to the locale select currency 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\Checkout\Decorator\*") around the html client.
-		 *
-		 *  client/html/locale/select/currency/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Checkout\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/locale/select/currency/decorators/excludes
-		 * @see client/html/locale/select/currency/decorators/global
-		 */
+        /** client/html/locale/select/currency/decorators/local
+         * Adds a list of local decorators only to the locale select currency 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\Checkout\Decorator\*") around the html client.
+         *
+         *  client/html/locale/select/currency/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Checkout\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/locale/select/currency/decorators/excludes
+         * @see client/html/locale/select/currency/decorators/global
+         */
 
-		return $this->createSubClient( 'locale/select/currency/' . $type, $name );
-	}
+        return $this->createSubClient( 'locale/select/currency/' . $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();
-		$config = $context->getConfig();
-		$session = $context->getSession();
+    /**
+     * 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();
+        $config = $context->getConfig();
+        $session = $context->getSession();
 
-		$name = $config->get( 'client/html/locale/select/currency/param-name', 'loc_currencyid' );
+        $name = $config->get( 'client/html/locale/select/currency/param-name', 'loc_currencyid' );
 
-		if( ( $currencyId = $view->param( $name ) ) !== null ) {
-			$session->set( 'aimeos/locale/currencyId', $currencyId );
-		}
+        if( ( $currencyId = $view->param( $name ) ) !== null ) {
+            $session->set( 'aimeos/locale/currencyId', $currencyId );
+        }
 
-		parent::process();
-	}
+        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 );
-	}
+    /**
+     * 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 +16 added lines, -16 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->currencyBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/locale/select/currency/standard/template-body';
 		$default = 'locale/select/currency-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->currencyHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/locale/select/currency/standard/template-header';
 		$default = 'locale/select/currency-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/locale/select/currency/decorators/excludes
 		 * Excludes decorators added by the "common" option from the locale select currency html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/locale/select/currency/decorators/global
 		 */
 
-		return $this->createSubClient( 'locale/select/currency/' . $type, $name );
+		return $this->createSubClient('locale/select/currency/'.$type, $name);
 	}
 
 
@@ -249,10 +249,10 @@ 
 		$config = $context->getConfig();
 		$session = $context->getSession();
 
-		$name = $config->get( 'client/html/locale/select/currency/param-name', 'loc_currencyid' );
+		$name = $config->get('client/html/locale/select/currency/param-name', 'loc_currencyid');
 
-		if( ( $currencyId = $view->param( $name ) ) !== null ) {
-			$session->set( 'aimeos/locale/currencyId', $currencyId );
+		if (($currencyId = $view->param($name)) !== null) {
+			$session->set('aimeos/locale/currencyId', $currencyId);
 		}
 
 		parent::process();
@@ -266,6 +266,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

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 )
 	{