aimeos / ai-client-html

client/html/src/Client/Html/Checkout/Confirm/Standard.php

Indentation +504 added lines, -504 removed lines

@@ -19,509 +19,509 @@
  * @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/checkout/confirm/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout confirm 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/checkout/confirm/standard/subparts';
-
-	/** client/html/checkout/confirm/intro/name
-	 * Name of the intro part used by the checkout confirm client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Intro\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.07
-	 * @category Developer
-	 */
-
-	/** client/html/checkout/confirm/basic/name
-	 * Name of the basic part used by the checkout confirm client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Basic\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/checkout/confirm/retry/name
-	 * Name of the retry part used by the checkout confirm client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Retry\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.07
-	 * @category Developer
-	 */
-
-	/** client/html/checkout/confirm/order/name
-	 * Name of the order part used by the checkout confirm client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Order\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 2015.02
-	 * @category Developer
-	 */
-	private $subPartNames = array( 'intro', 'basic', 'retry', 'order' );
-	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->confirmBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-
-		/** client/html/checkout/confirm/standard/template-body
-		 * Relative path to the HTML body template of the checkout confirm 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/checkout/confirm/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/confirm/standard/template-body';
-		$default = 'checkout/confirm/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->confirmHeader = $html;
-
-			/** client/html/checkout/confirm/standard/template-header
-			 * Relative path to the HTML header template of the checkout confirm 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/checkout/confirm/standard/template-body
-			 */
-			$tplconf = 'client/html/checkout/confirm/standard/template-header';
-			$default = 'checkout/confirm/header-default.php';
-
-			return $view->render( $view->config( $tplconf, $default ) );
-		}
-		catch( \Exception $e )
-		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-		}
-	}
-
-
-	/**
-	 * 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/checkout/confirm/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout confirm 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/checkout/confirm/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/checkout/confirm/decorators/global
-		 * @see client/html/checkout/confirm/decorators/local
-		 */
-
-		/** client/html/checkout/confirm/decorators/global
-		 * Adds a list of globally available decorators only to the checkout confirm 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/checkout/confirm/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/checkout/confirm/decorators/excludes
-		 * @see client/html/checkout/confirm/decorators/local
-		 */
-
-		/** client/html/checkout/confirm/decorators/local
-		 * Adds a list of local decorators only to the checkout confirm 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/checkout/confirm/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 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/checkout/confirm/decorators/excludes
-		 * @see client/html/checkout/confirm/decorators/global
-		 */
-
-		return $this->createSubClient( 'checkout/confirm/' . $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();
-		$session = $context->getSession();
-		$orderid = $session->get( 'aimeos/orderid' );
-
-		try
-		{
-			if( ( $orderItem = $this->updatePayment( $view, $orderid ) ) === null )
-			{
-				$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-				$orderItem = $orderManager->getItem( $orderid );
-			}
-
-			$view->confirmOrderItem = $orderItem;
-
-
-			parent::process();
-
-
-			if( $orderItem->getPaymentStatus() > \Aimeos\MShop\Order\Item\Base::PAY_REFUSED )
-			{
-				foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
-					$session->set( $key, null );
-				}
-
-				\Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->clear();
-			}
-
-			// Update stock, coupons, etc.
-			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-	}
-
-
-	/**
-	 * Returns the payment service providere for the given code
-	 *
-	 * @param string $code Unique service code
-	 * @throws \Aimeos\Client\Html\Exception If no payment service item could be found
-	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
-	 */
-	protected function getServiceProvider( $code )
-	{
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-
-		$search = $serviceManager->createSearch();
-		$expr = array(
-			$search->compare( '==', 'service.code', $code ),
-			$search->compare( '==', 'service.type.code', 'payment' ),
-		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-
-		$result = $serviceManager->searchItems( $search );
-
-		if( ( $serviceItem = reset( $result ) ) === false )
-		{
-			$msg = sprintf( 'No service for code "%1$s" found', $code );
-			throw new \Aimeos\Client\Html\Exception( $msg );
-		}
-
-		return $serviceManager->getProvider( $serviceItem );
-	}
-
-
-	/**
-	 * 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 URL to the confirm page.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $params Parameters that should be part of the URL
-	 * @param array $config Default URL configuration
-	 * @return string URL string
-	 */
-	protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config )
-	{
-		$target = $view->config( 'client/html/checkout/confirm/url/target' );
-		$cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' );
-		$action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' );
-		$config = $view->config( 'client/html/checkout/confirm/url/config', $config );
-
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
-	}
-
-
-	/**
-	 * Returns the URL to the update page.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $params Parameters that should be part of the URL
-	 * @param array $config Default URL configuration
-	 * @return string URL string
-	 */
-	protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config )
-	{
-		$target = $view->config( 'client/html/checkout/update/url/target' );
-		$cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' );
-		$action = $view->config( 'client/html/checkout/update/url/action', 'update' );
-		$config = $view->config( 'client/html/checkout/update/url/config', $config );
-
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
-	}
-
-
-	/**
-	 * 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->confirmOrderItem ) )
-			{
-				$context = $this->getContext();
-				$orderid = $context->getSession()->get( 'aimeos/orderid' );
-				$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-
-				$view->confirmOrderItem = $orderManager->getItem( $orderid );
-			}
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
-
-
-	/**
-	 * Updates the payment status for the given order ID and returns the order item
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object of the HTML client
-	 * @param string $orderid ID of the order whose payment status should be updated
-	 * @return void|\Aimeos\MShop\Order\Item\Iface Order item that has been updated
-	 */
-	protected function updatePayment( \Aimeos\MW\View\Iface $view, $orderid )
-	{
-		if( ( $code = $view->param( 'code' ) ) === null ) {
-			return;
-		}
-
-		$provider = $this->getServiceProvider( $code );
-
-		$config = array( 'absoluteUri' => true, 'namespace' => false );
-		$params = array( 'code' => $code, 'orderid' => $orderid );
-		$urls = array(
-			'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ),
-			'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ),
-			'client.ipaddress' => $view->request()->getClientAddress(),
-		);
-		$urls['payment.url-self'] = $urls['payment.url-success'];
-		$provider->injectGlobalConfigBE( $urls );
-
-		$reqParams = $view->param();
-		$reqParams['orderid'] = $orderid;
-
-		if( ( $orderItem = $provider->updateSync( $reqParams, $view->request()->getBody() ) ) !== null
-			&& $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
-			&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
-		) {
-			$provider->query( $orderItem );
-		}
-
-		return $orderItem;
-	}
+    /** client/html/checkout/confirm/standard/subparts
+     * List of HTML sub-clients rendered within the checkout confirm 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/checkout/confirm/standard/subparts';
+
+    /** client/html/checkout/confirm/intro/name
+     * Name of the intro part used by the checkout confirm client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Intro\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.07
+     * @category Developer
+     */
+
+    /** client/html/checkout/confirm/basic/name
+     * Name of the basic part used by the checkout confirm client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Basic\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/checkout/confirm/retry/name
+     * Name of the retry part used by the checkout confirm client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Retry\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.07
+     * @category Developer
+     */
+
+    /** client/html/checkout/confirm/order/name
+     * Name of the order part used by the checkout confirm client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Confirm\Order\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 2015.02
+     * @category Developer
+     */
+    private $subPartNames = array( 'intro', 'basic', 'retry', 'order' );
+    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->confirmBody = $html;
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->confirmErrorList = $view->get( 'confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+        }
+
+        /** client/html/checkout/confirm/standard/template-body
+         * Relative path to the HTML body template of the checkout confirm 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/checkout/confirm/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/confirm/standard/template-body';
+        $default = 'checkout/confirm/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->confirmHeader = $html;
+
+            /** client/html/checkout/confirm/standard/template-header
+             * Relative path to the HTML header template of the checkout confirm 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/checkout/confirm/standard/template-body
+             */
+            $tplconf = 'client/html/checkout/confirm/standard/template-header';
+            $default = 'checkout/confirm/header-default.php';
+
+            return $view->render( $view->config( $tplconf, $default ) );
+        }
+        catch( \Exception $e )
+        {
+            $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+        }
+    }
+
+
+    /**
+     * 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/checkout/confirm/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout confirm 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/checkout/confirm/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/checkout/confirm/decorators/global
+         * @see client/html/checkout/confirm/decorators/local
+         */
+
+        /** client/html/checkout/confirm/decorators/global
+         * Adds a list of globally available decorators only to the checkout confirm 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/checkout/confirm/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/checkout/confirm/decorators/excludes
+         * @see client/html/checkout/confirm/decorators/local
+         */
+
+        /** client/html/checkout/confirm/decorators/local
+         * Adds a list of local decorators only to the checkout confirm 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/checkout/confirm/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 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/checkout/confirm/decorators/excludes
+         * @see client/html/checkout/confirm/decorators/global
+         */
+
+        return $this->createSubClient( 'checkout/confirm/' . $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();
+        $session = $context->getSession();
+        $orderid = $session->get( 'aimeos/orderid' );
+
+        try
+        {
+            if( ( $orderItem = $this->updatePayment( $view, $orderid ) ) === null )
+            {
+                $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+                $orderItem = $orderManager->getItem( $orderid );
+            }
+
+            $view->confirmOrderItem = $orderItem;
+
+
+            parent::process();
+
+
+            if( $orderItem->getPaymentStatus() > \Aimeos\MShop\Order\Item\Base::PAY_REFUSED )
+            {
+                foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
+                    $session->set( $key, null );
+                }
+
+                \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->clear();
+            }
+
+            // Update stock, coupons, etc.
+            \Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->confirmErrorList = $view->get( 'confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+        }
+    }
+
+
+    /**
+     * Returns the payment service providere for the given code
+     *
+     * @param string $code Unique service code
+     * @throws \Aimeos\Client\Html\Exception If no payment service item could be found
+     * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
+     */
+    protected function getServiceProvider( $code )
+    {
+        $serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+
+        $search = $serviceManager->createSearch();
+        $expr = array(
+            $search->compare( '==', 'service.code', $code ),
+            $search->compare( '==', 'service.type.code', 'payment' ),
+        );
+        $search->setConditions( $search->combine( '&&', $expr ) );
+
+        $result = $serviceManager->searchItems( $search );
+
+        if( ( $serviceItem = reset( $result ) ) === false )
+        {
+            $msg = sprintf( 'No service for code "%1$s" found', $code );
+            throw new \Aimeos\Client\Html\Exception( $msg );
+        }
+
+        return $serviceManager->getProvider( $serviceItem );
+    }
+
+
+    /**
+     * 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 URL to the confirm page.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $params Parameters that should be part of the URL
+     * @param array $config Default URL configuration
+     * @return string URL string
+     */
+    protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config )
+    {
+        $target = $view->config( 'client/html/checkout/confirm/url/target' );
+        $cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' );
+        $action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' );
+        $config = $view->config( 'client/html/checkout/confirm/url/config', $config );
+
+        return $view->url( $target, $cntl, $action, $params, array(), $config );
+    }
+
+
+    /**
+     * Returns the URL to the update page.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $params Parameters that should be part of the URL
+     * @param array $config Default URL configuration
+     * @return string URL string
+     */
+    protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config )
+    {
+        $target = $view->config( 'client/html/checkout/update/url/target' );
+        $cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' );
+        $action = $view->config( 'client/html/checkout/update/url/action', 'update' );
+        $config = $view->config( 'client/html/checkout/update/url/config', $config );
+
+        return $view->url( $target, $cntl, $action, $params, array(), $config );
+    }
+
+
+    /**
+     * 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->confirmOrderItem ) )
+            {
+                $context = $this->getContext();
+                $orderid = $context->getSession()->get( 'aimeos/orderid' );
+                $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+
+                $view->confirmOrderItem = $orderManager->getItem( $orderid );
+            }
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
+
+
+    /**
+     * Updates the payment status for the given order ID and returns the order item
+     *
+     * @param \Aimeos\MW\View\Iface $view View object of the HTML client
+     * @param string $orderid ID of the order whose payment status should be updated
+     * @return void|\Aimeos\MShop\Order\Item\Iface Order item that has been updated
+     */
+    protected function updatePayment( \Aimeos\MW\View\Iface $view, $orderid )
+    {
+        if( ( $code = $view->param( 'code' ) ) === null ) {
+            return;
+        }
+
+        $provider = $this->getServiceProvider( $code );
+
+        $config = array( 'absoluteUri' => true, 'namespace' => false );
+        $params = array( 'code' => $code, 'orderid' => $orderid );
+        $urls = array(
+            'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ),
+            'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ),
+            'client.ipaddress' => $view->request()->getClientAddress(),
+        );
+        $urls['payment.url-self'] = $urls['payment.url-success'];
+        $provider->injectGlobalConfigBE( $urls );
+
+        $reqParams = $view->param();
+        $reqParams['orderid'] = $orderid;
+
+        if( ( $orderItem = $provider->updateSync( $reqParams, $view->request()->getBody() ) ) !== null
+            && $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
+            && $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
+        ) {
+            $provider->query( $orderItem );
+        }
+
+        return $orderItem;
+    }
 }

Spacing +90 added lines, -90 removed lines

@@ -100,7 +100,7 @@ 
 	 * @since 2015.02
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'intro', 'basic', 'retry', 'order' );
+	private $subPartNames = array('intro', 'basic', 'retry', 'order');
 	private $cache;
 
 
@@ -112,42 +112,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->confirmBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->confirmErrorList = $view->get('confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->confirmErrorList = $view->get('confirmErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->confirmErrorList = $view->get('confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->confirmErrorList = $view->get('confirmErrorList', array()) + $error;
 		}
 
 		/** client/html/checkout/confirm/standard/template-body
@@ -173,7 +173,7 @@ 
 		$tplconf = 'client/html/checkout/confirm/standard/template-body';
 		$default = 'checkout/confirm/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -185,15 +185,15 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		try
 		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
+			$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 			}
 			$view->confirmHeader = $html;
 
@@ -221,11 +221,11 @@ 
 			$tplconf = 'client/html/checkout/confirm/standard/template-header';
 			$default = 'checkout/confirm/header-default.php';
 
-			return $view->render( $view->config( $tplconf, $default ) );
+			return $view->render($view->config($tplconf, $default));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$this->getContext()->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 		}
 	}
 
@@ -237,7 +237,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/checkout/confirm/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout confirm html client
@@ -313,7 +313,7 @@ 
 		 * @see client/html/checkout/confirm/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/confirm/' . $type, $name );
+		return $this->createSubClient('checkout/confirm/'.$type, $name);
 	}
 
 
@@ -327,14 +327,14 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 		$session = $context->getSession();
-		$orderid = $session->get( 'aimeos/orderid' );
+		$orderid = $session->get('aimeos/orderid');
 
 		try
 		{
-			if( ( $orderItem = $this->updatePayment( $view, $orderid ) ) === null )
+			if (($orderItem = $this->updatePayment($view, $orderid)) === null)
 			{
-				$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-				$orderItem = $orderManager->getItem( $orderid );
+				$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+				$orderItem = $orderManager->getItem($orderid);
 			}
 
 			$view->confirmOrderItem = $orderItem;
@@ -343,39 +343,39 @@ 
 			parent::process();
 
 
-			if( $orderItem->getPaymentStatus() > \Aimeos\MShop\Order\Item\Base::PAY_REFUSED )
+			if ($orderItem->getPaymentStatus() > \Aimeos\MShop\Order\Item\Base::PAY_REFUSED)
 			{
-				foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
-					$session->set( $key, null );
+				foreach ($session->get('aimeos/basket/cache', array()) as $key => $value) {
+					$session->set($key, null);
 				}
 
-				\Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->clear();
+				\Aimeos\Controller\Frontend\Factory::createController($context, 'basket')->clear();
 			}
 
 			// Update stock, coupons, etc.
-			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
+			\Aimeos\Controller\Frontend\Factory::createController($context, 'order')->update($orderItem);
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', $e->getMessage()));
+			$view->confirmErrorList = $view->get('confirmErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->confirmErrorList = $view->get('confirmErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->confirmErrorList = $view->get('confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->confirmErrorList = $view->get('confirmErrorList', array()) + $error;
 		}
 	}
 
@@ -387,26 +387,26 @@ 
 	 * @throws \Aimeos\Client\Html\Exception If no payment service item could be found
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	protected function getServiceProvider( $code )
+	protected function getServiceProvider($code)
 	{
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
 		$search = $serviceManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'service.code', $code ),
-			$search->compare( '==', 'service.type.code', 'payment' ),
+			$search->compare('==', 'service.code', $code),
+			$search->compare('==', 'service.type.code', 'payment'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $serviceManager->searchItems( $search );
+		$result = $serviceManager->searchItems($search);
 
-		if( ( $serviceItem = reset( $result ) ) === false )
+		if (($serviceItem = reset($result)) === false)
 		{
-			$msg = sprintf( 'No service for code "%1$s" found', $code );
-			throw new \Aimeos\Client\Html\Exception( $msg );
+			$msg = sprintf('No service for code "%1$s" found', $code);
+			throw new \Aimeos\Client\Html\Exception($msg);
 		}
 
-		return $serviceManager->getProvider( $serviceItem );
+		return $serviceManager->getProvider($serviceItem);
 	}
 
 
@@ -417,7 +417,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -429,14 +429,14 @@ 
 	 * @param array $config Default URL configuration
 	 * @return string URL string
 	 */
-	protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config )
+	protected function getUrlConfirm(\Aimeos\MW\View\Iface $view, array $params, array $config)
 	{
-		$target = $view->config( 'client/html/checkout/confirm/url/target' );
-		$cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' );
-		$action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' );
-		$config = $view->config( 'client/html/checkout/confirm/url/config', $config );
+		$target = $view->config('client/html/checkout/confirm/url/target');
+		$cntl = $view->config('client/html/checkout/confirm/url/controller', 'checkout');
+		$action = $view->config('client/html/checkout/confirm/url/action', 'confirm');
+		$config = $view->config('client/html/checkout/confirm/url/config', $config);
 
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
+		return $view->url($target, $cntl, $action, $params, array(), $config);
 	}
 
 
@@ -448,14 +448,14 @@ 
 	 * @param array $config Default URL configuration
 	 * @return string URL string
 	 */
-	protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config )
+	protected function getUrlUpdate(\Aimeos\MW\View\Iface $view, array $params, array $config)
 	{
-		$target = $view->config( 'client/html/checkout/update/url/target' );
-		$cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' );
-		$action = $view->config( 'client/html/checkout/update/url/action', 'update' );
-		$config = $view->config( 'client/html/checkout/update/url/config', $config );
+		$target = $view->config('client/html/checkout/update/url/target');
+		$cntl = $view->config('client/html/checkout/update/url/controller', 'checkout');
+		$action = $view->config('client/html/checkout/update/url/action', 'update');
+		$config = $view->config('client/html/checkout/update/url/config', $config);
 
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
+		return $view->url($target, $cntl, $action, $params, array(), $config);
 	}
 
 
@@ -467,17 +467,17 @@ 
 	 * @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->confirmOrderItem ) )
+			if (!isset($view->confirmOrderItem))
 			{
 				$context = $this->getContext();
-				$orderid = $context->getSession()->get( 'aimeos/orderid' );
-				$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+				$orderid = $context->getSession()->get('aimeos/orderid');
+				$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
-				$view->confirmOrderItem = $orderManager->getItem( $orderid );
+				$view->confirmOrderItem = $orderManager->getItem($orderid);
 			}
 
 			$this->cache = $view;
@@ -494,32 +494,32 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return void|\Aimeos\MShop\Order\Item\Iface Order item that has been updated
 	 */
-	protected function updatePayment( \Aimeos\MW\View\Iface $view, $orderid )
+	protected function updatePayment(\Aimeos\MW\View\Iface $view, $orderid)
 	{
-		if( ( $code = $view->param( 'code' ) ) === null ) {
+		if (($code = $view->param('code')) === null) {
 			return;
 		}
 
-		$provider = $this->getServiceProvider( $code );
+		$provider = $this->getServiceProvider($code);
 
-		$config = array( 'absoluteUri' => true, 'namespace' => false );
-		$params = array( 'code' => $code, 'orderid' => $orderid );
+		$config = array('absoluteUri' => true, 'namespace' => false);
+		$params = array('code' => $code, 'orderid' => $orderid);
 		$urls = array(
-			'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ),
-			'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ),
+			'payment.url-success' => $this->getUrlConfirm($view, $params, $config),
+			'payment.url-update' => $this->getUrlUpdate($view, $params, $config),
 			'client.ipaddress' => $view->request()->getClientAddress(),
 		);
 		$urls['payment.url-self'] = $urls['payment.url-success'];
-		$provider->injectGlobalConfigBE( $urls );
+		$provider->injectGlobalConfigBE($urls);
 
 		$reqParams = $view->param();
 		$reqParams['orderid'] = $orderid;
 
-		if( ( $orderItem = $provider->updateSync( $reqParams, $view->request()->getBody() ) ) !== null
+		if (($orderItem = $provider->updateSync($reqParams, $view->request()->getBody())) !== null
 			&& $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
-			&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
+			&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
 		) {
-			$provider->query( $orderItem );
+			$provider->query($orderItem);
 		}
 
 		return $orderItem;

Braces +9 added lines, -18 removed lines

@@ -126,23 +126,19 @@ 
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 			}
 			$view->confirmBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->confirmErrorList = $view->get( 'confirmErrorList', 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->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -222,8 +218,7 @@ 
 			$default = 'checkout/confirm/header-default.php';
 
 			return $view->render( $view->config( $tplconf, $default ) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 		}
@@ -354,23 +349,19 @@ 
 
 			// Update stock, coupons, etc.
 			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 

client/html/src/Client/Html/Checkout/Confirm/Basic/Standard.php

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/checkout/confirm/basic/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout confirm basic 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/checkout/confirm/basic/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->basicBody = $html;
-
-		/** client/html/checkout/confirm/basic/standard/template-body
-		 * Relative path to the HTML body template of the checkout confirm basic 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/checkout/confirm/basic/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/confirm/basic/standard/template-body';
-		$default = 'checkout/confirm/basic-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->basicHeader = $html;
-
-		/** client/html/checkout/confirm/basic/standard/template-header
-		 * Relative path to the HTML header template of the checkout confirm basic 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/checkout/confirm/basic/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/confirm/basic/standard/template-header';
-		$default = 'checkout/confirm/basic-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/checkout/confirm/basic/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout confirm basic 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/checkout/confirm/basic/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/checkout/confirm/basic/decorators/global
-		 * @see client/html/checkout/confirm/basic/decorators/local
-		 */
-
-		/** client/html/checkout/confirm/basic/decorators/global
-		 * Adds a list of globally available decorators only to the checkout confirm basic 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/checkout/confirm/basic/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/checkout/confirm/basic/decorators/excludes
-		 * @see client/html/checkout/confirm/basic/decorators/local
-		 */
-
-		/** client/html/checkout/confirm/basic/decorators/local
-		 * Adds a list of local decorators only to the checkout confirm basic 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/checkout/confirm/basic/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/checkout/confirm/basic/decorators/excludes
-		 * @see client/html/checkout/confirm/basic/decorators/global
-		 */
-
-		return $this->createSubClient( 'checkout/confirm/basic/' . $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/checkout/confirm/basic/standard/subparts
+     * List of HTML sub-clients rendered within the checkout confirm basic 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/checkout/confirm/basic/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->basicBody = $html;
+
+        /** client/html/checkout/confirm/basic/standard/template-body
+         * Relative path to the HTML body template of the checkout confirm basic 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/checkout/confirm/basic/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/confirm/basic/standard/template-body';
+        $default = 'checkout/confirm/basic-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->basicHeader = $html;
+
+        /** client/html/checkout/confirm/basic/standard/template-header
+         * Relative path to the HTML header template of the checkout confirm basic 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/checkout/confirm/basic/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/confirm/basic/standard/template-header';
+        $default = 'checkout/confirm/basic-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/checkout/confirm/basic/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout confirm basic 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/checkout/confirm/basic/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/checkout/confirm/basic/decorators/global
+         * @see client/html/checkout/confirm/basic/decorators/local
+         */
+
+        /** client/html/checkout/confirm/basic/decorators/global
+         * Adds a list of globally available decorators only to the checkout confirm basic 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/checkout/confirm/basic/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/checkout/confirm/basic/decorators/excludes
+         * @see client/html/checkout/confirm/basic/decorators/local
+         */
+
+        /** client/html/checkout/confirm/basic/decorators/local
+         * Adds a list of local decorators only to the checkout confirm basic 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/checkout/confirm/basic/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/checkout/confirm/basic/decorators/excludes
+         * @see client/html/checkout/confirm/basic/decorators/global
+         */
+
+        return $this->createSubClient( 'checkout/confirm/basic/' . $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->basicBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/checkout/confirm/basic/standard/template-body';
 		$default = 'checkout/confirm/basic-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->basicHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/checkout/confirm/basic/standard/template-header';
 		$default = 'checkout/confirm/basic-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/checkout/confirm/basic/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout confirm basic html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/checkout/confirm/basic/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/confirm/basic/' . $type, $name );
+		return $this->createSubClient('checkout/confirm/basic/'.$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

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

client/html/src/Client/Html/Checkout/Confirm/Intro/Standard.php

Indentation +227 added lines, -227 removed lines

@@ -19,251 +19,251 @@
  * @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/checkout/confirm/intro/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout confirm intro 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/checkout/confirm/intro/standard/subparts';
-	private $subPartNames = array();
+    /** client/html/checkout/confirm/intro/standard/subparts
+     * List of HTML sub-clients rendered within the checkout confirm intro 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/checkout/confirm/intro/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->introBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->introBody = $html;
 
-		/** client/html/checkout/confirm/intro/standard/template-body
-		 * Relative path to the HTML body template of the checkout confirm intro 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.
-		 *
-		 * The introduction part of the checkout confirm html client allows to use
-		 * a different template for each payment status value. You can create a
-		 * template for each payment status and store it in the "checkout/confirm/<status number>/"
-		 * directory below the "templates" directory (usually in client/html/templates).
-		 * If no specific layout template is found, the common template in the
-		 * "checkout/confirm/" directory is used.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @since 2014.07 - one template for each payment status
-		 * @category Developer
-		 * @see client/html/checkout/confirm/intro/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/confirm/intro/standard/template-body';
+        /** client/html/checkout/confirm/intro/standard/template-body
+         * Relative path to the HTML body template of the checkout confirm intro 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.
+         *
+         * The introduction part of the checkout confirm html client allows to use
+         * a different template for each payment status value. You can create a
+         * template for each payment status and store it in the "checkout/confirm/<status number>/"
+         * directory below the "templates" directory (usually in client/html/templates).
+         * If no specific layout template is found, the common template in the
+         * "checkout/confirm/" directory is used.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @since 2014.07 - one template for each payment status
+         * @category Developer
+         * @see client/html/checkout/confirm/intro/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/confirm/intro/standard/template-body';
 
-		$status = $view->confirmOrderItem->getPaymentStatus();
-		$default = array( 'checkout/confirm/' . $status . '/intro-body-default.php', 'checkout/confirm/intro-body-default.php' );
+        $status = $view->confirmOrderItem->getPaymentStatus();
+        $default = array( 'checkout/confirm/' . $status . '/intro-body-default.php', 'checkout/confirm/intro-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->introHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->introHeader = $html;
 
-		/** client/html/checkout/confirm/intro/standard/template-header
-		 * Relative path to the HTML header template of the checkout confirm intro 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.
-		 *
-		 * The introduction part of the checkout confirm html client allows to use
-		 * a different template for each payment status value. You can create a
-		 * template for each payment status and store it in the "checkout/confirm/<status number>/"
-		 * directory below the "templates" directory (usually in client/html/templates).
-		 * If no specific layout template is found, the common template in the
-		 * "checkout/confirm/" directory is used.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2014.03
-		 * @since 2014.07 - one template for each payment status
-		 * @category Developer
-		 * @see client/html/checkout/confirm/intro/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/confirm/intro/standard/template-header';
+        /** client/html/checkout/confirm/intro/standard/template-header
+         * Relative path to the HTML header template of the checkout confirm intro 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.
+         *
+         * The introduction part of the checkout confirm html client allows to use
+         * a different template for each payment status value. You can create a
+         * template for each payment status and store it in the "checkout/confirm/<status number>/"
+         * directory below the "templates" directory (usually in client/html/templates).
+         * If no specific layout template is found, the common template in the
+         * "checkout/confirm/" directory is used.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2014.03
+         * @since 2014.07 - one template for each payment status
+         * @category Developer
+         * @see client/html/checkout/confirm/intro/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/confirm/intro/standard/template-header';
 
-		$status = $view->confirmOrderItem->getPaymentStatus();
-		$default = array( 'checkout/confirm/' . $status . '/intro-header-default.php', 'checkout/confirm/intro-header-default.php' );
+        $status = $view->confirmOrderItem->getPaymentStatus();
+        $default = array( 'checkout/confirm/' . $status . '/intro-header-default.php', 'checkout/confirm/intro-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/checkout/confirm/intro/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout confirm intro 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/checkout/confirm/intro/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/checkout/confirm/intro/decorators/global
-		 * @see client/html/checkout/confirm/intro/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/checkout/confirm/intro/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout confirm intro 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/checkout/confirm/intro/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/checkout/confirm/intro/decorators/global
+         * @see client/html/checkout/confirm/intro/decorators/local
+         */
 
-		/** client/html/checkout/confirm/intro/decorators/global
-		 * Adds a list of globally available decorators only to the checkout confirm intro 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/checkout/confirm/intro/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/checkout/confirm/intro/decorators/excludes
-		 * @see client/html/checkout/confirm/intro/decorators/local
-		 */
+        /** client/html/checkout/confirm/intro/decorators/global
+         * Adds a list of globally available decorators only to the checkout confirm intro 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/checkout/confirm/intro/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/checkout/confirm/intro/decorators/excludes
+         * @see client/html/checkout/confirm/intro/decorators/local
+         */
 
-		/** client/html/checkout/confirm/intro/decorators/local
-		 * Adds a list of local decorators only to the checkout confirm intro 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/checkout/confirm/intro/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/checkout/confirm/intro/decorators/excludes
-		 * @see client/html/checkout/confirm/intro/decorators/global
-		 */
+        /** client/html/checkout/confirm/intro/decorators/local
+         * Adds a list of local decorators only to the checkout confirm intro 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/checkout/confirm/intro/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/checkout/confirm/intro/decorators/excludes
+         * @see client/html/checkout/confirm/intro/decorators/global
+         */
 
-		return $this->createSubClient( 'checkout/confirm/intro/' . $type, $name );
-	}
+        return $this->createSubClient( 'checkout/confirm/intro/' . $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 );
+    }
 }
\ No newline at end of file

Spacing +15 added lines, -15 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->introBody = $html;
 
@@ -108,9 +108,9 @@ 
 		$tplconf = 'client/html/checkout/confirm/intro/standard/template-body';
 
 		$status = $view->confirmOrderItem->getPaymentStatus();
-		$default = array( 'checkout/confirm/' . $status . '/intro-body-default.php', 'checkout/confirm/intro-body-default.php' );
+		$default = array('checkout/confirm/'.$status.'/intro-body-default.php', 'checkout/confirm/intro-body-default.php');
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -122,13 +122,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->introHeader = $html;
 
@@ -164,9 +164,9 @@ 
 		$tplconf = 'client/html/checkout/confirm/intro/standard/template-header';
 
 		$status = $view->confirmOrderItem->getPaymentStatus();
-		$default = array( 'checkout/confirm/' . $status . '/intro-header-default.php', 'checkout/confirm/intro-header-default.php' );
+		$default = array('checkout/confirm/'.$status.'/intro-header-default.php', 'checkout/confirm/intro-header-default.php');
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -177,7 +177,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/checkout/confirm/intro/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout confirm intro html client
@@ -253,7 +253,7 @@ 
 		 * @see client/html/checkout/confirm/intro/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/confirm/intro/' . $type, $name );
+		return $this->createSubClient('checkout/confirm/intro/'.$type, $name);
 	}
 
 
@@ -264,6 +264,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 )
 	{

client/html/src/Client/Html/Checkout/Standard/Process/Standard.php

Spacing +84 added lines, -84 removed lines

@@ -12,7 +12,7 @@ 
 
 
 // Strings for translation
-sprintf( 'process' );
+sprintf('process');
 
 
 /**
@@ -70,19 +70,19 @@ 
 	 * @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->getView();
 
-		if( !in_array( $view->get( 'standardStepActive' ), array( 'order', 'process' ) ) ) {
+		if (!in_array($view->get('standardStepActive'), array('order', 'process'))) {
 			return '';
 		}
 
-		$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->processBody = $html;
 
@@ -109,7 +109,7 @@ 
 		$tplconf = 'client/html/checkout/standard/process/standard/template-body';
 		$default = 'checkout/standard/process-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -121,19 +121,19 @@ 
 	 * @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->getView();
 
-		if( !in_array( $view->param( 'standardStepActive' ), array( 'order', 'process' ) ) ) {
+		if (!in_array($view->param('standardStepActive'), array('order', 'process'))) {
 			return '';
 		}
 
-		$view = $this->setViewParams( $view, $tags, $expire );
+		$view = $this->setViewParams($view, $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->processHeader = $html;
 
@@ -161,7 +161,7 @@ 
 		$tplconf = 'client/html/checkout/standard/process/standard/template-header';
 		$default = 'checkout/standard/process-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -172,7 +172,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/checkout/standard/process/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard process html client
@@ -248,7 +248,7 @@ 
 		 * @see client/html/checkout/standard/process/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/process/' . $type, $name );
+		return $this->createSubClient('checkout/standard/process/'.$type, $name);
 	}
 
 
@@ -260,41 +260,41 @@ 
 	public function process()
 	{
 		$view = $this->getView();
-		$errors = $view->get( 'standardErrorList', array() );
+		$errors = $view->get('standardErrorList', array());
 
-		if( !in_array( $view->param( 'c_step' ), array( 'order', 'process' ) ) || !empty( $errors ) ) {
+		if (!in_array($view->param('c_step'), array('order', 'process')) || !empty($errors)) {
 			return;
 		}
 
 		$context = $this->getContext();
 		$session = $context->getSession();
-		$orderid = $session->get( 'aimeos/orderid' );
-		$config = array( 'absoluteUri' => true, 'namespace' => false );
+		$orderid = $session->get('aimeos/orderid');
+		$config = array('absoluteUri' => true, 'namespace' => false);
 
 		try
 		{
-			$orderItem = \Aimeos\MShop\Factory::createManager( $context, 'order' )->getItem( $orderid );
+			$orderItem = \Aimeos\MShop\Factory::createManager($context, 'order')->getItem($orderid);
 
-			if( ( $code = $this->getOrderServiceCode( $orderItem->getBaseId() ) ) !== null )
+			if (($code = $this->getOrderServiceCode($orderItem->getBaseId())) !== null)
 			{
-				$serviceItem = $this->getServiceItem( $code );
+				$serviceItem = $this->getServiceItem($code);
 
-				$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-				$provider = $serviceManager->getProvider( $serviceItem );
+				$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+				$provider = $serviceManager->getProvider($serviceItem);
 
-				$params = array( 'code' => $serviceItem->getCode(), 'orderid' => $orderid );
+				$params = array('code' => $serviceItem->getCode(), 'orderid' => $orderid);
 				$urls = array(
-					'payment.url-self' => $this->getUrlSelf( $view, $params + array( 'c_step' => 'process' ), array() ),
-					'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ),
-					'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ),
+					'payment.url-self' => $this->getUrlSelf($view, $params + array('c_step' => 'process'), array()),
+					'payment.url-success' => $this->getUrlConfirm($view, $params, $config),
+					'payment.url-update' => $this->getUrlUpdate($view, $params, $config),
 					'client.ipaddress' => $view->request()->getClientAddress(),
 				);
-				$provider->injectGlobalConfigBE( $urls );
+				$provider->injectGlobalConfigBE($urls);
 
-				if( ( $form = $provider->process( $orderItem, $view->param() ) ) === null )
+				if (($form = $provider->process($orderItem, $view->param())) === null)
 				{
-					$msg = sprintf( 'Invalid process response from service provider with code "%1$s"', $serviceItem->getCode() );
-					throw new \Aimeos\Client\Html\Exception( $msg );
+					$msg = sprintf('Invalid process response from service provider with code "%1$s"', $serviceItem->getCode());
+					throw new \Aimeos\Client\Html\Exception($msg);
 				}
 
 				$view->standardUrlNext = $form->getUrl();
@@ -304,34 +304,34 @@ 
 			}
 			else
 			{
-				$view->standardUrlNext = $this->getUrlConfirm( $view, array(), array() );
+				$view->standardUrlNext = $this->getUrlConfirm($view, array(), array());
 				$view->standardMethod = 'GET';
 			}
 
 
 			parent::process();
 		}
-		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\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;
 		}
 	}
 
@@ -342,20 +342,20 @@ 
 	 * @param string $baseid ID of the order base item
 	 * @return string|null Code of the service item or null if not found
 	 */
-	protected function getOrderServiceCode( $baseid )
+	protected function getOrderServiceCode($baseid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/service');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'order.base.service.baseid', $baseid ),
-			$search->compare( '==', 'order.base.service.type', \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ),
+			$search->compare('==', 'order.base.service.baseid', $baseid),
+			$search->compare('==', 'order.base.service.type', \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) !== false ) {
+		if (($item = reset($result)) !== false) {
 			return $item->getCode();
 		}
 	}
@@ -368,23 +368,23 @@ 
 	 * @throws \Aimeos\Client\Html\Exception If no service item for this code is found
 	 * @return \Aimeos\MShop\Service\Item\Iface Service item object
 	 */
-	protected function getServiceItem( $code )
+	protected function getServiceItem($code)
 	{
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
 		$search = $serviceManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'service.code', $code ),
-			$search->compare( '==', 'service.type.code', 'payment' ),
+			$search->compare('==', 'service.code', $code),
+			$search->compare('==', 'service.type.code', 'payment'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $serviceManager->searchItems( $search );
+		$result = $serviceManager->searchItems($search);
 
-		if( ( $serviceItem = reset( $result ) ) === false )
+		if (($serviceItem = reset($result)) === false)
 		{
-			$msg = sprintf( 'No service for code "%1$s" found', $code );
-			throw new \Aimeos\Client\Html\Exception( $msg );
+			$msg = sprintf('No service for code "%1$s" found', $code);
+			throw new \Aimeos\Client\Html\Exception($msg);
 		}
 
 		return $serviceItem;
@@ -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,7 +410,7 @@ 
 	 * @param array $config Default URL configuration
 	 * @return string URL string
 	 */
-	protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config )
+	protected function getUrlConfirm(\Aimeos\MW\View\Iface $view, array $params, array $config)
 	{
 		/** client/html/checkout/confirm/url/target
 		 * Destination of the URL where the controller specified in the URL is known
@@ -426,7 +426,7 @@ 
 		 * @see client/html/checkout/confirm/url/action
 		 * @see client/html/checkout/confirm/url/config
 		 */
-		$target = $view->config( 'client/html/checkout/confirm/url/target' );
+		$target = $view->config('client/html/checkout/confirm/url/target');
 
 		/** client/html/checkout/confirm/url/controller
 		 * Name of the controller whose action should be called
@@ -442,7 +442,7 @@ 
 		 * @see client/html/checkout/confirm/url/action
 		 * @see client/html/checkout/confirm/url/config
 		 */
-		$cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' );
+		$cntl = $view->config('client/html/checkout/confirm/url/controller', 'checkout');
 
 		/** client/html/checkout/confirm/url/action
 		 * Name of the action that should create the output
@@ -458,7 +458,7 @@ 
 		 * @see client/html/checkout/confirm/url/controller
 		 * @see client/html/checkout/confirm/url/config
 		 */
-		$action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' );
+		$action = $view->config('client/html/checkout/confirm/url/action', 'confirm');
 
 		/** client/html/checkout/confirm/url/config
 		 * Associative list of configuration options used for generating the URL
@@ -481,9 +481,9 @@ 
 		 * @see client/html/checkout/confirm/url/action
 		 * @see client/html/url/config
 		 */
-		$config = $view->config( 'client/html/checkout/confirm/url/config', $config );
+		$config = $view->config('client/html/checkout/confirm/url/config', $config);
 
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
+		return $view->url($target, $cntl, $action, $params, array(), $config);
 	}
 
 
@@ -495,7 +495,7 @@ 
 	 * @param array $config Default URL configuration
 	 * @return string URL string
 	 */
-	protected function getUrlSelf( \Aimeos\MW\View\Iface $view, array $params, array $config )
+	protected function getUrlSelf(\Aimeos\MW\View\Iface $view, array $params, array $config)
 	{
 		/** client/html/checkout/standard/url/target
 		 * Destination of the URL where the controller specified in the URL is known
@@ -511,7 +511,7 @@ 
 		 * @see client/html/checkout/standard/url/action
 		 * @see client/html/checkout/standard/url/config
 		 */
-		$target = $view->config( 'client/html/checkout/standard/url/target' );
+		$target = $view->config('client/html/checkout/standard/url/target');
 
 		/** client/html/checkout/standard/url/controller
 		 * Name of the controller whose action should be called
@@ -527,7 +527,7 @@ 
 		 * @see client/html/checkout/standard/url/action
 		 * @see client/html/checkout/standard/url/config
 		 */
-		$cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
+		$cntl = $view->config('client/html/checkout/standard/url/controller', 'checkout');
 
 		/** client/html/checkout/standard/url/action
 		 * Name of the action that should create the output
@@ -543,7 +543,7 @@ 
 		 * @see client/html/checkout/standard/url/controller
 		 * @see client/html/checkout/standard/url/config
 		 */
-		$action = $view->config( 'client/html/checkout/standard/url/action', 'standard' );
+		$action = $view->config('client/html/checkout/standard/url/action', 'standard');
 
 		/** client/html/checkout/standard/url/config
 		 * Associative list of configuration options used for generating the URL
@@ -566,9 +566,9 @@ 
 		 * @see client/html/checkout/standard/url/action
 		 * @see client/html/url/config
 		 */
-		$config = $view->config( 'client/html/checkout/standard/url/config', $config );
+		$config = $view->config('client/html/checkout/standard/url/config', $config);
 
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
+		return $view->url($target, $cntl, $action, $params, array(), $config);
 	}
 
 
@@ -580,7 +580,7 @@ 
 	 * @param array $config Default URL configuration
 	 * @return string URL string
 	 */
-	protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config )
+	protected function getUrlUpdate(\Aimeos\MW\View\Iface $view, array $params, array $config)
 	{
 		/** client/html/checkout/update/url/target
 		 * Destination of the URL where the controller specified in the URL is known
@@ -596,7 +596,7 @@ 
 		 * @see client/html/checkout/update/url/action
 		 * @see client/html/checkout/update/url/config
 		 */
-		$target = $view->config( 'client/html/checkout/update/url/target' );
+		$target = $view->config('client/html/checkout/update/url/target');
 
 		/** client/html/checkout/update/url/controller
 		 * Name of the controller whose action should be called
@@ -612,7 +612,7 @@ 
 		 * @see client/html/checkout/update/url/action
 		 * @see client/html/checkout/update/url/config
 		 */
-		$cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' );
+		$cntl = $view->config('client/html/checkout/update/url/controller', 'checkout');
 
 		/** client/html/checkout/update/url/action
 		 * Name of the action that should create the output
@@ -628,7 +628,7 @@ 
 		 * @see client/html/checkout/update/url/controller
 		 * @see client/html/checkout/update/url/config
 		 */
-		$action = $view->config( 'client/html/checkout/update/url/action', 'update' );
+		$action = $view->config('client/html/checkout/update/url/action', 'update');
 
 		/** client/html/checkout/update/url/config
 		 * Associative list of configuration options used for generating the URL
@@ -651,9 +651,9 @@ 
 		 * @see client/html/checkout/update/url/action
 		 * @see client/html/url/config
 		 */
-		$config = $view->config( 'client/html/checkout/update/url/config', $config );
+		$config = $view->config('client/html/checkout/update/url/config', $config);
 
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
+		return $view->url($target, $cntl, $action, $params, array(), $config);
 	}
 
 
@@ -665,11 +665,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->standardUrlPayment = $this->getUrlSelf( $view, array( 'c_step' => 'payment' ), array() );
+			$view->standardUrlPayment = $this->getUrlSelf($view, array('c_step' => 'payment'), array());
 
 			$this->cache = $view;
 		}

Braces +5 added lines, -10 removed lines

@@ -301,8 +301,7 @@ 
 				$view->standardMethod = $form->getMethod();
 				$view->standardProcessParams = $form->getValues();
 				$view->standardUrlExternal = $form->getExternal();
-			}
-			else
+			} else
 			{
 				$view->standardUrlNext = $this->getUrlConfirm( $view, array(), array() );
 				$view->standardMethod = 'GET';
@@ -310,23 +309,19 @@ 
 
 
 			parent::process();
-		}
-		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\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() );
 

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 +654 added lines, -654 removed lines

@@ -22,659 +22,659 @@
  * @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/checkout/standard/process/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout standard process 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/checkout/standard/process/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->getView();
-
-		if( !in_array( $view->get( 'standardStepActive' ), array( 'order', 'process' ) ) ) {
-			return '';
-		}
-
-		$view = $this->setViewParams( $view, $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->processBody = $html;
-
-		/** client/html/checkout/standard/process/standard/template-body
-		 * Relative path to the HTML body template of the checkout standard process 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/checkout/standard/process/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/standard/process/standard/template-body';
-		$default = 'checkout/standard/process-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->getView();
-
-		if( !in_array( $view->param( 'standardStepActive' ), array( 'order', 'process' ) ) ) {
-			return '';
-		}
-
-		$view = $this->setViewParams( $view, $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->processHeader = $html;
-
-		/** client/html/checkout/standard/process/standard/template-header
-		 * Relative path to the HTML header template of the checkout standard process 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/checkout/standard/process/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/standard/process/standard/template-header';
-		$default = 'checkout/standard/process-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/checkout/standard/process/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout standard process 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/checkout/standard/process/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/checkout/standard/process/decorators/global
-		 * @see client/html/checkout/standard/process/decorators/local
-		 */
-
-		/** client/html/checkout/standard/process/decorators/global
-		 * Adds a list of globally available decorators only to the checkout standard process 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/checkout/standard/process/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/checkout/standard/process/decorators/excludes
-		 * @see client/html/checkout/standard/process/decorators/local
-		 */
-
-		/** client/html/checkout/standard/process/decorators/local
-		 * Adds a list of local decorators only to the checkout standard process 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/checkout/standard/process/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/checkout/standard/process/decorators/excludes
-		 * @see client/html/checkout/standard/process/decorators/global
-		 */
-
-		return $this->createSubClient( 'checkout/standard/process/' . $type, $name );
-	}
-
-
-	/**
-	 * Processes the input, e.g. store given order.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$errors = $view->get( 'standardErrorList', array() );
-
-		if( !in_array( $view->param( 'c_step' ), array( 'order', 'process' ) ) || !empty( $errors ) ) {
-			return;
-		}
-
-		$context = $this->getContext();
-		$session = $context->getSession();
-		$orderid = $session->get( 'aimeos/orderid' );
-		$config = array( 'absoluteUri' => true, 'namespace' => false );
-
-		try
-		{
-			$orderItem = \Aimeos\MShop\Factory::createManager( $context, 'order' )->getItem( $orderid );
-
-			if( ( $code = $this->getOrderServiceCode( $orderItem->getBaseId() ) ) !== null )
-			{
-				$serviceItem = $this->getServiceItem( $code );
-
-				$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-				$provider = $serviceManager->getProvider( $serviceItem );
-
-				$params = array( 'code' => $serviceItem->getCode(), 'orderid' => $orderid );
-				$urls = array(
-					'payment.url-self' => $this->getUrlSelf( $view, $params + array( 'c_step' => 'process' ), array() ),
-					'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ),
-					'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ),
-					'client.ipaddress' => $view->request()->getClientAddress(),
-				);
-				$provider->injectGlobalConfigBE( $urls );
-
-				if( ( $form = $provider->process( $orderItem, $view->param() ) ) === null )
-				{
-					$msg = sprintf( 'Invalid process response from service provider with code "%1$s"', $serviceItem->getCode() );
-					throw new \Aimeos\Client\Html\Exception( $msg );
-				}
-
-				$view->standardUrlNext = $form->getUrl();
-				$view->standardMethod = $form->getMethod();
-				$view->standardProcessParams = $form->getValues();
-				$view->standardUrlExternal = $form->getExternal();
-			}
-			else
-			{
-				$view->standardUrlNext = $this->getUrlConfirm( $view, array(), array() );
-				$view->standardMethod = 'GET';
-			}
-
-
-			parent::process();
-		}
-		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\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 payment service code from the order with the given base ID.
-	 *
-	 * @param string $baseid ID of the order base item
-	 * @return string|null Code of the service item or null if not found
-	 */
-	protected function getOrderServiceCode( $baseid )
-	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/service' );
-
-		$search = $manager->createSearch();
-		$expr = array(
-			$search->compare( '==', 'order.base.service.baseid', $baseid ),
-			$search->compare( '==', 'order.base.service.type', \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ),
-		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-
-		$result = $manager->searchItems( $search );
-
-		if( ( $item = reset( $result ) ) !== false ) {
-			return $item->getCode();
-		}
-	}
-
-
-	/**
-	 * Returns the payment service item for the given code.
-	 *
-	 * @param string $code Unique service code
-	 * @throws \Aimeos\Client\Html\Exception If no service item for this code is found
-	 * @return \Aimeos\MShop\Service\Item\Iface Service item object
-	 */
-	protected function getServiceItem( $code )
-	{
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-
-		$search = $serviceManager->createSearch();
-		$expr = array(
-			$search->compare( '==', 'service.code', $code ),
-			$search->compare( '==', 'service.type.code', 'payment' ),
-		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-
-		$result = $serviceManager->searchItems( $search );
-
-		if( ( $serviceItem = reset( $result ) ) === false )
-		{
-			$msg = sprintf( 'No service for code "%1$s" found', $code );
-			throw new \Aimeos\Client\Html\Exception( $msg );
-		}
-
-		return $serviceItem;
-	}
-
-
-	/**
-	 * 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 URL to the confirm page.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $params Parameters that should be part of the URL
-	 * @param array $config Default URL configuration
-	 * @return string URL string
-	 */
-	protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config )
-	{
-		/** client/html/checkout/confirm/url/target
-		 * Destination of the URL where the controller specified in the URL is known
-		 *
-		 * The destination can be a page ID like in a content management system or the
-		 * module of a software development framework. This "target" must contain or know
-		 * the controller that should be called by the generated URL.
-		 *
-		 * @param string Destination of the URL
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/confirm/url/controller
-		 * @see client/html/checkout/confirm/url/action
-		 * @see client/html/checkout/confirm/url/config
-		 */
-		$target = $view->config( 'client/html/checkout/confirm/url/target' );
-
-		/** client/html/checkout/confirm/url/controller
-		 * Name of the controller whose action should be called
-		 *
-		 * In Model-View-Controller (MVC) applications, the controller contains the methods
-		 * that create parts of the output displayed in the generated HTML page. Controller
-		 * names are usually alpha-numeric.
-		 *
-		 * @param string Name of the controller
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/confirm/url/target
-		 * @see client/html/checkout/confirm/url/action
-		 * @see client/html/checkout/confirm/url/config
-		 */
-		$cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' );
-
-		/** client/html/checkout/confirm/url/action
-		 * Name of the action that should create the output
-		 *
-		 * In Model-View-Controller (MVC) applications, actions are the methods of a
-		 * controller that create parts of the output displayed in the generated HTML page.
-		 * Action names are usually alpha-numeric.
-		 *
-		 * @param string Name of the action
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/confirm/url/target
-		 * @see client/html/checkout/confirm/url/controller
-		 * @see client/html/checkout/confirm/url/config
-		 */
-		$action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' );
-
-		/** client/html/checkout/confirm/url/config
-		 * Associative list of configuration options used for generating the URL
-		 *
-		 * You can specify additional options as key/value pairs used when generating
-		 * the URLs, like
-		 *
-		 *  client/html/<clientname>/url/config = array( 'absoluteUri' => true )
-		 *
-		 * The available key/value pairs depend on the application that embeds the e-commerce
-		 * framework. This is because the infrastructure of the application is used for
-		 * generating the URLs. The full list of available config options is referenced
-		 * in the "see also" section of this page.
-		 *
-		 * @param string Associative list of configuration options
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/confirm/url/target
-		 * @see client/html/checkout/confirm/url/controller
-		 * @see client/html/checkout/confirm/url/action
-		 * @see client/html/url/config
-		 */
-		$config = $view->config( 'client/html/checkout/confirm/url/config', $config );
-
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
-	}
-
-
-	/**
-	 * Returns the URL to the current page.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $params Parameters that should be part of the URL
-	 * @param array $config Default URL configuration
-	 * @return string URL string
-	 */
-	protected function getUrlSelf( \Aimeos\MW\View\Iface $view, array $params, array $config )
-	{
-		/** client/html/checkout/standard/url/target
-		 * Destination of the URL where the controller specified in the URL is known
-		 *
-		 * The destination can be a page ID like in a content management system or the
-		 * module of a software development framework. This "target" must contain or know
-		 * the controller that should be called by the generated URL.
-		 *
-		 * @param string Destination of the URL
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/standard/url/controller
-		 * @see client/html/checkout/standard/url/action
-		 * @see client/html/checkout/standard/url/config
-		 */
-		$target = $view->config( 'client/html/checkout/standard/url/target' );
-
-		/** client/html/checkout/standard/url/controller
-		 * Name of the controller whose action should be called
-		 *
-		 * In Model-View-Controller (MVC) applications, the controller contains the methods
-		 * that create parts of the output displayed in the generated HTML page. Controller
-		 * names are usually alpha-numeric.
-		 *
-		 * @param string Name of the controller
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/standard/url/target
-		 * @see client/html/checkout/standard/url/action
-		 * @see client/html/checkout/standard/url/config
-		 */
-		$cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
-
-		/** client/html/checkout/standard/url/action
-		 * Name of the action that should create the output
-		 *
-		 * In Model-View-Controller (MVC) applications, actions are the methods of a
-		 * controller that create parts of the output displayed in the generated HTML page.
-		 * Action names are usually alpha-numeric.
-		 *
-		 * @param string Name of the action
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/standard/url/target
-		 * @see client/html/checkout/standard/url/controller
-		 * @see client/html/checkout/standard/url/config
-		 */
-		$action = $view->config( 'client/html/checkout/standard/url/action', 'standard' );
-
-		/** client/html/checkout/standard/url/config
-		 * Associative list of configuration options used for generating the URL
-		 *
-		 * You can specify additional options as key/value pairs used when generating
-		 * the URLs, like
-		 *
-		 *  client/html/<clientname>/url/config = array( 'absoluteUri' => true )
-		 *
-		 * The available key/value pairs depend on the application that embeds the e-commerce
-		 * framework. This is because the infrastructure of the application is used for
-		 * generating the URLs. The full list of available config options is referenced
-		 * in the "see also" section of this page.
-		 *
-		 * @param string Associative list of configuration options
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/standard/url/target
-		 * @see client/html/checkout/standard/url/controller
-		 * @see client/html/checkout/standard/url/action
-		 * @see client/html/url/config
-		 */
-		$config = $view->config( 'client/html/checkout/standard/url/config', $config );
-
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
-	}
-
-
-	/**
-	 * Returns the URL to the update page.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $params Parameters that should be part of the URL
-	 * @param array $config Default URL configuration
-	 * @return string URL string
-	 */
-	protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config )
-	{
-		/** client/html/checkout/update/url/target
-		 * Destination of the URL where the controller specified in the URL is known
-		 *
-		 * The destination can be a page ID like in a content management system or the
-		 * module of a software development framework. This "target" must contain or know
-		 * the controller that should be called by the generated URL.
-		 *
-		 * @param string Destination of the URL
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/update/url/controller
-		 * @see client/html/checkout/update/url/action
-		 * @see client/html/checkout/update/url/config
-		 */
-		$target = $view->config( 'client/html/checkout/update/url/target' );
-
-		/** client/html/checkout/update/url/controller
-		 * Name of the controller whose action should be called
-		 *
-		 * In Model-View-Controller (MVC) applications, the controller contains the methods
-		 * that create parts of the output displayed in the generated HTML page. Controller
-		 * names are usually alpha-numeric.
-		 *
-		 * @param string Name of the controller
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/update/url/target
-		 * @see client/html/checkout/update/url/action
-		 * @see client/html/checkout/update/url/config
-		 */
-		$cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' );
-
-		/** client/html/checkout/update/url/action
-		 * Name of the action that should create the output
-		 *
-		 * In Model-View-Controller (MVC) applications, actions are the methods of a
-		 * controller that create parts of the output displayed in the generated HTML page.
-		 * Action names are usually alpha-numeric.
-		 *
-		 * @param string Name of the action
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/update/url/target
-		 * @see client/html/checkout/update/url/controller
-		 * @see client/html/checkout/update/url/config
-		 */
-		$action = $view->config( 'client/html/checkout/update/url/action', 'update' );
-
-		/** client/html/checkout/update/url/config
-		 * Associative list of configuration options used for generating the URL
-		 *
-		 * You can specify additional options as key/value pairs used when generating
-		 * the URLs, like
-		 *
-		 *  client/html/<clientname>/url/config = array( 'absoluteUri' => true )
-		 *
-		 * The available key/value pairs depend on the application that embeds the e-commerce
-		 * framework. This is because the infrastructure of the application is used for
-		 * generating the URLs. The full list of available config options is referenced
-		 * in the "see also" section of this page.
-		 *
-		 * @param string Associative list of configuration options
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/checkout/update/url/target
-		 * @see client/html/checkout/update/url/controller
-		 * @see client/html/checkout/update/url/action
-		 * @see client/html/url/config
-		 */
-		$config = $view->config( 'client/html/checkout/update/url/config', $config );
-
-		return $view->url( $target, $cntl, $action, $params, array(), $config );
-	}
-
-
-	/**
-	 * 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->standardUrlPayment = $this->getUrlSelf( $view, array( 'c_step' => 'payment' ), array() );
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
+    /** client/html/checkout/standard/process/standard/subparts
+     * List of HTML sub-clients rendered within the checkout standard process 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/checkout/standard/process/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->getView();
+
+        if( !in_array( $view->get( 'standardStepActive' ), array( 'order', 'process' ) ) ) {
+            return '';
+        }
+
+        $view = $this->setViewParams( $view, $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->processBody = $html;
+
+        /** client/html/checkout/standard/process/standard/template-body
+         * Relative path to the HTML body template of the checkout standard process 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/checkout/standard/process/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/standard/process/standard/template-body';
+        $default = 'checkout/standard/process-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->getView();
+
+        if( !in_array( $view->param( 'standardStepActive' ), array( 'order', 'process' ) ) ) {
+            return '';
+        }
+
+        $view = $this->setViewParams( $view, $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->processHeader = $html;
+
+        /** client/html/checkout/standard/process/standard/template-header
+         * Relative path to the HTML header template of the checkout standard process 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/checkout/standard/process/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/standard/process/standard/template-header';
+        $default = 'checkout/standard/process-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/checkout/standard/process/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout standard process 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/checkout/standard/process/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/checkout/standard/process/decorators/global
+         * @see client/html/checkout/standard/process/decorators/local
+         */
+
+        /** client/html/checkout/standard/process/decorators/global
+         * Adds a list of globally available decorators only to the checkout standard process 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/checkout/standard/process/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/checkout/standard/process/decorators/excludes
+         * @see client/html/checkout/standard/process/decorators/local
+         */
+
+        /** client/html/checkout/standard/process/decorators/local
+         * Adds a list of local decorators only to the checkout standard process 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/checkout/standard/process/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/checkout/standard/process/decorators/excludes
+         * @see client/html/checkout/standard/process/decorators/global
+         */
+
+        return $this->createSubClient( 'checkout/standard/process/' . $type, $name );
+    }
+
+
+    /**
+     * Processes the input, e.g. store given order.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $errors = $view->get( 'standardErrorList', array() );
+
+        if( !in_array( $view->param( 'c_step' ), array( 'order', 'process' ) ) || !empty( $errors ) ) {
+            return;
+        }
+
+        $context = $this->getContext();
+        $session = $context->getSession();
+        $orderid = $session->get( 'aimeos/orderid' );
+        $config = array( 'absoluteUri' => true, 'namespace' => false );
+
+        try
+        {
+            $orderItem = \Aimeos\MShop\Factory::createManager( $context, 'order' )->getItem( $orderid );
+
+            if( ( $code = $this->getOrderServiceCode( $orderItem->getBaseId() ) ) !== null )
+            {
+                $serviceItem = $this->getServiceItem( $code );
+
+                $serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+                $provider = $serviceManager->getProvider( $serviceItem );
+
+                $params = array( 'code' => $serviceItem->getCode(), 'orderid' => $orderid );
+                $urls = array(
+                    'payment.url-self' => $this->getUrlSelf( $view, $params + array( 'c_step' => 'process' ), array() ),
+                    'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ),
+                    'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ),
+                    'client.ipaddress' => $view->request()->getClientAddress(),
+                );
+                $provider->injectGlobalConfigBE( $urls );
+
+                if( ( $form = $provider->process( $orderItem, $view->param() ) ) === null )
+                {
+                    $msg = sprintf( 'Invalid process response from service provider with code "%1$s"', $serviceItem->getCode() );
+                    throw new \Aimeos\Client\Html\Exception( $msg );
+                }
+
+                $view->standardUrlNext = $form->getUrl();
+                $view->standardMethod = $form->getMethod();
+                $view->standardProcessParams = $form->getValues();
+                $view->standardUrlExternal = $form->getExternal();
+            }
+            else
+            {
+                $view->standardUrlNext = $this->getUrlConfirm( $view, array(), array() );
+                $view->standardMethod = 'GET';
+            }
+
+
+            parent::process();
+        }
+        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\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 payment service code from the order with the given base ID.
+     *
+     * @param string $baseid ID of the order base item
+     * @return string|null Code of the service item or null if not found
+     */
+    protected function getOrderServiceCode( $baseid )
+    {
+        $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/service' );
+
+        $search = $manager->createSearch();
+        $expr = array(
+            $search->compare( '==', 'order.base.service.baseid', $baseid ),
+            $search->compare( '==', 'order.base.service.type', \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ),
+        );
+        $search->setConditions( $search->combine( '&&', $expr ) );
+
+        $result = $manager->searchItems( $search );
+
+        if( ( $item = reset( $result ) ) !== false ) {
+            return $item->getCode();
+        }
+    }
+
+
+    /**
+     * Returns the payment service item for the given code.
+     *
+     * @param string $code Unique service code
+     * @throws \Aimeos\Client\Html\Exception If no service item for this code is found
+     * @return \Aimeos\MShop\Service\Item\Iface Service item object
+     */
+    protected function getServiceItem( $code )
+    {
+        $serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+
+        $search = $serviceManager->createSearch();
+        $expr = array(
+            $search->compare( '==', 'service.code', $code ),
+            $search->compare( '==', 'service.type.code', 'payment' ),
+        );
+        $search->setConditions( $search->combine( '&&', $expr ) );
+
+        $result = $serviceManager->searchItems( $search );
+
+        if( ( $serviceItem = reset( $result ) ) === false )
+        {
+            $msg = sprintf( 'No service for code "%1$s" found', $code );
+            throw new \Aimeos\Client\Html\Exception( $msg );
+        }
+
+        return $serviceItem;
+    }
+
+
+    /**
+     * 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 URL to the confirm page.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $params Parameters that should be part of the URL
+     * @param array $config Default URL configuration
+     * @return string URL string
+     */
+    protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config )
+    {
+        /** client/html/checkout/confirm/url/target
+         * Destination of the URL where the controller specified in the URL is known
+         *
+         * The destination can be a page ID like in a content management system or the
+         * module of a software development framework. This "target" must contain or know
+         * the controller that should be called by the generated URL.
+         *
+         * @param string Destination of the URL
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/confirm/url/controller
+         * @see client/html/checkout/confirm/url/action
+         * @see client/html/checkout/confirm/url/config
+         */
+        $target = $view->config( 'client/html/checkout/confirm/url/target' );
+
+        /** client/html/checkout/confirm/url/controller
+         * Name of the controller whose action should be called
+         *
+         * In Model-View-Controller (MVC) applications, the controller contains the methods
+         * that create parts of the output displayed in the generated HTML page. Controller
+         * names are usually alpha-numeric.
+         *
+         * @param string Name of the controller
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/confirm/url/target
+         * @see client/html/checkout/confirm/url/action
+         * @see client/html/checkout/confirm/url/config
+         */
+        $cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' );
+
+        /** client/html/checkout/confirm/url/action
+         * Name of the action that should create the output
+         *
+         * In Model-View-Controller (MVC) applications, actions are the methods of a
+         * controller that create parts of the output displayed in the generated HTML page.
+         * Action names are usually alpha-numeric.
+         *
+         * @param string Name of the action
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/confirm/url/target
+         * @see client/html/checkout/confirm/url/controller
+         * @see client/html/checkout/confirm/url/config
+         */
+        $action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' );
+
+        /** client/html/checkout/confirm/url/config
+         * Associative list of configuration options used for generating the URL
+         *
+         * You can specify additional options as key/value pairs used when generating
+         * the URLs, like
+         *
+         *  client/html/<clientname>/url/config = array( 'absoluteUri' => true )
+         *
+         * The available key/value pairs depend on the application that embeds the e-commerce
+         * framework. This is because the infrastructure of the application is used for
+         * generating the URLs. The full list of available config options is referenced
+         * in the "see also" section of this page.
+         *
+         * @param string Associative list of configuration options
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/confirm/url/target
+         * @see client/html/checkout/confirm/url/controller
+         * @see client/html/checkout/confirm/url/action
+         * @see client/html/url/config
+         */
+        $config = $view->config( 'client/html/checkout/confirm/url/config', $config );
+
+        return $view->url( $target, $cntl, $action, $params, array(), $config );
+    }
+
+
+    /**
+     * Returns the URL to the current page.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $params Parameters that should be part of the URL
+     * @param array $config Default URL configuration
+     * @return string URL string
+     */
+    protected function getUrlSelf( \Aimeos\MW\View\Iface $view, array $params, array $config )
+    {
+        /** client/html/checkout/standard/url/target
+         * Destination of the URL where the controller specified in the URL is known
+         *
+         * The destination can be a page ID like in a content management system or the
+         * module of a software development framework. This "target" must contain or know
+         * the controller that should be called by the generated URL.
+         *
+         * @param string Destination of the URL
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/standard/url/controller
+         * @see client/html/checkout/standard/url/action
+         * @see client/html/checkout/standard/url/config
+         */
+        $target = $view->config( 'client/html/checkout/standard/url/target' );
+
+        /** client/html/checkout/standard/url/controller
+         * Name of the controller whose action should be called
+         *
+         * In Model-View-Controller (MVC) applications, the controller contains the methods
+         * that create parts of the output displayed in the generated HTML page. Controller
+         * names are usually alpha-numeric.
+         *
+         * @param string Name of the controller
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/standard/url/target
+         * @see client/html/checkout/standard/url/action
+         * @see client/html/checkout/standard/url/config
+         */
+        $cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
+
+        /** client/html/checkout/standard/url/action
+         * Name of the action that should create the output
+         *
+         * In Model-View-Controller (MVC) applications, actions are the methods of a
+         * controller that create parts of the output displayed in the generated HTML page.
+         * Action names are usually alpha-numeric.
+         *
+         * @param string Name of the action
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/standard/url/target
+         * @see client/html/checkout/standard/url/controller
+         * @see client/html/checkout/standard/url/config
+         */
+        $action = $view->config( 'client/html/checkout/standard/url/action', 'standard' );
+
+        /** client/html/checkout/standard/url/config
+         * Associative list of configuration options used for generating the URL
+         *
+         * You can specify additional options as key/value pairs used when generating
+         * the URLs, like
+         *
+         *  client/html/<clientname>/url/config = array( 'absoluteUri' => true )
+         *
+         * The available key/value pairs depend on the application that embeds the e-commerce
+         * framework. This is because the infrastructure of the application is used for
+         * generating the URLs. The full list of available config options is referenced
+         * in the "see also" section of this page.
+         *
+         * @param string Associative list of configuration options
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/standard/url/target
+         * @see client/html/checkout/standard/url/controller
+         * @see client/html/checkout/standard/url/action
+         * @see client/html/url/config
+         */
+        $config = $view->config( 'client/html/checkout/standard/url/config', $config );
+
+        return $view->url( $target, $cntl, $action, $params, array(), $config );
+    }
+
+
+    /**
+     * Returns the URL to the update page.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $params Parameters that should be part of the URL
+     * @param array $config Default URL configuration
+     * @return string URL string
+     */
+    protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config )
+    {
+        /** client/html/checkout/update/url/target
+         * Destination of the URL where the controller specified in the URL is known
+         *
+         * The destination can be a page ID like in a content management system or the
+         * module of a software development framework. This "target" must contain or know
+         * the controller that should be called by the generated URL.
+         *
+         * @param string Destination of the URL
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/update/url/controller
+         * @see client/html/checkout/update/url/action
+         * @see client/html/checkout/update/url/config
+         */
+        $target = $view->config( 'client/html/checkout/update/url/target' );
+
+        /** client/html/checkout/update/url/controller
+         * Name of the controller whose action should be called
+         *
+         * In Model-View-Controller (MVC) applications, the controller contains the methods
+         * that create parts of the output displayed in the generated HTML page. Controller
+         * names are usually alpha-numeric.
+         *
+         * @param string Name of the controller
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/update/url/target
+         * @see client/html/checkout/update/url/action
+         * @see client/html/checkout/update/url/config
+         */
+        $cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' );
+
+        /** client/html/checkout/update/url/action
+         * Name of the action that should create the output
+         *
+         * In Model-View-Controller (MVC) applications, actions are the methods of a
+         * controller that create parts of the output displayed in the generated HTML page.
+         * Action names are usually alpha-numeric.
+         *
+         * @param string Name of the action
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/update/url/target
+         * @see client/html/checkout/update/url/controller
+         * @see client/html/checkout/update/url/config
+         */
+        $action = $view->config( 'client/html/checkout/update/url/action', 'update' );
+
+        /** client/html/checkout/update/url/config
+         * Associative list of configuration options used for generating the URL
+         *
+         * You can specify additional options as key/value pairs used when generating
+         * the URLs, like
+         *
+         *  client/html/<clientname>/url/config = array( 'absoluteUri' => true )
+         *
+         * The available key/value pairs depend on the application that embeds the e-commerce
+         * framework. This is because the infrastructure of the application is used for
+         * generating the URLs. The full list of available config options is referenced
+         * in the "see also" section of this page.
+         *
+         * @param string Associative list of configuration options
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/checkout/update/url/target
+         * @see client/html/checkout/update/url/controller
+         * @see client/html/checkout/update/url/action
+         * @see client/html/url/config
+         */
+        $config = $view->config( 'client/html/checkout/update/url/config', $config );
+
+        return $view->url( $target, $cntl, $action, $params, array(), $config );
+    }
+
+
+    /**
+     * 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->standardUrlPayment = $this->getUrlSelf( $view, array( 'c_step' => 'payment' ), array() );
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
 }

client/html/src/Client/Html/Checkout/Standard/Order/Standard.php

Indentation +307 added lines, -307 removed lines

@@ -23,312 +23,312 @@
  * @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/checkout/standard/order/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout standard order 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/checkout/standard/order/standard/subparts';
-
-	/** client/html/checkout/standard/order/account/name
-	 * Name of the account part used by the checkout standard order client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Checkout\Standard\Order\Account\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 2015.09
-	 * @category Developer
-	 */
-
-	/** client/html/checkout/standard/order/address/name
-	 * Name of the address part used by the checkout standard order client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Checkout\Standard\Order\Address\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( 'account', 'address' );
-
-
-	/**
-	 * 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->getView();
-
-		if( $view->get( 'standardStepActive' ) != 'order' ) {
-			return '';
-		}
-
-		$view = $this->setViewParams( $view, $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->orderBody = $html;
-
-		/** client/html/checkout/standard/order/standard/template-body
-		 * Relative path to the HTML body template of the checkout standard order 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/checkout/standard/order/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/standard/order/standard/template-body';
-		$default = 'checkout/standard/order-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->getView();
-
-		if( $view->get( 'standardStepActive' ) != 'order' ) {
-			return '';
-		}
-
-		$view = $this->setViewParams( $view, $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->orderHeader = $html;
-
-		/** client/html/checkout/standard/order/standard/template-header
-		 * Relative path to the HTML header template of the checkout standard order 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/checkout/standard/order/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/standard/order/standard/template-header';
-		$default = 'checkout/standard/order-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/checkout/standard/order/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout standard order 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/checkout/standard/order/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/checkout/standard/order/decorators/global
-		 * @see client/html/checkout/standard/order/decorators/local
-		 */
-
-		/** client/html/checkout/standard/order/decorators/global
-		 * Adds a list of globally available decorators only to the checkout standard order 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/checkout/standard/order/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/checkout/standard/order/decorators/excludes
-		 * @see client/html/checkout/standard/order/decorators/local
-		 */
-
-		/** client/html/checkout/standard/order/decorators/local
-		 * Adds a list of local decorators only to the checkout standard order 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/checkout/standard/order/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/checkout/standard/order/decorators/excludes
-		 * @see client/html/checkout/standard/order/decorators/global
-		 */
-
-		return $this->createSubClient( 'checkout/standard/order/' . $type, $name );
-	}
-
-
-	/**
-	 * Processes the input, e.g. store given order.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-
-		try
-		{
-			// only start if there's something to do
-			if( ( $option = $view->param( 'cs_order', null ) ) === null
-				|| $view->get( 'standardStepActive' ) !== null
-			) {
-				return;
-			}
-
-			$context = $this->getContext();
-			$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-
-			$basket = $orderBaseManager->getSession();
-			$basket->setCustomerId( $context->getUserId() );
-			$basket->finish();
-
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'order' );
-			$orderItem = $cntl->store( $basket );
-			$cntl->block( $orderItem );
-
-			$context->getSession()->set( 'aimeos/orderid', $orderItem->getId() );
-
-			$view->orderItem = $orderItem;
-			$view->orderBasket = $basket;
-
-			parent::process();
-
-			// save again after sub-clients modified it's state
-			\Aimeos\MShop\Factory::createManager( $context, 'order' )->saveItem( $orderItem );
-		}
-		catch( \Exception $e )
-		{
-			$view->standardStepActive = 'order';
-			throw $e;
-		}
-	}
-
-
-	/**
-	 * 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/checkout/standard/order/standard/subparts
+     * List of HTML sub-clients rendered within the checkout standard order 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/checkout/standard/order/standard/subparts';
+
+    /** client/html/checkout/standard/order/account/name
+     * Name of the account part used by the checkout standard order client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Checkout\Standard\Order\Account\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 2015.09
+     * @category Developer
+     */
+
+    /** client/html/checkout/standard/order/address/name
+     * Name of the address part used by the checkout standard order client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Checkout\Standard\Order\Address\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( 'account', 'address' );
+
+
+    /**
+     * 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->getView();
+
+        if( $view->get( 'standardStepActive' ) != 'order' ) {
+            return '';
+        }
+
+        $view = $this->setViewParams( $view, $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->orderBody = $html;
+
+        /** client/html/checkout/standard/order/standard/template-body
+         * Relative path to the HTML body template of the checkout standard order 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/checkout/standard/order/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/standard/order/standard/template-body';
+        $default = 'checkout/standard/order-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->getView();
+
+        if( $view->get( 'standardStepActive' ) != 'order' ) {
+            return '';
+        }
+
+        $view = $this->setViewParams( $view, $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->orderHeader = $html;
+
+        /** client/html/checkout/standard/order/standard/template-header
+         * Relative path to the HTML header template of the checkout standard order 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/checkout/standard/order/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/standard/order/standard/template-header';
+        $default = 'checkout/standard/order-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/checkout/standard/order/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout standard order 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/checkout/standard/order/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/checkout/standard/order/decorators/global
+         * @see client/html/checkout/standard/order/decorators/local
+         */
+
+        /** client/html/checkout/standard/order/decorators/global
+         * Adds a list of globally available decorators only to the checkout standard order 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/checkout/standard/order/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/checkout/standard/order/decorators/excludes
+         * @see client/html/checkout/standard/order/decorators/local
+         */
+
+        /** client/html/checkout/standard/order/decorators/local
+         * Adds a list of local decorators only to the checkout standard order 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/checkout/standard/order/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/checkout/standard/order/decorators/excludes
+         * @see client/html/checkout/standard/order/decorators/global
+         */
+
+        return $this->createSubClient( 'checkout/standard/order/' . $type, $name );
+    }
+
+
+    /**
+     * Processes the input, e.g. store given order.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+
+        try
+        {
+            // only start if there's something to do
+            if( ( $option = $view->param( 'cs_order', null ) ) === null
+                || $view->get( 'standardStepActive' ) !== null
+            ) {
+                return;
+            }
+
+            $context = $this->getContext();
+            $orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+
+            $basket = $orderBaseManager->getSession();
+            $basket->setCustomerId( $context->getUserId() );
+            $basket->finish();
+
+            $cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'order' );
+            $orderItem = $cntl->store( $basket );
+            $cntl->block( $orderItem );
+
+            $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() );
+
+            $view->orderItem = $orderItem;
+            $view->orderBasket = $basket;
+
+            parent::process();
+
+            // save again after sub-clients modified it's state
+            \Aimeos\MShop\Factory::createManager( $context, 'order' )->saveItem( $orderItem );
+        }
+        catch( \Exception $e )
+        {
+            $view->standardStepActive = 'order';
+            throw $e;
+        }
+    }
+
+
+    /**
+     * 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 +27 added lines, -27 removed lines

@@ -13,7 +13,7 @@ 
 
 
 // Strings for translation
-sprintf( 'order' );
+sprintf('order');
 
 
 /**
@@ -82,7 +82,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'account', 'address' );
+	private $subPartNames = array('account', 'address');
 
 
 	/**
@@ -93,19 +93,19 @@ 
 	 * @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->getView();
 
-		if( $view->get( 'standardStepActive' ) != 'order' ) {
+		if ($view->get('standardStepActive') != 'order') {
 			return '';
 		}
 
-		$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->orderBody = $html;
 
@@ -132,7 +132,7 @@ 
 		$tplconf = 'client/html/checkout/standard/order/standard/template-body';
 		$default = 'checkout/standard/order-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -144,19 +144,19 @@ 
 	 * @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->getView();
 
-		if( $view->get( 'standardStepActive' ) != 'order' ) {
+		if ($view->get('standardStepActive') != 'order') {
 			return '';
 		}
 
-		$view = $this->setViewParams( $view, $tags, $expire );
+		$view = $this->setViewParams($view, $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->orderHeader = $html;
 
@@ -184,7 +184,7 @@ 
 		$tplconf = 'client/html/checkout/standard/order/standard/template-header';
 		$default = 'checkout/standard/order-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -195,7 +195,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/checkout/standard/order/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard order html client
@@ -271,7 +271,7 @@ 
 		 * @see client/html/checkout/standard/order/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/order/' . $type, $name );
+		return $this->createSubClient('checkout/standard/order/'.$type, $name);
 	}
 
 
@@ -287,24 +287,24 @@ 
 		try
 		{
 			// only start if there's something to do
-			if( ( $option = $view->param( 'cs_order', null ) ) === null
-				|| $view->get( 'standardStepActive' ) !== null
+			if (($option = $view->param('cs_order', null)) === null
+				|| $view->get('standardStepActive') !== null
 			) {
 				return;
 			}
 
 			$context = $this->getContext();
-			$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+			$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
 			$basket = $orderBaseManager->getSession();
-			$basket->setCustomerId( $context->getUserId() );
+			$basket->setCustomerId($context->getUserId());
 			$basket->finish();
 
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'order' );
-			$orderItem = $cntl->store( $basket );
-			$cntl->block( $orderItem );
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'order');
+			$orderItem = $cntl->store($basket);
+			$cntl->block($orderItem);
 
-			$context->getSession()->set( 'aimeos/orderid', $orderItem->getId() );
+			$context->getSession()->set('aimeos/orderid', $orderItem->getId());
 
 			$view->orderItem = $orderItem;
 			$view->orderBasket = $basket;
@@ -312,9 +312,9 @@ 
 			parent::process();
 
 			// save again after sub-clients modified it's state
-			\Aimeos\MShop\Factory::createManager( $context, 'order' )->saveItem( $orderItem );
+			\Aimeos\MShop\Factory::createManager($context, 'order')->saveItem($orderItem);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$view->standardStepActive = 'order';
 			throw $e;
@@ -329,6 +329,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 )
 	{

Braces +1 added lines, -2 removed lines

@@ -303,8 +303,7 @@
 				$view->standardStepActive = 'address';
 				return false;
 			}
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getView()->standardStepActive = 'address';
 			throw $e;

client/html/src/Client/Html/Checkout/Standard/Order/Address/Standard.php

Indentation +241 added lines, -241 removed lines

@@ -19,271 +19,271 @@
  * @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/checkout/standard/order/address/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout standard order address 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/checkout/standard/order/address/standard/subparts';
-	private $subPartNames = array();
+    /** client/html/checkout/standard/order/address/standard/subparts
+     * List of HTML sub-clients rendered within the checkout standard order address 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/checkout/standard/order/address/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->addressBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->addressBody = $html;
 
-		/** client/html/checkout/standard/order/address/standard/template-body
-		 * Relative path to the HTML body template of the checkout standard order address 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/checkout/standard/order/address/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/standard/order/address/standard/template-body';
-		$default = 'checkout/standard/order-address-body-default.php';
+        /** client/html/checkout/standard/order/address/standard/template-body
+         * Relative path to the HTML body template of the checkout standard order address 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/checkout/standard/order/address/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/standard/order/address/standard/template-body';
+        $default = 'checkout/standard/order-address-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->addressHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->addressHeader = $html;
 
-		/** client/html/checkout/standard/order/address/standard/template-header
-		 * Relative path to the HTML header template of the checkout standard order address 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/checkout/standard/order/address/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/standard/order/address/standard/template-header';
-		$default = 'checkout/standard/order-address-header-default.php';
+        /** client/html/checkout/standard/order/address/standard/template-header
+         * Relative path to the HTML header template of the checkout standard order address 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/checkout/standard/order/address/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/standard/order/address/standard/template-header';
+        $default = 'checkout/standard/order-address-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/checkout/standard/order/address/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout standard order address 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/checkout/standard/order/address/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/checkout/standard/order/address/decorators/global
-		 * @see client/html/checkout/standard/order/address/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/checkout/standard/order/address/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout standard order address 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/checkout/standard/order/address/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/checkout/standard/order/address/decorators/global
+         * @see client/html/checkout/standard/order/address/decorators/local
+         */
 
-		/** client/html/checkout/standard/order/address/decorators/global
-		 * Adds a list of globally available decorators only to the checkout standard order address 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/checkout/standard/order/address/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/checkout/standard/order/address/decorators/excludes
-		 * @see client/html/checkout/standard/order/address/decorators/local
-		 */
+        /** client/html/checkout/standard/order/address/decorators/global
+         * Adds a list of globally available decorators only to the checkout standard order address 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/checkout/standard/order/address/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/checkout/standard/order/address/decorators/excludes
+         * @see client/html/checkout/standard/order/address/decorators/local
+         */
 
-		/** client/html/checkout/standard/order/address/decorators/local
-		 * Adds a list of local decorators only to the checkout standard order address 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/checkout/standard/order/address/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/checkout/standard/order/address/decorators/excludes
-		 * @see client/html/checkout/standard/order/address/decorators/global
-		 */
+        /** client/html/checkout/standard/order/address/decorators/local
+         * Adds a list of local decorators only to the checkout standard order address 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/checkout/standard/order/address/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/checkout/standard/order/address/decorators/excludes
+         * @see client/html/checkout/standard/order/address/decorators/global
+         */
 
-		return $this->createSubClient( 'checkout/standard/order/address/' . $type, $name );
-	}
+        return $this->createSubClient( 'checkout/standard/order/address/' . $type, $name );
+    }
 
 
-	/**
-	 * Processes the input, e.g. provides the address form.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$basket = $view->orderBasket;
-		$customerId = $basket->getCustomerId();
+    /**
+     * Processes the input, e.g. provides the address form.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $basket = $view->orderBasket;
+        $customerId = $basket->getCustomerId();
 
-		try
-		{
-			$addr = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
+        try
+        {
+            $addr = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
 
-			if( $customerId != '' && $addr->getAddressId() == '' )
-			{
-				$addrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
-				$orderAddrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' );
+            if( $customerId != '' && $addr->getAddressId() == '' )
+            {
+                $addrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+                $orderAddrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' );
 
-				$item = $addrManager->createItem();
-				$item->setParentId( $customerId );
-				$item->copyFrom( $addr );
+                $item = $addrManager->createItem();
+                $item->setParentId( $customerId );
+                $item->copyFrom( $addr );
 
-				$addrManager->saveItem( $item );
+                $addrManager->saveItem( $item );
 
-				$addr->setAddressId( $item->getId() );
-				$orderAddrManager->saveItem( $addr, false );
-			}
-		}
-		catch( \Exception $e )
-		{
-			$msg = sprintf( 'Unable to save address for customer "%1$s": %2$s', $customerId, $e->getMessage() );
-			$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );
-		}
+                $addr->setAddressId( $item->getId() );
+                $orderAddrManager->saveItem( $addr, false );
+            }
+        }
+        catch( \Exception $e )
+        {
+            $msg = sprintf( 'Unable to save address for customer "%1$s": %2$s', $customerId, $e->getMessage() );
+            $this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );
+        }
 
-		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 +25 added lines, -25 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->addressBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/checkout/standard/order/address/standard/template-body';
 		$default = 'checkout/standard/order-address-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->addressHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/checkout/standard/order/address/standard/template-header';
 		$default = 'checkout/standard/order-address-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/checkout/standard/order/address/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard order address html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/checkout/standard/order/address/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/order/address/' . $type, $name );
+		return $this->createSubClient('checkout/standard/order/address/'.$type, $name);
 	}
 
 
@@ -250,27 +250,27 @@ 
 
 		try
 		{
-			$addr = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
+			$addr = $basket->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
 
-			if( $customerId != '' && $addr->getAddressId() == '' )
+			if ($customerId != '' && $addr->getAddressId() == '')
 			{
-				$addrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
-				$orderAddrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' );
+				$addrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
+				$orderAddrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address');
 
 				$item = $addrManager->createItem();
-				$item->setParentId( $customerId );
-				$item->copyFrom( $addr );
+				$item->setParentId($customerId);
+				$item->copyFrom($addr);
 
-				$addrManager->saveItem( $item );
+				$addrManager->saveItem($item);
 
-				$addr->setAddressId( $item->getId() );
-				$orderAddrManager->saveItem( $addr, false );
+				$addr->setAddressId($item->getId());
+				$orderAddrManager->saveItem($addr, false);
 			}
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$msg = sprintf( 'Unable to save address for customer "%1$s": %2$s', $customerId, $e->getMessage() );
-			$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );
+			$msg = sprintf('Unable to save address for customer "%1$s": %2$s', $customerId, $e->getMessage());
+			$this->getContext()->getLogger()->log($msg, \Aimeos\MW\Logger\Base::INFO);
 		}
 
 		parent::process();
@@ -284,6 +284,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 )
 	{

Braces +1 added lines, -2 removed lines

@@ -303,8 +303,7 @@
 				$view->standardStepActive = 'address';
 				return false;
 			}
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getView()->standardStepActive = 'address';
 			throw $e;

client/html/src/Client/Html/Checkout/Standard/Order/Account/Standard.php

Indentation +328 added lines, -328 removed lines

@@ -18,333 +18,333 @@
  * @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/checkout/standard/order/account/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout standard order account 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.09
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/checkout/standard/order/account/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->accountBody = $html;
-
-		/** client/html/checkout/standard/order/account/standard/template-body
-		 * Relative path to the HTML body template of the checkout standard order account 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.09
-		 * @category Developer
-		 * @see client/html/checkout/standard/order/account/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/standard/order/account/standard/template-body';
-		$default = 'checkout/standard/order-account-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->accountHeader = $html;
-
-		/** client/html/checkout/standard/order/account/standard/template-header
-		 * Relative path to the HTML header template of the checkout standard order account 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.09
-		 * @category Developer
-		 * @see client/html/checkout/standard/order/account/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/standard/order/account/standard/template-header';
-		$default = 'checkout/standard/order-account-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/checkout/standard/order/account/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout standard order account 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/checkout/standard/order/account/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.09
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/checkout/standard/order/account/decorators/global
-		 * @see client/html/checkout/standard/order/account/decorators/local
-		 */
-
-		/** client/html/checkout/standard/order/account/decorators/global
-		 * Adds a list of globally available decorators only to the checkout standard order account 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/checkout/standard/order/account/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.09
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/checkout/standard/order/account/decorators/excludes
-		 * @see client/html/checkout/standard/order/account/decorators/local
-		 */
-
-		/** client/html/checkout/standard/order/account/decorators/local
-		 * Adds a list of local decorators only to the checkout standard order account 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/checkout/standard/order/account/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.09
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/checkout/standard/order/account/decorators/excludes
-		 * @see client/html/checkout/standard/order/account/decorators/global
-		 */
-
-		return $this->createSubClient( 'checkout/standard/order/account/' . $type, $name );
-	}
-
-
-	/**
-	 * Processes the input, e.g. provides the account form.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$basket = $view->orderBasket;
-
-		if( $basket->getCustomerId() == '' )
-		{
-			$email = '<unknown>';
-			$context = $this->getContext();
-
-			try
-			{
-				$addr = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-				$email = $addr->getEmail();
-
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-				$search = $manager->createSearch();
-				$search->setConditions( $search->compare( '==', 'customer.code', $email ) );
-				$search->setSlice( 0, 1 );
-				$result = $manager->searchItems( $search );
-
-				if( ( $item = reset( $result ) ) === false )
-				{
-					$password = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
-					$item = $this->addCustomerData( $manager->createItem(), $addr, $addr->getEmail(), $password );
-					$manager->saveItem( $item );
-
-					$msg = $item->toArray();
-					$msg['customer.password'] = $password;
-					$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
-					$context->setUserId( $item->getId() );
-				}
-
-				$basket->setCustomerId( $item->getId() );
-
-				$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-				$orderBaseManager->saveItem( $basket, false );
-			}
-			catch( \Exception $e )
-			{
-				$msg = sprintf( 'Unable to create an account for "%1$s": %2$s', $email, $e->getMessage() );
-				$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );
-			}
-		}
-
-		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 );
-	}
-
-
-	/**
-	 * Adds the customer and address data to the given customer item
-	 *
-	 * @param \Aimeos\MShop\Customer\Item\Iface $customer Customer object
-	 * @param \Aimeos\MShop\Common\Item\Address\Iface $address Billing address object
-	 * @param string $code Unique customer code, e.g. user name or e-mail address
-	 * @param string $password Plain-text password for the customer
-	 * @return \Aimeos\MShop\Customer\Item\Iface Customer object filled with data
-	 */
-	protected function addCustomerData( \Aimeos\MShop\Customer\Item\Iface $customer,
-		\Aimeos\MShop\Common\Item\Address\Iface $address, $code, $password )
-	{
-		$label = $address->getLastname();
-
-		if( ( $part = $address->getFirstname() ) !== '' ) {
-			$label = $part . ' ' . $label;
-		}
-
-		if( ( $part = $address->getCompany() ) !== '' ) {
-			$label .= ' (' . $part . ')';
-		}
-
-		$customer->setPaymentAddress( $address );
-		$customer->setCode( $code );
-		$customer->setPassword( $password );
-		$customer->setLabel( $label );
-		$customer->setStatus( 1 );
-
-		/** client/html/checkout/standard/order/account/standard/groupids
-		 * List of groups new customers should be assigned to
-		 *
-		 * Newly created customers will be assigned automatically to the groups
-		 * given by their IDs. This is especially useful if those groups limit
-		 * functionality for those users.
-		 *
-		 * @param array List of group IDs
-		 * @since 2016.03
-		 * @category User
-		 * @category Developer
-		 */
-		$config = $this->getContext()->getConfig();
-		$gids = (array) $config->get( 'client/html/checkout/standard/order/account/standard/groupids', array() );
-		$customer->setGroups( $gids );
-
-		return $customer;
-	}
+    /** client/html/checkout/standard/order/account/standard/subparts
+     * List of HTML sub-clients rendered within the checkout standard order account 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.09
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/checkout/standard/order/account/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->accountBody = $html;
+
+        /** client/html/checkout/standard/order/account/standard/template-body
+         * Relative path to the HTML body template of the checkout standard order account 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.09
+         * @category Developer
+         * @see client/html/checkout/standard/order/account/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/standard/order/account/standard/template-body';
+        $default = 'checkout/standard/order-account-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->accountHeader = $html;
+
+        /** client/html/checkout/standard/order/account/standard/template-header
+         * Relative path to the HTML header template of the checkout standard order account 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.09
+         * @category Developer
+         * @see client/html/checkout/standard/order/account/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/standard/order/account/standard/template-header';
+        $default = 'checkout/standard/order-account-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/checkout/standard/order/account/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout standard order account 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/checkout/standard/order/account/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.09
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/checkout/standard/order/account/decorators/global
+         * @see client/html/checkout/standard/order/account/decorators/local
+         */
+
+        /** client/html/checkout/standard/order/account/decorators/global
+         * Adds a list of globally available decorators only to the checkout standard order account 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/checkout/standard/order/account/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.09
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/checkout/standard/order/account/decorators/excludes
+         * @see client/html/checkout/standard/order/account/decorators/local
+         */
+
+        /** client/html/checkout/standard/order/account/decorators/local
+         * Adds a list of local decorators only to the checkout standard order account 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/checkout/standard/order/account/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.09
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/checkout/standard/order/account/decorators/excludes
+         * @see client/html/checkout/standard/order/account/decorators/global
+         */
+
+        return $this->createSubClient( 'checkout/standard/order/account/' . $type, $name );
+    }
+
+
+    /**
+     * Processes the input, e.g. provides the account form.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $basket = $view->orderBasket;
+
+        if( $basket->getCustomerId() == '' )
+        {
+            $email = '<unknown>';
+            $context = $this->getContext();
+
+            try
+            {
+                $addr = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+                $email = $addr->getEmail();
+
+                $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+                $search = $manager->createSearch();
+                $search->setConditions( $search->compare( '==', 'customer.code', $email ) );
+                $search->setSlice( 0, 1 );
+                $result = $manager->searchItems( $search );
+
+                if( ( $item = reset( $result ) ) === false )
+                {
+                    $password = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
+                    $item = $this->addCustomerData( $manager->createItem(), $addr, $addr->getEmail(), $password );
+                    $manager->saveItem( $item );
+
+                    $msg = $item->toArray();
+                    $msg['customer.password'] = $password;
+                    $context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
+                    $context->setUserId( $item->getId() );
+                }
+
+                $basket->setCustomerId( $item->getId() );
+
+                $orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+                $orderBaseManager->saveItem( $basket, false );
+            }
+            catch( \Exception $e )
+            {
+                $msg = sprintf( 'Unable to create an account for "%1$s": %2$s', $email, $e->getMessage() );
+                $context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );
+            }
+        }
+
+        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 );
+    }
+
+
+    /**
+     * Adds the customer and address data to the given customer item
+     *
+     * @param \Aimeos\MShop\Customer\Item\Iface $customer Customer object
+     * @param \Aimeos\MShop\Common\Item\Address\Iface $address Billing address object
+     * @param string $code Unique customer code, e.g. user name or e-mail address
+     * @param string $password Plain-text password for the customer
+     * @return \Aimeos\MShop\Customer\Item\Iface Customer object filled with data
+     */
+    protected function addCustomerData( \Aimeos\MShop\Customer\Item\Iface $customer,
+        \Aimeos\MShop\Common\Item\Address\Iface $address, $code, $password )
+    {
+        $label = $address->getLastname();
+
+        if( ( $part = $address->getFirstname() ) !== '' ) {
+            $label = $part . ' ' . $label;
+        }
+
+        if( ( $part = $address->getCompany() ) !== '' ) {
+            $label .= ' (' . $part . ')';
+        }
+
+        $customer->setPaymentAddress( $address );
+        $customer->setCode( $code );
+        $customer->setPassword( $password );
+        $customer->setLabel( $label );
+        $customer->setStatus( 1 );
+
+        /** client/html/checkout/standard/order/account/standard/groupids
+         * List of groups new customers should be assigned to
+         *
+         * Newly created customers will be assigned automatically to the groups
+         * given by their IDs. This is especially useful if those groups limit
+         * functionality for those users.
+         *
+         * @param array List of group IDs
+         * @since 2016.03
+         * @category User
+         * @category Developer
+         */
+        $config = $this->getContext()->getConfig();
+        $gids = (array) $config->get( 'client/html/checkout/standard/order/account/standard/groupids', array() );
+        $customer->setGroups( $gids );
+
+        return $customer;
+    }
 }
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -66,13 +66,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->accountBody = $html;
 
@@ -99,7 +99,7 @@ 
 		$tplconf = 'client/html/checkout/standard/order/account/standard/template-body';
 		$default = 'checkout/standard/order-account-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -111,13 +111,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->accountHeader = $html;
 
@@ -145,7 +145,7 @@ 
 		$tplconf = 'client/html/checkout/standard/order/account/standard/template-header';
 		$default = 'checkout/standard/order-account-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -156,7 +156,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/checkout/standard/order/account/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard order account html client
@@ -232,7 +232,7 @@ 
 		 * @see client/html/checkout/standard/order/account/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/order/account/' . $type, $name );
+		return $this->createSubClient('checkout/standard/order/account/'.$type, $name);
 	}
 
 
@@ -246,43 +246,43 @@ 
 		$view = $this->getView();
 		$basket = $view->orderBasket;
 
-		if( $basket->getCustomerId() == '' )
+		if ($basket->getCustomerId() == '')
 		{
 			$email = '<unknown>';
 			$context = $this->getContext();
 
 			try
 			{
-				$addr = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+				$addr = $basket->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 				$email = $addr->getEmail();
 
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 				$search = $manager->createSearch();
-				$search->setConditions( $search->compare( '==', 'customer.code', $email ) );
-				$search->setSlice( 0, 1 );
-				$result = $manager->searchItems( $search );
+				$search->setConditions($search->compare('==', 'customer.code', $email));
+				$search->setSlice(0, 1);
+				$result = $manager->searchItems($search);
 
-				if( ( $item = reset( $result ) ) === false )
+				if (($item = reset($result)) === false)
 				{
-					$password = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
-					$item = $this->addCustomerData( $manager->createItem(), $addr, $addr->getEmail(), $password );
-					$manager->saveItem( $item );
+					$password = substr(md5(microtime(true).getmypid().rand()), -8);
+					$item = $this->addCustomerData($manager->createItem(), $addr, $addr->getEmail(), $password);
+					$manager->saveItem($item);
 
 					$msg = $item->toArray();
 					$msg['customer.password'] = $password;
-					$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
-					$context->setUserId( $item->getId() );
+					$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
+					$context->setUserId($item->getId());
 				}
 
-				$basket->setCustomerId( $item->getId() );
+				$basket->setCustomerId($item->getId());
 
-				$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-				$orderBaseManager->saveItem( $basket, false );
+				$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+				$orderBaseManager->saveItem($basket, false);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$msg = sprintf( 'Unable to create an account for "%1$s": %2$s', $email, $e->getMessage() );
-				$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );
+				$msg = sprintf('Unable to create an account for "%1$s": %2$s', $email, $e->getMessage());
+				$context->getLogger()->log($msg, \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -297,7 +297,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -310,24 +310,24 @@ 
 	 * @param string $password Plain-text password for the customer
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer object filled with data
 	 */
-	protected function addCustomerData( \Aimeos\MShop\Customer\Item\Iface $customer,
-		\Aimeos\MShop\Common\Item\Address\Iface $address, $code, $password )
+	protected function addCustomerData(\Aimeos\MShop\Customer\Item\Iface $customer,
+		\Aimeos\MShop\Common\Item\Address\Iface $address, $code, $password)
 	{
 		$label = $address->getLastname();
 
-		if( ( $part = $address->getFirstname() ) !== '' ) {
-			$label = $part . ' ' . $label;
+		if (($part = $address->getFirstname()) !== '') {
+			$label = $part.' '.$label;
 		}
 
-		if( ( $part = $address->getCompany() ) !== '' ) {
-			$label .= ' (' . $part . ')';
+		if (($part = $address->getCompany()) !== '') {
+			$label .= ' ('.$part.')';
 		}
 
-		$customer->setPaymentAddress( $address );
-		$customer->setCode( $code );
-		$customer->setPassword( $password );
-		$customer->setLabel( $label );
-		$customer->setStatus( 1 );
+		$customer->setPaymentAddress($address);
+		$customer->setCode($code);
+		$customer->setPassword($password);
+		$customer->setLabel($label);
+		$customer->setStatus(1);
 
 		/** client/html/checkout/standard/order/account/standard/groupids
 		 * List of groups new customers should be assigned to
@@ -342,8 +342,8 @@ 
 		 * @category Developer
 		 */
 		$config = $this->getContext()->getConfig();
-		$gids = (array) $config->get( 'client/html/checkout/standard/order/account/standard/groupids', array() );
-		$customer->setGroups( $gids );
+		$gids = (array) $config->get('client/html/checkout/standard/order/account/standard/groupids', array());
+		$customer->setGroups($gids);
 
 		return $customer;
 	}

Braces +1 added lines, -2 removed lines

@@ -278,8 +278,7 @@
 
 				$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
 				$orderBaseManager->saveItem( $basket, false );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$msg = sprintf( 'Unable to create an account for "%1$s": %2$s', $email, $e->getMessage() );
 				$context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::INFO );

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

client/html/src/Client/Html/Checkout/Standard/Summary/Service/Standard.php

Indentation +235 added lines, -235 removed lines

@@ -19,263 +19,263 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Summary\Service\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Summary\Service\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/checkout/standard/summary/service/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout standard summary service 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/checkout/standard/summary/service/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/checkout/standard/summary/service/standard/subparts
+     * List of HTML sub-clients rendered within the checkout standard summary service 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/checkout/standard/summary/service/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->serviceBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->serviceBody = $html;
 
-		/** client/html/checkout/standard/summary/service/standard/template-body
-		 * Relative path to the HTML body template of the checkout standard summary service 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/checkout/standard/summary/service/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/standard/summary/service/standard/template-body';
-		$default = 'common/summary/service-body-default.php';
+        /** client/html/checkout/standard/summary/service/standard/template-body
+         * Relative path to the HTML body template of the checkout standard summary service 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/checkout/standard/summary/service/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/standard/summary/service/standard/template-body';
+        $default = 'common/summary/service-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->serviceHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->serviceHeader = $html;
 
-		/** client/html/checkout/standard/summary/service/standard/template-header
-		 * Relative path to the HTML header template of the checkout standard summary service 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/checkout/standard/summary/service/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/standard/summary/service/standard/template-header';
-		$default = 'common/summary/service-header-default.php';
+        /** client/html/checkout/standard/summary/service/standard/template-header
+         * Relative path to the HTML header template of the checkout standard summary service 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/checkout/standard/summary/service/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/standard/summary/service/standard/template-header';
+        $default = 'common/summary/service-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/checkout/standard/summary/service/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout standard summary service 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/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/global
-		 * @see client/html/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout standard summary service 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/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/global
+         * @see client/html/checkout/standard/summary/service/decorators/local
+         */
 
-		/** client/html/checkout/standard/summary/service/decorators/global
-		 * Adds a list of globally available decorators only to the checkout standard summary service 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/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/excludes
-		 * @see client/html/checkout/standard/summary/service/decorators/local
-		 */
+        /** client/html/checkout/standard/summary/service/decorators/global
+         * Adds a list of globally available decorators only to the checkout standard summary service 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/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/excludes
+         * @see client/html/checkout/standard/summary/service/decorators/local
+         */
 
-		/** client/html/checkout/standard/summary/service/decorators/local
-		 * Adds a list of local decorators only to the checkout standard summary service 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/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/excludes
-		 * @see client/html/checkout/standard/summary/service/decorators/global
-		 */
+        /** client/html/checkout/standard/summary/service/decorators/local
+         * Adds a list of local decorators only to the checkout standard summary service 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/checkout/standard/summary/service/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/checkout/standard/summary/service/decorators/excludes
+         * @see client/html/checkout/standard/summary/service/decorators/global
+         */
 
-		return $this->createSubClient( 'checkout/standard/summary/service/' . $type, $name );
-	}
+        return $this->createSubClient( 'checkout/standard/summary/service/' . $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, $tags, $expire );
+    /**
+     * 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, $tags, $expire );
 
-		if( !isset( $this->cache ) )
-		{
-			$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() );
+        if( !isset( $this->cache ) )
+        {
+            $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->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->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 );
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +22 added lines, -22 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->serviceBody = $html;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/service/standard/template-body';
 		$default = 'common/summary/service-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->serviceHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/service/standard/template-header';
 		$default = 'common/summary/service-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/checkout/standard/summary/service/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary service html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/checkout/standard/summary/service/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/service/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/service/'.$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,19 +259,19 @@ 
 	 * @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, $tags, $expire );
+		$view = parent::setViewParams($view, $tags, $expire);
 
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
-			$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->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->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);
 
 			$this->cache = $view;
 		}

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

client/html/src/Client/Html/Checkout/Standard/Summary/Option/Standard.php

Indentation +219 added lines, -219 removed lines

@@ -19,242 +19,242 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Iface
 {
-	/** client/html/checkout/standard/summary/option/standard/subparts
-	 * List of HTML sub-clients rendered within the checkout standard summary option 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/checkout/standard/summary/option/standard/subparts';
+    /** client/html/checkout/standard/summary/option/standard/subparts
+     * List of HTML sub-clients rendered within the checkout standard summary option 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/checkout/standard/summary/option/standard/subparts';
 
-	/** client/html/checkout/standard/summary/option/terms/name
-	 * Name of the terms part used by the checkout standard summary option client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Standard\Summary\Option\Terms\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( 'terms' );
+    /** client/html/checkout/standard/summary/option/terms/name
+     * Name of the terms part used by the checkout standard summary option client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Checkout\Standard\Summary\Option\Terms\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( 'terms' );
 
 
-	/**
-	 * 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->optionBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->optionBody = $html;
 
-		/** client/html/checkout/standard/summary/option/standard/template-body
-		 * Relative path to the HTML body template of the checkout standard summary option 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/checkout/standard/summary/option/standard/template-header
-		 */
-		$tplconf = 'client/html/checkout/standard/summary/option/standard/template-body';
-		$default = 'checkout/standard/summary-option-body-default.php';
+        /** client/html/checkout/standard/summary/option/standard/template-body
+         * Relative path to the HTML body template of the checkout standard summary option 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/checkout/standard/summary/option/standard/template-header
+         */
+        $tplconf = 'client/html/checkout/standard/summary/option/standard/template-body';
+        $default = 'checkout/standard/summary-option-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->optionHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->optionHeader = $html;
 
-		/** client/html/checkout/standard/summary/option/standard/template-header
-		 * Relative path to the HTML header template of the checkout standard summary option 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/checkout/standard/summary/option/standard/template-body
-		 */
-		$tplconf = 'client/html/checkout/standard/summary/option/standard/template-header';
-		$default = 'checkout/standard/summary-option-header-default.php';
+        /** client/html/checkout/standard/summary/option/standard/template-header
+         * Relative path to the HTML header template of the checkout standard summary option 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/checkout/standard/summary/option/standard/template-body
+         */
+        $tplconf = 'client/html/checkout/standard/summary/option/standard/template-header';
+        $default = 'checkout/standard/summary-option-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/checkout/standard/summary/option/decorators/excludes
-		 * Excludes decorators added by the "common" option from the checkout standard summary option 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/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/global
-		 * @see client/html/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/excludes
+         * Excludes decorators added by the "common" option from the checkout standard summary option 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/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/global
+         * @see client/html/checkout/standard/summary/option/decorators/local
+         */
 
-		/** client/html/checkout/standard/summary/option/decorators/global
-		 * Adds a list of globally available decorators only to the checkout standard summary option 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/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/excludes
-		 * @see client/html/checkout/standard/summary/option/decorators/local
-		 */
+        /** client/html/checkout/standard/summary/option/decorators/global
+         * Adds a list of globally available decorators only to the checkout standard summary option 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/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/excludes
+         * @see client/html/checkout/standard/summary/option/decorators/local
+         */
 
-		/** client/html/checkout/standard/summary/option/decorators/local
-		 * Adds a list of local decorators only to the checkout standard summary option 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/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/excludes
-		 * @see client/html/checkout/standard/summary/option/decorators/global
-		 */
+        /** client/html/checkout/standard/summary/option/decorators/local
+         * Adds a list of local decorators only to the checkout standard summary option 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/checkout/standard/summary/option/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/checkout/standard/summary/option/decorators/excludes
+         * @see client/html/checkout/standard/summary/option/decorators/global
+         */
 
-		return $this->createSubClient( 'checkout/standard/summary/option/' . $type, $name );
-	}
+        return $this->createSubClient( 'checkout/standard/summary/option/' . $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 );
+    }
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -67,7 +67,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'terms' );
+	private $subPartNames = array('terms');
 
 
 	/**
@@ -78,13 +78,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->optionBody = $html;
 
@@ -111,7 +111,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/option/standard/template-body';
 		$default = 'checkout/standard/summary-option-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -123,13 +123,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->optionHeader = $html;
 
@@ -157,7 +157,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/option/standard/template-header';
 		$default = 'checkout/standard/summary-option-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -168,7 +168,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/checkout/standard/summary/option/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary option html client
@@ -244,7 +244,7 @@ 
 		 * @see client/html/checkout/standard/summary/option/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/option/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/option/'.$type, $name);
 	}
 
 
@@ -255,6 +255,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 )
 	{