aimeos / ai-client-html

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

Spacing +17 added lines, -17 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->optionBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/option/terms/standard/template-body';
 		$default = 'checkout/standard/summary-option-terms-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->optionHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/option/terms/standard/template-header';
 		$default = 'checkout/standard/summary-option-terms-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/summary/option/terms/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary option terms html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/checkout/standard/summary/option/terms/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/option/terms/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/option/terms/'.$type, $name);
 	}
 
 
@@ -247,17 +247,17 @@ 
 		$view = $this->getView();
 
 		// only start if there's something to do
-		if( ( $option = $view->param( 'cs_option_terms', null ) ) === null ) {
+		if (($option = $view->param('cs_option_terms', null)) === null) {
 			return;
 		}
 
-		if( ( $option = $view->param( 'cs_option_terms_value', 0 ) ) != 1 )
+		if (($option = $view->param('cs_option_terms_value', 0)) != 1)
 		{
 			$view->standardStepActive = 'summary';
 			$view->termsError = true;
 
-			$error = array( $view->translate( 'client', 'Please accept the terms and conditions' ) );
-			$view->standardErrorList = $error + $view->get( 'standardErrorList', array() );
+			$error = array($view->translate('client', 'Please accept the terms and conditions'));
+			$view->standardErrorList = $error + $view->get('standardErrorList', array());
 		}
 
 		parent::process();
@@ -271,6 +271,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

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

Spacing +21 added lines, -21 removed lines

@@ -68,13 +68,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->couponBody = $html;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/coupon/standard/template-body';
 		$default = 'common/summary/coupon-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->couponHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/coupon/standard/template-header';
 		$default = 'common/summary/coupon-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/coupon/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary coupon html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/checkout/standard/summary/coupon/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/coupon/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/coupon/'.$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,18 +259,18 @@ 
 	 * @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/basket/standard/url/target' );
-			$cntl = $view->config( 'client/html/basket/standard/url/controller', 'basket' );
-			$action = $view->config( 'client/html/basket/standard/url/action', 'index' );
-			$config = $view->config( 'client/html/basket/standard/url/config', array() );
+			$target = $view->config('client/html/basket/standard/url/target');
+			$cntl = $view->config('client/html/basket/standard/url/controller', 'basket');
+			$action = $view->config('client/html/basket/standard/url/action', 'index');
+			$config = $view->config('client/html/basket/standard/url/config', array());
 
-			$view->summaryUrlCoupon = $view->url( $target, $cntl, $action, array(), array(), $config );
+			$view->summaryUrlCoupon = $view->url($target, $cntl, $action, array(), array(), $config);
 			$view->summaryBasket = $view->standardBasket;
 
 			$this->cache = $view;

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

Spacing +28 added lines, -28 removed lines

@@ -68,13 +68,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->detailBody = $html;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/detail/standard/template-body';
 		$default = 'common/summary/detail-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -114,13 +114,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->detailHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/detail/standard/template-header';
 		$default = 'common/summary/detail-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -160,7 +160,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/checkout/standard/summary/detail/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary detail html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/checkout/standard/summary/detail/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/detail/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/detail/'.$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,28 +259,28 @@ 
 	 * @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))
 		{
 			$basket = $view->standardBasket;
 
-			$bTarget = $view->config( 'client/html/basket/standard/url/target' );
-			$bCntl = $view->config( 'client/html/basket/standard/url/controller', 'basket' );
-			$bAction = $view->config( 'client/html/basket/standard/url/action', 'index' );
-			$bConfig = $view->config( 'client/html/basket/standard/url/config', array() );
+			$bTarget = $view->config('client/html/basket/standard/url/target');
+			$bCntl = $view->config('client/html/basket/standard/url/controller', 'basket');
+			$bAction = $view->config('client/html/basket/standard/url/action', 'index');
+			$bConfig = $view->config('client/html/basket/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() );
+			$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->summaryUrlBasket = $view->url( $bTarget, $bCntl, $bAction, array(), array(), $bConfig );
-			$view->summaryTaxRates = $this->getTaxRates( $basket );
+			$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->summaryUrlBasket = $view->url($bTarget, $bCntl, $bAction, array(), array(), $bConfig);
+			$view->summaryTaxRates = $this->getTaxRates($basket);
 			$view->summaryBasket = $basket;
 
 			$this->cache = $view;

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

Spacing +25 added lines, -25 removed lines

@@ -13,7 +13,7 @@ 
 
 
 // Strings for translation
-sprintf( 'summary' );
+sprintf('summary');
 
 
 /**
@@ -115,7 +115,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'address', 'service', 'coupon', 'option', 'detail' );
+	private $subPartNames = array('address', 'service', 'coupon', 'option', 'detail');
 
 
 	/**
@@ -126,21 +126,21 @@ 
 	 * @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();
-		$step = $view->get( 'standardStepActive' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'summary' && !( in_array( 'summary', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'summary' && !(in_array('summary', $onepage) && in_array($step, $onepage))) {
 			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->summaryBody = $html;
 
@@ -167,7 +167,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/standard/template-body';
 		$default = 'checkout/standard/summary-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -179,21 +179,21 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$view = $this->getView();
-		$step = $view->get( 'standardStepActive' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'summary' && !( in_array( 'summary', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'summary' && !(in_array('summary', $onepage) && in_array($step, $onepage))) {
 			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->summaryHeader = $html;
 
@@ -221,7 +221,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/standard/template-header';
 		$default = 'checkout/standard/summary-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -232,7 +232,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/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary html client
@@ -308,7 +308,7 @@ 
 		 * @see client/html/checkout/standard/summary/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/'.$type, $name);
 	}
 
 
@@ -321,18 +321,18 @@ 
 	{
 		$view = $this->getView();
 
-		if( $view->param( 'cs_order', null ) === null ) {
+		if ($view->param('cs_order', null) === null) {
 			return;
 		}
 
 		try
 		{
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
+			$controller->get()->check(\Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL);
 
 			parent::process();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$view->standardStepActive = 'summary';
 			throw $e;
@@ -347,6 +347,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

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

Spacing +21 added lines, -21 removed lines

@@ -68,13 +68,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->addressBody = $html;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/address/standard/template-body';
 		$default = 'common/summary/address-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->addressHeader = $html;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/checkout/standard/summary/address/standard/template-header';
 		$default = 'common/summary/address-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/address/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard summary address html client
@@ -236,7 +236,7 @@ 
 		 * @see client/html/checkout/standard/summary/address/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/summary/address/' . $type, $name );
+		return $this->createSubClient('checkout/standard/summary/address/'.$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,18 +259,18 @@ 
 	 * @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());
 
-			$url = $view->url( $target, $cntl, $action, array( 'c_step' => 'address' ), array(), $config );
+			$url = $view->url($target, $cntl, $action, array('c_step' => 'address'), array(), $config);
 
 			$view->summaryUrlAddressBilling = $url;
 			$view->summaryUrlAddressDelivery = $url;

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +77 added lines, -77 removed lines

@@ -122,7 +122,7 @@ 
 	 * @since 2015.07
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'address', 'delivery', 'payment', 'summary', 'order', 'process' );
+	private $subPartNames = array('address', 'delivery', 'payment', 'summary', 'order', 'process');
 	private $cache;
 
 
@@ -134,42 +134,42 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
 
 		try
 		{
-			$view = $this->setViewParams( $view, $tags, $expire );
+			$view = $this->setViewParams($view, $tags, $expire);
 
 			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 			}
 			$view->standardBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
 
 		/** client/html/checkout/standard/standard/template-body
@@ -195,7 +195,7 @@ 
 		$tplconf = 'client/html/checkout/standard/standard/template-body';
 		$default = 'checkout/standard/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -207,15 +207,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->standardHeader = $html;
 
@@ -243,11 +243,11 @@ 
 			$tplconf = 'client/html/checkout/standard/standard/template-header';
 			$default = 'checkout/standard/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());
 		}
 	}
 
@@ -259,7 +259,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/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard html client
@@ -335,7 +335,7 @@ 
 		 * @see client/html/checkout/standard/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/' . $type, $name );
+		return $this->createSubClient('checkout/standard/'.$type, $name);
 	}
 
 
@@ -353,35 +353,35 @@ 
 		{
 			parent::process();
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+		catch (\Aimeos\MShop\Plugin\Provider\Exception $e)
 		{
-			$errors = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
+			$errors = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$errors = array_merge($errors, $this->translatePluginErrorCodes($e->getErrorCodes()));
 
 			$view->summaryErrorCodes = $e->getErrorCodes();
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $errors;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
 	}
 
@@ -393,7 +393,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -405,19 +405,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)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$context = $this->getContext();
 
-			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 			$view->standardBasket = $basketCntl->get();
 
-			$bTarget = $view->config( 'client/html/basket/standard/url/target' );
-			$bCntl = $view->config( 'client/html/basket/standard/url/controller', 'basket' );
-			$bAction = $view->config( 'client/html/basket/standard/url/action', 'index' );
-			$bConfig = $view->config( 'client/html/basket/standard/url/config', array() );
+			$bTarget = $view->config('client/html/basket/standard/url/target');
+			$bCntl = $view->config('client/html/basket/standard/url/controller', 'basket');
+			$bAction = $view->config('client/html/basket/standard/url/action', 'index');
+			$bConfig = $view->config('client/html/basket/standard/url/config', array());
 
 
 			/** client/html/checkout/standard/url/target
@@ -434,7 +434,7 @@ 
 			 * @see client/html/checkout/standard/url/action
 			 * @see client/html/checkout/standard/url/config
 			 */
-			$cTarget = $view->config( 'client/html/checkout/standard/url/target' );
+			$cTarget = $view->config('client/html/checkout/standard/url/target');
 
 			/** client/html/checkout/standard/url/controller
 			 * Name of the controller whose action should be called
@@ -450,7 +450,7 @@ 
 			 * @see client/html/checkout/standard/url/action
 			 * @see client/html/checkout/standard/url/config
 			 */
-			$cCntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
+			$cCntl = $view->config('client/html/checkout/standard/url/controller', 'checkout');
 
 			/** client/html/checkout/standard/url/action
 			 * Name of the action that should create the output
@@ -466,7 +466,7 @@ 
 			 * @see client/html/checkout/standard/url/controller
 			 * @see client/html/checkout/standard/url/config
 			 */
-			$cAction = $view->config( 'client/html/checkout/standard/url/action', 'index' );
+			$cAction = $view->config('client/html/checkout/standard/url/action', 'index');
 
 			/** client/html/checkout/standard/url/config
 			 * Associative list of configuration options used for generating the URL
@@ -489,7 +489,7 @@ 
 			 * @see client/html/checkout/standard/url/action
 			 * @see client/html/url/config
 			 */
-			$cConfig = $view->config( 'client/html/checkout/standard/url/config', array() );
+			$cConfig = $view->config('client/html/checkout/standard/url/config', array());
 
 
 			/** client/html/checkout/standard/url/step-active
@@ -515,7 +515,7 @@ 
 			 * @category User
 			 * @see client/html/checkout/standard/standard/subparts
 			 */
-			$default = $view->config( 'client/html/checkout/standard/url/step-active', 'summary' );
+			$default = $view->config('client/html/checkout/standard/url/step-active', 'summary');
 
 			/** client/html/checkout/standard/onepage
 			 * Shows all named checkout subparts at once for a one page checkout
@@ -547,24 +547,24 @@ 
 			 * @since 2015.05
 			 * @category Developer
 			 */
-			$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
-			$onestep = array_shift( $onepage ); // keep the first one page step
+			$onepage = $view->config('client/html/checkout/standard/onepage', array());
+			$onestep = array_shift($onepage); // keep the first one page step
 
-			$steps = (array) $context->getConfig()->get( $this->subPartPath, $this->subPartNames );
-			$steps = array_diff( $steps, $onepage ); // remove all remaining steps in $onepage
+			$steps = (array) $context->getConfig()->get($this->subPartPath, $this->subPartNames);
+			$steps = array_diff($steps, $onepage); // remove all remaining steps in $onepage
 
 			// use first step if default step isn't available
-			$default = ( !in_array( $default, $steps ) ? reset( $steps ) : $default );
+			$default = (!in_array($default, $steps) ? reset($steps) : $default);
 
-			$current = $view->param( 'c_step', $default );
+			$current = $view->param('c_step', $default);
 			// use $onestep if current step isn't available due to one page layout
-			$current = ( !in_array( $current, $steps ) ? $onestep : $current );
+			$current = (!in_array($current, $steps) ? $onestep : $current);
 
-			$cpos = $cpos = array_search( $current, $steps );
+			$cpos = $cpos = array_search($current, $steps);
 
-			if( !isset( $view->standardStepActive )
-				|| ( ( $apos = array_search( $view->standardStepActive, $steps ) ) !== false
-				&& $cpos !== false && $cpos < $apos )
+			if (!isset($view->standardStepActive)
+				|| (($apos = array_search($view->standardStepActive, $steps)) !== false
+				&& $cpos !== false && $cpos < $apos)
 			) {
 				$view->standardStepActive = $current;
 			}
@@ -577,19 +577,19 @@ 
 			do {
 				$lastStep = $step;
 			}
-			while( ( $step = array_shift( $steps ) ) !== null && $step !== $activeStep );
+			while (($step = array_shift($steps)) !== null && $step !== $activeStep);
 
 
-			if( $lastStep !== null ) {
-				$param = array( 'c_step' => $lastStep );
-				$view->standardUrlBack = $view->url( $cTarget, $cCntl, $cAction, $param, array(), $cConfig );
+			if ($lastStep !== null) {
+				$param = array('c_step' => $lastStep);
+				$view->standardUrlBack = $view->url($cTarget, $cCntl, $cAction, $param, array(), $cConfig);
 			} else {
-				$view->standardUrlBack = $view->url( $bTarget, $bCntl, $bAction, array(), array(), $bConfig );
+				$view->standardUrlBack = $view->url($bTarget, $bCntl, $bAction, array(), array(), $bConfig);
 			}
 
-			if( !isset( $view->standardUrlNext ) && ( $nextStep = array_shift( $steps ) ) !== null ) {
-				$param = array( 'c_step' => $nextStep );
-				$view->standardUrlNext = $view->url( $cTarget, $cCntl, $cAction, $param, array(), $cConfig );
+			if (!isset($view->standardUrlNext) && ($nextStep = array_shift($steps)) !== null) {
+				$param = array('c_step' => $nextStep);
+				$view->standardUrlNext = $view->url($cTarget, $cCntl, $cAction, $param, array(), $cConfig);
 			}
 			// don't overwrite $view->standardUrlNext so order step URL is used
 

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

Spacing +40 added lines, -40 removed lines

@@ -13,7 +13,7 @@ 
 
 
 // Strings for translation
-sprintf( 'delivery' );
+sprintf('delivery');
 
 
 /**
@@ -72,21 +72,21 @@ 
 	 * @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();
-		$step = $view->get( 'standardStepActive' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'delivery' && !( in_array( 'delivery', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'delivery' && !(in_array('delivery', $onepage) && in_array($step, $onepage))) {
 			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->deliveryBody = $html;
 
@@ -113,7 +113,7 @@ 
 		$tplconf = 'client/html/checkout/standard/delivery/standard/template-body';
 		$default = 'checkout/standard/delivery-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -125,21 +125,21 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$view = $this->getView();
-		$step = $view->get( 'standardStepActive' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'delivery' && !( in_array( 'delivery', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'delivery' && !(in_array('delivery', $onepage) && in_array($step, $onepage))) {
 			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->deliveryHeader = $html;
 
@@ -167,7 +167,7 @@ 
 		$tplconf = 'client/html/checkout/standard/delivery/standard/template-header';
 		$default = 'checkout/standard/delivery-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -178,7 +178,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/delivery/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard delivery html client
@@ -254,7 +254,7 @@ 
 		 * @see client/html/checkout/standard/delivery/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/delivery/' . $type, $name );
+		return $this->createSubClient('checkout/standard/delivery/'.$type, $name);
 	}
 
 
@@ -270,25 +270,25 @@ 
 		try
 		{
 			$context = $this->getContext();
-			$basketCtrl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+			$basketCtrl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
 			// only start if there's something to do
-			if( ( $serviceId = $view->param( 'c_deliveryoption', null ) ) !== null )
+			if (($serviceId = $view->param('c_deliveryoption', null)) !== null)
 			{
-				$serviceCtrl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'service' );
+				$serviceCtrl = \Aimeos\Controller\Frontend\Factory::createController($context, 'service');
 
-				$attributes = $view->param( 'c_delivery/' . $serviceId, array() );
-				$errors = $serviceCtrl->checkServiceAttributes( 'delivery', $serviceId, $attributes );
+				$attributes = $view->param('c_delivery/'.$serviceId, array());
+				$errors = $serviceCtrl->checkServiceAttributes('delivery', $serviceId, $attributes);
 
-				foreach( $errors as $key => $msg )
+				foreach ($errors as $key => $msg)
 				{
-					if( $msg === null ) {
-						unset( $errors[$key] );
+					if ($msg === null) {
+						unset($errors[$key]);
 					}
 				}
 
-				if( count( $errors ) === 0 ) {
-					$basketCtrl->setService( 'delivery', $serviceId, $attributes );
+				if (count($errors) === 0) {
+					$basketCtrl->setService('delivery', $serviceId, $attributes);
 				} else {
 					$view->standardStepActive = 'delivery';
 				}
@@ -302,13 +302,13 @@ 
 
 			// Test if delivery service is available
 			$services = $basketCtrl->get()->getServices();
-			if( !isset( $view->standardStepActive ) && !array_key_exists( 'delivery', $services ) )
+			if (!isset($view->standardStepActive) && !array_key_exists('delivery', $services))
 			{
 				$view->standardStepActive = 'delivery';
 				return false;
 			}
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$view->standardStepActive = 'delivery';
 			throw $e;
@@ -323,7 +323,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -335,24 +335,24 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$context = $this->getContext();
 
-			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-			$serviceCntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'service' );
+			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+			$serviceCntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'service');
 
 			$basket = $basketCntl->get();
 
-			$services = $serviceCntl->getServices( 'delivery', $basket );
+			$services = $serviceCntl->getServices('delivery', $basket);
 			$serviceAttributes = $servicePrices = array();
 
-			foreach( $services as $id => $service )
+			foreach ($services as $id => $service)
 			{
-				$serviceAttributes[$id] = $serviceCntl->getServiceAttributes( 'delivery', $id, $basket );
-				$servicePrices[$id] = $serviceCntl->getServicePrice( 'delivery', $id, $basket );
+				$serviceAttributes[$id] = $serviceCntl->getServiceAttributes('delivery', $id, $basket);
+				$servicePrices[$id] = $serviceCntl->getServicePrice('delivery', $id, $basket);
 			}
 
 			$view->deliveryServices = $services;

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

Spacing +40 added lines, -40 removed lines

@@ -13,7 +13,7 @@ 
 
 
 // Strings for translation
-sprintf( 'payment' );
+sprintf('payment');
 
 
 /**
@@ -72,21 +72,21 @@ 
 	 * @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();
-		$step = $view->get( 'standardStepActive' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'payment' && !( in_array( 'payment', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'payment' && !(in_array('payment', $onepage) && in_array($step, $onepage))) {
 			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->paymentBody = $html;
 
@@ -113,7 +113,7 @@ 
 		$tplconf = 'client/html/checkout/standard/payment/standard/template-body';
 		$default = 'checkout/standard/payment-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -125,21 +125,21 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$view = $this->getView();
-		$step = $view->get( 'standardStepActive' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'payment' && !( in_array( 'payment', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'payment' && !(in_array('payment', $onepage) && in_array($step, $onepage))) {
 			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->paymentHeader = $html;
 
@@ -167,7 +167,7 @@ 
 		$tplconf = 'client/html/checkout/standard/payment/standard/template-header';
 		$default = 'checkout/standard/payment-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -178,7 +178,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/payment/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard payment html client
@@ -254,7 +254,7 @@ 
 		 * @see client/html/checkout/standard/payment/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/payment/' . $type, $name );
+		return $this->createSubClient('checkout/standard/payment/'.$type, $name);
 	}
 
 
@@ -270,25 +270,25 @@ 
 		try
 		{
 			$context = $this->getContext();
-			$basketCtrl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+			$basketCtrl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
 			// only start if there's something to do
-			if( ( $serviceId = $view->param( 'c_paymentoption', null ) ) !== null )
+			if (($serviceId = $view->param('c_paymentoption', null)) !== null)
 			{
-				$serviceCtrl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'service' );
+				$serviceCtrl = \Aimeos\Controller\Frontend\Factory::createController($context, 'service');
 
-				$attributes = $view->param( 'c_payment/' . $serviceId, array() );
-				$errors = $serviceCtrl->checkServiceAttributes( 'payment', $serviceId, $attributes );
+				$attributes = $view->param('c_payment/'.$serviceId, array());
+				$errors = $serviceCtrl->checkServiceAttributes('payment', $serviceId, $attributes);
 
-				foreach( $errors as $key => $msg )
+				foreach ($errors as $key => $msg)
 				{
-					if( $msg === null ) {
-						unset( $errors[$key] );
+					if ($msg === null) {
+						unset($errors[$key]);
 					}
 				}
 
-				if( count( $errors ) === 0 ) {
-					$basketCtrl->setService( 'payment', $serviceId, $attributes );
+				if (count($errors) === 0) {
+					$basketCtrl->setService('payment', $serviceId, $attributes);
 				} else {
 					$view->standardStepActive = 'payment';
 				}
@@ -302,13 +302,13 @@ 
 
 			// Test if payment service is available
 			$services = $basketCtrl->get()->getServices();
-			if( !isset( $view->standardStepActive ) && !array_key_exists( 'payment', $services ) )
+			if (!isset($view->standardStepActive) && !array_key_exists('payment', $services))
 			{
 				$view->standardStepActive = 'payment';
 				return false;
 			}
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$view->standardStepActive = 'payment';
 			throw $e;
@@ -323,7 +323,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -335,24 +335,24 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$context = $this->getContext();
 
-			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-			$serviceCntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'service' );
+			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+			$serviceCntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'service');
 
 			$basket = $basketCntl->get();
 
-			$services = $serviceCntl->getServices( 'payment', $basket );
+			$services = $serviceCntl->getServices('payment', $basket);
 			$serviceAttributes = $servicePrices = array();
 
-			foreach( $services as $id => $service )
+			foreach ($services as $id => $service)
 			{
-				$serviceAttributes[$id] = $serviceCntl->getServiceAttributes( 'payment', $id, $basket );
-				$servicePrices[$id] = $serviceCntl->getServicePrice( 'payment', $id, $basket );
+				$serviceAttributes[$id] = $serviceCntl->getServiceAttributes('payment', $id, $basket);
+				$servicePrices[$id] = $serviceCntl->getServicePrice('payment', $id, $basket);
 			}
 
 			$view->paymentServices = $services;