aimeos / ai-client-html

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

Spacing +43 added lines, -43 removed lines

@@ -13,7 +13,7 @@ 
 
 
 // Strings for translation
-sprintf( 'address' );
+sprintf('address');
 
 
 /**
@@ -82,7 +82,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'billing', 'delivery' );
+	private $subPartNames = array('billing', 'delivery');
 
 	private $cache;
 
@@ -95,21 +95,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', 'address' );
-		$onepage = $view->config( 'client/html/checkout/standard/onepage', array() );
+		$step = $view->get('standardStepActive', 'address');
+		$onepage = $view->config('client/html/checkout/standard/onepage', array());
 
-		if( $step != 'address' && !( in_array( 'address', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'address' && !(in_array('address', $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->addressBody = $html;
 
@@ -136,7 +136,7 @@ 
 		$tplconf = 'client/html/checkout/standard/address/standard/template-body';
 		$default = 'checkout/standard/address-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -148,21 +148,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 != 'address' && !( in_array( 'address', $onepage ) && in_array( $step, $onepage ) ) ) {
+		if ($step != 'address' && !(in_array('address', $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->addressHeader = $html;
 
@@ -190,7 +190,7 @@ 
 		$tplconf = 'client/html/checkout/standard/address/standard/template-header';
 		$default = 'checkout/standard/address-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -201,7 +201,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/address/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard address html client
@@ -277,7 +277,7 @@ 
 		 * @see client/html/checkout/standard/address/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/address/' . $type, $name );
+		return $this->createSubClient('checkout/standard/address/'.$type, $name);
 	}
 
 
@@ -294,17 +294,17 @@ 
 		{
 			parent::process();
 
-			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
 			// Test if addresses are available
 			$addresses = $basketCntl->get()->getAddresses();
-			if( !isset( $view->standardStepActive ) && count( $addresses ) === 0 )
+			if (!isset($view->standardStepActive) && count($addresses) === 0)
 			{
 				$view->standardStepActive = 'address';
 				return false;
 			}
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$this->getView()->standardStepActive = 'address';
 			throw $e;
@@ -320,7 +320,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -332,44 +332,44 @@ 
 	 * @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();
 
 
-			$customerManager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+			$customerManager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
-			$search = $customerManager->createSearch( true );
+			$search = $customerManager->createSearch(true);
 			$expr = array(
-				$search->compare( '==', 'customer.id', $context->getUserId() ),
+				$search->compare('==', 'customer.id', $context->getUserId()),
 				$search->getConditions(),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 
-			$items = $customerManager->searchItems( $search );
+			$items = $customerManager->searchItems($search);
 
-			if( ( $item = reset( $items ) ) !== false )
+			if (($item = reset($items)) !== false)
 			{
 				$deliveryAddressItems = array();
 
-				$orderAddressManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/address' );
-				$customerAddressManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+				$orderAddressManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/address');
+				$customerAddressManager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 				$search = $customerAddressManager->createSearch();
-				$search->setConditions( $search->compare( '==', 'customer.address.parentid', $item->getId() ) );
+				$search->setConditions($search->compare('==', 'customer.address.parentid', $item->getId()));
 
-				foreach( $customerAddressManager->searchItems( $search ) as $id => $address )
+				foreach ($customerAddressManager->searchItems($search) as $id => $address)
 				{
 					$deliveryAddressItem = $orderAddressManager->createItem();
-					$deliveryAddressItem->copyFrom( $address );
+					$deliveryAddressItem->copyFrom($address);
 
 					$deliveryAddressItems[$id] = $deliveryAddressItem;
 				}
 
 				$paymentAddressItem = $orderAddressManager->createItem();
-				$paymentAddressItem->copyFrom( $item->getPaymentAddress() );
+				$paymentAddressItem->copyFrom($item->getPaymentAddress());
 
 				$view->addressCustomerItem = $item;
 				$view->addressPaymentItem = $paymentAddressItem;
@@ -377,11 +377,11 @@ 
 			}
 
 
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-			$locales = $localeManager->searchItems( $localeManager->createSearch( true ) );
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+			$locales = $localeManager->searchItems($localeManager->createSearch(true));
 
 			$languages = array();
-			foreach( $locales as $locale ) {
+			foreach ($locales as $locale) {
 				$languages[$locale->getLanguageId()] = $locale->getLanguageId();
 			}
 
@@ -418,7 +418,7 @@ 
 			 * @see client/html/checkout/standard/address/delivery/mandatory
 			 * @see client/html/checkout/standard/address/delivery/optional
 			 */
-			$view->addressCountries = $view->config( 'client/html/checkout/standard/address/countries', array() );
+			$view->addressCountries = $view->config('client/html/checkout/standard/address/countries', array());
 
 			/** client/html/checkout/standard/address/states
 			 * List of available states that that users can select from in the front-end
@@ -465,7 +465,7 @@ 
 			 * @see client/html/checkout/standard/address/delivery/mandatory
 			 * @see client/html/checkout/standard/address/delivery/optional
 			 */
-			$view->addressStates = $view->config( 'client/html/checkout/standard/address/states', array() );
+			$view->addressStates = $view->config('client/html/checkout/standard/address/states', array());
 
 
 			$this->cache = $view;

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

Spacing +77 added lines, -77 removed lines

@@ -86,13 +86,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->deliveryBody = $html;
 
@@ -119,7 +119,7 @@ 
 		$tplconf = 'client/html/checkout/standard/address/delivery/standard/template-body';
 		$default = 'checkout/standard/address-delivery-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -131,13 +131,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->deliveryHeader = $html;
 
@@ -165,7 +165,7 @@ 
 		$tplconf = 'client/html/checkout/standard/address/delivery/standard/template-header';
 		$default = 'checkout/standard/address-delivery-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -176,7 +176,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/address/delivery/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout standard address delivery html client
@@ -252,7 +252,7 @@ 
 		 * @see client/html/checkout/standard/address/delivery/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/standard/address/delivery/' . $type, $name );
+		return $this->createSubClient('checkout/standard/address/delivery/'.$type, $name);
 	}
 
 
@@ -266,24 +266,24 @@ 
 
 		try
 		{
-			if( ( $id = $view->param( 'ca_delivery_delete', null ) ) !== null )
+			if (($id = $view->param('ca_delivery_delete', null)) !== null)
 			{
-				$customerAddressManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
-				$address = $customerAddressManager->getItem( $id );
+				$customerAddressManager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
+				$address = $customerAddressManager->getItem($id);
 
-				if( $address->getParentId() != $context->getUserId() ) {
-					throw new \Aimeos\Client\Html\Exception( sprintf( 'Address with ID "%1$s" not found', $id ) );
+				if ($address->getParentId() != $context->getUserId()) {
+					throw new \Aimeos\Client\Html\Exception(sprintf('Address with ID "%1$s" not found', $id));
 				}
 
-				$customerAddressManager->deleteItem( $id );
+				$customerAddressManager->deleteItem($id);
 			}
 
 			// only start if there's something to do
-			if( $view->param( 'ca_deliveryoption', null ) === null ) {
+			if ($view->param('ca_deliveryoption', null) === null) {
 				return;
 			}
 
-			$basketCtrl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+			$basketCtrl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
 			/** client/html/checkout/standard/address/delivery/disable-new
 			 * Disables the option to enter a different delivery address for an order
@@ -304,63 +304,63 @@ 
 			 * @see client/html/checkout/standard/address/delivery/optional
 			 * @see client/html/checkout/standard/address/delivery/hidden
 			 */
-			$disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false );
+			$disable = $view->config('client/html/checkout/standard/address/delivery/disable-new', false);
 			$type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY;
 
-			if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address
+			if (($option = $view->param('ca_deliveryoption', 'null')) === 'null' && $disable === false) // new address
 			{
-				$params = $view->param( 'ca_delivery', array() );
-				$invalid = $this->checkFields( $params );
+				$params = $view->param('ca_delivery', array());
+				$invalid = $this->checkFields($params);
 
-				if( count( $invalid ) > 0 )
+				if (count($invalid) > 0)
 				{
 					$view->deliveryError = $invalid;
-					throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
+					throw new \Aimeos\Client\Html\Exception(sprintf('At least one delivery address part is missing or invalid'));
 				}
 
-				$basketCtrl->setAddress( $type, $params );
+				$basketCtrl->setAddress($type, $params);
 			}
-			else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) // existing address
+			else if (($option = $view->param('ca_deliveryoption', 'null')) !== '-1') // existing address
 			{
-				$customerAddressManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
-				$address = $customerAddressManager->getItem( $option );
+				$customerAddressManager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
+				$address = $customerAddressManager->getItem($option);
 
-				if( $address->getParentId() != $context->getUserId() ) {
-					throw new \Aimeos\Client\Html\Exception( sprintf( 'Address with ID "%1$s" not found', $option ) );
+				if ($address->getParentId() != $context->getUserId()) {
+					throw new \Aimeos\Client\Html\Exception(sprintf('Address with ID "%1$s" not found', $option));
 				}
 
 				$invalid = array();
-				$params = $view->param( 'ca_delivery_' . $option, array() );
+				$params = $view->param('ca_delivery_'.$option, array());
 
-				if( !empty( $params ) )
+				if (!empty($params))
 				{
 					$list = array();
-					$invalid = $this->checkFields( $params );
+					$invalid = $this->checkFields($params);
 
-					foreach( $params as $key => $value ) {
-						$list[str_replace( 'order.base', 'customer', $key )] = $value;
+					foreach ($params as $key => $value) {
+						$list[str_replace('order.base', 'customer', $key)] = $value;
 					}
 
-					$address->fromArray( $list );
-					$customerAddressManager->saveItem( $address );
+					$address->fromArray($list);
+					$customerAddressManager->saveItem($address);
 				}
 
-				if( count( $invalid ) > 0 )
+				if (count($invalid) > 0)
 				{
 					$view->deliveryError = $invalid;
-					throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
+					throw new \Aimeos\Client\Html\Exception(sprintf('At least one delivery address part is missing or invalid'));
 				}
 
-				$basketCtrl->setAddress( $type, $address );
+				$basketCtrl->setAddress($type, $address);
 			}
 			else
 			{
-				$basketCtrl->setAddress( $type, null );
+				$basketCtrl->setAddress($type, null);
 			}
 
 			parent::process();
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
 			$view->deliveryError = $e->getErrorList();
 			throw $e;
@@ -374,7 +374,7 @@ 
 	 * @param array &$params Associative list of address keys (order.base.address.* or customer.address.*) and their values
 	 * @return array List of missing field names
 	 */
-	protected function checkFields( array &$params )
+	protected function checkFields(array &$params)
 	{
 		$view = $this->getView();
 
@@ -416,7 +416,7 @@ 
 		 * @see client/html/checkout/standard/address/countries
 		 * @see client/html/checkout/standard/address/validate
 		 */
-		$mandatory = $view->config( 'client/html/checkout/standard/address/delivery/mandatory', $this->mandatory );
+		$mandatory = $view->config('client/html/checkout/standard/address/delivery/mandatory', $this->mandatory);
 
 		/** client/html/checkout/standard/address/delivery/optional
 		 * List of delivery address input fields that are optional
@@ -456,7 +456,7 @@ 
 		 * @see client/html/checkout/standard/address/countries
 		 * @see client/html/checkout/standard/address/validate
 		 */
-		$optional = $view->config( 'client/html/checkout/standard/address/delivery/optional', $this->optional );
+		$optional = $view->config('client/html/checkout/standard/address/delivery/optional', $this->optional);
 
 		/** client/html/checkout/standard/address/validate
 		 *
@@ -465,32 +465,32 @@ 
 		 */
 
 		$invalid = array();
-		$allFields = array_flip( array_merge( $mandatory, $optional ) );
+		$allFields = array_flip(array_merge($mandatory, $optional));
 
-		foreach( $params as $key => $value )
+		foreach ($params as $key => $value)
 		{
-			if( isset( $allFields[$key] ) )
+			if (isset($allFields[$key]))
 			{
-				$name = substr( $key, 19 );
-				$regex = $view->config( 'client/html/checkout/standard/address/validate/' . $name );
+				$name = substr($key, 19);
+				$regex = $view->config('client/html/checkout/standard/address/validate/'.$name);
 
-				if( $regex && preg_match( '/' . $regex . '/', $value ) !== 1 )
+				if ($regex && preg_match('/'.$regex.'/', $value) !== 1)
 				{
-					$msg = $view->translate( 'client', 'Delivery address part "%1$s" is invalid' );
-					$invalid[$key] = sprintf( $msg, $name );
-					unset( $params[$key] );
+					$msg = $view->translate('client', 'Delivery address part "%1$s" is invalid');
+					$invalid[$key] = sprintf($msg, $name);
+					unset($params[$key]);
 				}
 			}
 			else
 			{
-				unset( $params[$key] );
+				unset($params[$key]);
 			}
 		}
 
 
-		if( isset( $params['order.base.address.salutation'] )
+		if (isset($params['order.base.address.salutation'])
 			&& $params['order.base.address.salutation'] === \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY
-			&& in_array( 'order.base.address.company', $mandatory ) === false
+			&& in_array('order.base.address.company', $mandatory) === false
 		) {
 			$mandatory[] = 'order.base.address.company';
 		} else {
@@ -498,13 +498,13 @@ 
 		}
 
 
-		foreach( $mandatory as $key )
+		foreach ($mandatory as $key)
 		{
-			if( !isset( $params[$key] ) || $params[$key] == '' )
+			if (!isset($params[$key]) || $params[$key] == '')
 			{
-				$msg = $view->translate( 'client', 'Delivery address part "%1$s" is missing' );
-				$invalid[$key] = sprintf( $msg, substr( $key, 19 ) );
-				unset( $params[$key] );
+				$msg = $view->translate('client', 'Delivery address part "%1$s" is missing');
+				$invalid[$key] = sprintf($msg, substr($key, 19));
+				unset($params[$key]);
 			}
 		}
 
@@ -519,7 +519,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -531,17 +531,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))
 		{
 			$context = $this->getContext();
-			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+			$basketCntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
 			try {
-				$langid = $basketCntl->get()->getAddress( 'delivery' )->getLanguageId();
-			} catch( \Exception $e ) {
-				$langid = $view->param( 'ca_delivery/order.base.address.languageid', $context->getLocale()->getLanguageId() );
+				$langid = $basketCntl->get()->getAddress('delivery')->getLanguageId();
+			} catch (\Exception $e) {
+				$langid = $view->param('ca_delivery/order.base.address.languageid', $context->getLocale()->getLanguageId());
 			}
 			$view->deliveryLanguage = $langid;
 
@@ -584,13 +584,13 @@ 
 			 * @see client/html/checkout/standard/address/delivery/optional
 			 * @see client/html/checkout/standard/address/countries
 			 */
-			$hidden = $view->config( 'client/html/checkout/standard/address/delivery/hidden', array() );
+			$hidden = $view->config('client/html/checkout/standard/address/delivery/hidden', array());
 
-			if( count( $view->get( 'addressLanguages', array() ) ) === 1 ) {
+			if (count($view->get('addressLanguages', array())) === 1) {
 				$hidden[] = 'order.base.address.languageid';
 			}
 
-			$salutations = array( 'company', 'mr', 'mrs' );
+			$salutations = array('company', 'mr', 'mrs');
 
 			/** client/html/checkout/standard/address/delivery/salutations
 			 * List of salutions the customer can select from for the delivery address
@@ -620,10 +620,10 @@ 
 			 * @see client/html/checkout/standard/address/delivery/hidden
 			 * @see client/html/checkout/standard/address/countries
 			 */
-			$view->deliverySalutations = $view->config( 'client/html/checkout/standard/address/delivery/salutations', $salutations );
+			$view->deliverySalutations = $view->config('client/html/checkout/standard/address/delivery/salutations', $salutations);
 
-			$view->deliveryMandatory = $view->config( 'client/html/checkout/standard/address/delivery/mandatory', $this->mandatory );
-			$view->deliveryOptional = $view->config( 'client/html/checkout/standard/address/delivery/optional', $this->optional );
+			$view->deliveryMandatory = $view->config('client/html/checkout/standard/address/delivery/mandatory', $this->mandatory);
+			$view->deliveryOptional = $view->config('client/html/checkout/standard/address/delivery/optional', $this->optional);
 			$view->deliveryHidden = $hidden;
 
 

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

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

Spacing +63 added lines, -63 removed lines

@@ -67,42 +67,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->updateBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->updateErrorList = $view->get( 'updateErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->updateErrorList = $view->get('updateErrorList', 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->updateErrorList = $view->get( 'updateErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->updateErrorList = $view->get('updateErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->updateErrorList = $view->get( 'updateErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->updateErrorList = $view->get('updateErrorList', 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->updateErrorList = $view->get( 'updateErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->updateErrorList = $view->get('updateErrorList', array()) + $error;
 		}
 
 		/** client/html/checkout/update/standard/template-body
@@ -128,7 +128,7 @@ 
 		$tplconf = 'client/html/checkout/update/standard/template-body';
 		$default = 'checkout/update/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -140,15 +140,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->updateHeader = $html;
 
@@ -176,11 +176,11 @@ 
 			$tplconf = 'client/html/checkout/update/standard/template-header';
 			$default = 'checkout/update/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());
 		}
 	}
 
@@ -192,7 +192,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/update/decorators/excludes
 		 * Excludes decorators added by the "common" option from the checkout update html client
@@ -268,7 +268,7 @@ 
 		 * @see client/html/checkout/update/decorators/global
 		 */
 
-		return $this->createSubClient( 'checkout/update/' . $type, $name );
+		return $this->createSubClient('checkout/update/'.$type, $name);
 	}
 
 
@@ -284,16 +284,16 @@ 
 
 		try
 		{
-			$provider = $this->getServiceProvider( $view->param( 'code' ) );
+			$provider = $this->getServiceProvider($view->param('code'));
 
-			$config = array( 'absoluteUri' => true, 'namespace' => false );
-			$params = array( 'code' => $view->param( 'code' ), 'orderid' => $view->param( 'orderid' ) );
+			$config = array('absoluteUri' => true, 'namespace' => false);
+			$params = array('code' => $view->param('code'), 'orderid' => $view->param('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),
 			);
 			$urls['payment.url-self'] = $urls['payment.url-update'];
-			$provider->injectGlobalConfigBE( $urls );
+			$provider->injectGlobalConfigBE($urls);
 
 			$response = null;
 			$headers = array();
@@ -302,24 +302,24 @@ 
 			{
 				$body = $view->request()->getBody();
 
-				if( ( $orderItem = $provider->updateSync( $view->param(), $body, $response, $headers ) ) !== null ) {
-					\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem ); // stock, coupons
+				if (($orderItem = $provider->updateSync($view->param(), $body, $response, $headers)) !== null) {
+					\Aimeos\Controller\Frontend\Factory::createController($context, 'order')->update($orderItem); // stock, coupons
 				}
 
 				$view->updateMessage = $response;
 			}
-			catch( \Aimeos\MShop\Service\Exception $e )
+			catch (\Aimeos\MShop\Service\Exception $e)
 			{
 				$view->updateMessage = $e->getMessage();
 			}
 
-			if( !empty( $headers ) ) {
+			if (!empty($headers)) {
 				$view->updateHttpHeaders = $headers;
 			}
 
 			parent::process();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			/** client/html/checkout/standard/update/http-error
 			 * HTTP header sent for failed attempts to update the order status
@@ -334,16 +334,16 @@ 
 			 * @category Developer
 			 * @see client/html/checkout/standard/update/http-success
 			 */
-			$default = array( 'HTTP/1.1 500 Error updating order status' );
-			$headerList = $context->getConfig()->get( 'client/html/checkout/standard/update/http-error', $default );
+			$default = array('HTTP/1.1 500 Error updating order status');
+			$headerList = $context->getConfig()->get('client/html/checkout/standard/update/http-error', $default);
 
 			$view->updateHttpHeaders = $headerList;
 			$view->updateMessage = $e->getMessage();
 
 			$body = $view->request()->getBody();
-			$params = print_r( $view->param(), true );
+			$params = print_r($view->param(), true);
 			$msg = "Updating order status failed: %1\$s\n%2\$s\n%3\$s";
-			$context->getLogger()->log( sprintf( $msg, $e->getMessage(), $params, $body ) );
+			$context->getLogger()->log(sprintf($msg, $e->getMessage(), $params, $body));
 		}
 	}
 
@@ -355,22 +355,22 @@ 
 	 * @throws \Aimeos\Client\Html\Exception If no 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();
-		$search->setConditions( $search->compare( '==', 'service.code', $code ) );
+		$search->setConditions($search->compare('==', 'service.code', $code));
 
-		$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);
 	}
 
 
@@ -381,7 +381,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -393,14 +393,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);
 	}
 
 
@@ -412,13 +412,13 @@ 
 	 * @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);
 	}
 }

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

client/html/src/Client/Html/Account/Favorite/Standard.php

Spacing +80 added lines, -80 removed lines

@@ -68,42 +68,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->favoriteBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->favoriteErrorList = $view->get('favoriteErrorList', 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->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->favoriteErrorList = $view->get('favoriteErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->favoriteErrorList = $view->get('favoriteErrorList', 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->favoriteErrorList = $view->get( 'favoriteErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->favoriteErrorList = $view->get('favoriteErrorList', array()) + $error;
 		}
 
 		/** client/html/account/favorite/standard/template-body
@@ -129,7 +129,7 @@ 
 		$tplconf = 'client/html/account/favorite/standard/template-body';
 		$default = 'account/favorite/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -141,15 +141,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->favoriteHeader = $html;
 
@@ -177,11 +177,11 @@ 
 			$tplconf = 'client/html/account/favorite/standard/template-header';
 			$default = 'account/favorite/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());
 		}
 	}
 
@@ -193,7 +193,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/account/favorite/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account favorite html client
@@ -268,7 +268,7 @@ 
 		 * @see client/html/account/favorite/decorators/excludes
 		 * @see client/html/account/favorite/decorators/global
 		 */
-		return $this->createSubClient( 'account/favorite/' . $type, $name );
+		return $this->createSubClient('account/favorite/'.$type, $name);
 	}
 
 
@@ -281,48 +281,48 @@ 
 	{
 		$view = $this->getView();
 		$context = $this->getContext();
-		$ids = $view->param( 'fav_id', array() );
+		$ids = $view->param('fav_id', array());
 
 
-		if( $context->getUserId() != null && !empty( $ids ) )
+		if ($context->getUserId() != null && !empty($ids))
 		{
-			$typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'favorite' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+			$typeItem = $this->getTypeItem('customer/lists/type', 'product', 'favorite');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 			$search = $manager->createSearch();
 			$expr = array(
-				$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-				$search->compare( '==', 'customer.lists.refid', $ids ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
-				$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
+				$search->compare('==', 'customer.lists.parentid', $context->getUserId()),
+				$search->compare('==', 'customer.lists.refid', $ids),
+				$search->compare('==', 'customer.lists.domain', 'product'),
+				$search->compare('==', 'customer.lists.typeid', $typeItem->getId()),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 
 			$items = array();
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$items[$item->getRefId()] = $item;
 			}
 
 
-			switch( $view->param( 'fav_action' ) )
+			switch ($view->param('fav_action'))
 			{
 				case 'add':
 
 					$item = $manager->createItem();
-					$item->setParentId( $context->getUserId() );
-					$item->setTypeId( $typeItem->getId() );
-					$item->setDomain( 'product' );
-					$item->setStatus( 1 );
+					$item->setParentId($context->getUserId());
+					$item->setTypeId($typeItem->getId());
+					$item->setDomain('product');
+					$item->setStatus(1);
 
-					foreach( (array) $view->param( 'fav_id', array() ) as $id )
+					foreach ((array) $view->param('fav_id', array()) as $id)
 					{
-						if( !isset( $items[$id] ) )
+						if (!isset($items[$id]))
 						{
-							$item->setId( null );
-							$item->setRefId( $id );
+							$item->setId(null);
+							$item->setRefId($id);
 
-							$manager->saveItem( $item );
-							$manager->moveItem( $item->getId() );
+							$manager->saveItem($item);
+							$manager->moveItem($item->getId());
 						}
 					}
 
@@ -332,14 +332,14 @@ 
 
 					$listIds = array();
 
-					foreach( (array) $view->param( 'fav_id', array() ) as $id )
+					foreach ((array) $view->param('fav_id', array()) as $id)
 					{
-						if( isset( $items[$id] ) ) {
+						if (isset($items[$id])) {
 							$listIds[] = $items[$id]->getId();
 						}
 					}
 
-					$manager->deleteItems( $listIds );
+					$manager->deleteItems($listIds);
 					break;
 			}
 		}
@@ -355,7 +355,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -365,10 +365,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Page number starting from 1
 	 */
-	protected function getProductListPage( \Aimeos\MW\View\Iface $view )
+	protected function getProductListPage(\Aimeos\MW\View\Iface $view)
 	{
-		$page = (int) $view->param( 'fav_page', 1 );
-		return ( $page < 1 ? 1 : $page );
+		$page = (int) $view->param('fav_page', 1);
+		return ($page < 1 ? 1 : $page);
 	}
 
 
@@ -378,7 +378,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Page size
 	 */
-	protected function getProductListSize( \Aimeos\MW\View\Iface $view )
+	protected function getProductListSize(\Aimeos\MW\View\Iface $view)
 	{
 		/** client/html/account/favorite/size
 		 * The number of products shown in a list page for favorite products
@@ -399,10 +399,10 @@ 
 		 * @category Developer
 		 * @see client/html/catalog/lists/size
 		 */
-		$defaultSize = $this->getContext()->getConfig()->get( 'client/html/account/favorite/size', 48 );
+		$defaultSize = $this->getContext()->getConfig()->get('client/html/account/favorite/size', 48);
 
-		$size = (int) $view->param( 'fav-size', $defaultSize );
-		return ( $size < 1 || $size > 100 ? $defaultSize : $size );
+		$size = (int) $view->param('fav-size', $defaultSize);
+		return ($size < 1 || $size > 100 ? $defaultSize : $size);
 	}
 
 
@@ -414,33 +414,33 @@ 
 	 * @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))
 		{
 			$total = 0;
 			$productIds = array();
 			$context = $this->getContext();
-			$typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'favorite' );
+			$typeItem = $this->getTypeItem('customer/lists/type', 'product', 'favorite');
 
-			$size = $this->getProductListSize( $view );
-			$current = $this->getProductListPage( $view );
-			$last = ( $total != 0 ? ceil( $total / $size ) : 1 );
+			$size = $this->getProductListSize($view);
+			$current = $this->getProductListPage($view);
+			$last = ($total != 0 ? ceil($total / $size) : 1);
 
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 			$search = $manager->createSearch();
 			$expr = array(
-				$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-				$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
+				$search->compare('==', 'customer.lists.parentid', $context->getUserId()),
+				$search->compare('==', 'customer.lists.typeid', $typeItem->getId()),
+				$search->compare('==', 'customer.lists.domain', 'product'),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSortations( array( $search->sort( '-', 'customer.lists.position' ) ) );
-			$search->setSlice( ( $current - 1 ) * $size, $size );
+			$search->setConditions($search->combine('&&', $expr));
+			$search->setSortations(array($search->sort('-', 'customer.lists.position')));
+			$search->setSlice(($current - 1) * $size, $size);
 
-			$view->favoriteListItems = $manager->searchItems( $search, array(), $total );
+			$view->favoriteListItems = $manager->searchItems($search, array(), $total);
 
 
 			/** client/html/account/favorite/domains
@@ -459,19 +459,19 @@ 
 			 * @category Developer
 			 * @see client/html/catalog/domains
 			 */
-			$default = array( 'text', 'price', 'media' );
-			$domains = $context->getConfig()->get( 'client/html/account/favorite/domains', $default );
+			$default = array('text', 'price', 'media');
+			$domains = $context->getConfig()->get('client/html/account/favorite/domains', $default);
 
-			foreach( $view->favoriteListItems as $listItem ) {
+			foreach ($view->favoriteListItems as $listItem) {
 				$productIds[] = $listItem->getRefId();
 			}
 
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-			$view->favoriteProductItems = $controller->getProductItems( $productIds, $domains );
+			$view->favoriteProductItems = $controller->getProductItems($productIds, $domains);
 			$view->favoritePageFirst = 1;
-			$view->favoritePagePrev = ( $current > 1 ? $current - 1 : 1 );
-			$view->favoritePageNext = ( $current < $last ? $current + 1 : $last );
+			$view->favoritePagePrev = ($current > 1 ? $current - 1 : 1);
+			$view->favoritePageNext = ($current < $last ? $current + 1 : $last);
 			$view->favoritePageLast = $last;
 			$view->favoritePageCurr = $current;
 

client/html/src/Client/Html/Account/History/Lists/Standard.php

Spacing +23 added lines, -23 removed lines

@@ -68,19 +68,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->param( 'his_action', 'list' ) != 'list' ) {
+		if ($view->param('his_action', 'list') != 'list') {
 			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->listsBody = $html;
 
@@ -107,7 +107,7 @@ 
 		$tplconf = 'client/html/account/history/lists/standard/template-body';
 		$default = 'account/history/list-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -119,19 +119,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->param( 'his_action', 'list' ) != 'list' ) {
+		if ($view->param('his_action', 'list') != 'list') {
 			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->listsHeader = $html;
 
@@ -159,7 +159,7 @@ 
 		$tplconf = 'client/html/account/history/lists/standard/template-header';
 		$default = 'account/history/list-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -170,7 +170,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/account/history/lists/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history list html client
@@ -246,7 +246,7 @@ 
 		 * @see client/html/account/history/lists/decorators/global
 		 */
 
-		return $this->createSubClient( 'account/history/lists/' . $type, $name );
+		return $this->createSubClient('account/history/lists/'.$type, $name);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -269,24 +269,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();
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 
-			$search = $manager->createSearch( true );
+			$search = $manager->createSearch(true);
 			$expr = array(
 				$search->getConditions(),
-				$search->compare( '==', 'order.base.customerid', $context->getUserId() ),
+				$search->compare('==', 'order.base.customerid', $context->getUserId()),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSortations( array( $search->sort( '-', 'order.id' ) ) );
+			$search->setConditions($search->combine('&&', $expr));
+			$search->setSortations(array($search->sort('-', 'order.id')));
 
 
-			$view->listsOrderItems = $manager->searchItems( $search );
+			$view->listsOrderItems = $manager->searchItems($search);
 
 			$this->cache = $view;
 		}

client/html/src/Client/Html/Account/History/Order/Service/Standard.php

Spacing +13 added lines, -13 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->serviceBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/account/history/order/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));
 	}
 
 
@@ -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->serviceHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/account/history/order/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));
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/history/order/service/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history order service html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/account/history/order/service/decorators/excludes
 		 * @see client/html/account/history/order/service/decorators/global
 		 */
-		return $this->createSubClient( 'account/history/order/service/' . $type, $name );
+		return $this->createSubClient('account/history/order/service/'.$type, $name);
 	}
 
 
@@ -244,6 +244,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

client/html/src/Client/Html/Account/History/Order/Coupon/Standard.php

Spacing +13 added lines, -13 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->couponBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/account/history/order/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));
 	}
 
 
@@ -112,13 +112,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->couponHeader = $html;
 
@@ -147,7 +147,7 @@ 
 		$tplconf = 'client/html/account/history/order/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));
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/history/order/coupon/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history order coupon html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/account/history/order/coupon/decorators/excludes
 		 * @see client/html/account/history/order/coupon/decorators/global
 		 */
-		return $this->createSubClient( 'account/history/order/coupon/' . $type, $name );
+		return $this->createSubClient('account/history/order/coupon/'.$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