aimeos / ai-client-html

client/html/src/Client/Html/Catalog/Stage/Standard.php

Doc Comments +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
 	 * @param array &$tags Result array for the list of tags that are associated to the output
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string|null String including HTML tags for the header on error
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{
@@ -393,7 +393,7 @@ 
 	 * Returns the parameters used by the html client.
 	 *
 	 * @param array $params Associative list of all parameters
-	 * @param array $prefixes List of prefixes the parameters must start with
+	 * @param string[] $prefixes List of prefixes the parameters must start with
 	 * @return array Associative list of parameters used by the html client
 	 */
 	protected function getClientParams( array $params, array $prefixes = array( 'f', 'l', 'd', 'a' ) )

Braces +11 added lines, -22 removed lines

@@ -211,23 +211,19 @@ 
 					$output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 				}
 				$view->detailBody = $output;
-			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			} catch( \Aimeos\Client\Html\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 				$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			} catch( \Aimeos\Controller\Frontend\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 				$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-			}
-			catch( \Aimeos\MShop\Exception $e )
+			} catch( \Aimeos\MShop\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 				$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -261,8 +257,7 @@ 
 			$html = $view->render( $view->config( $tplconf, $default ) );
 
 			$this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyBody( $html, $uid );
 		}
@@ -299,8 +294,7 @@ 
 					$output .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
 				}
 				$view->detailHeader = $output;
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			}
@@ -332,8 +326,7 @@ 
 			$html = $view->render( $view->config( $tplconf, $default ) );
 
 			$this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyHeader( $html, $uid );
 		}
@@ -446,23 +439,19 @@ 
 			$context->getSession()->set( 'aimeos/catalog/detail/params/last' . $site, $params );
 
 			parent::process();
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 

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

Doc Comments -1 removed lines

@@ -27,7 +27,6 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 * @param array $templatePaths Associative list of the file system paths to the core or the extensions as key
 	 * 	and a list of relative paths inside the core or the extension as values
-	 * @param \Aimeos\Client\Html\Iface $client Client object
 	 */
 	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths )
 	{

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

Doc Comments +1 added lines, -1 removed lines

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

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

Braces +2 added lines, -4 removed lines

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

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

Braces +11 added lines, -22 removed lines

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

Doc Comments +1 added lines, -1 removed lines

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

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

Braces +7 added lines, -14 removed lines

@@ -121,23 +121,19 @@ 
 					$output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 				}
 				$view->miniBody = $output;
-			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			} catch( \Aimeos\Client\Html\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
-			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			} catch( \Aimeos\Controller\Frontend\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
-			}
-			catch( \Aimeos\MShop\Exception $e )
+			} catch( \Aimeos\MShop\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 				$view->miniErrorList = $view->get( 'miniErrorList', array() ) + $error;
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -170,8 +166,7 @@ 
 
 			$html = $view->render( $view->config( $tplconf, $default ) );
 			$this->setBasketCached( $key, $html );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyBody( $html, $uid );
 		}
@@ -235,13 +230,11 @@ 
 
 				$html = $view->render( $view->config( $tplconf, $default ) );
 				$this->setBasketCached( $key, $html );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			}
-		}
-		else
+		} else
 		{
 			$html = $this->modifyHeader( $html, $uid );
 		}

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

Braces +11 added lines, -22 removed lines

@@ -211,23 +211,19 @@ 
 					$output .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 				}
 				$view->detailBody = $output;
-			}
-			catch( \Aimeos\Client\Html\Exception $e )
+			} catch( \Aimeos\Client\Html\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 				$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-			}
-			catch( \Aimeos\Controller\Frontend\Exception $e )
+			} catch( \Aimeos\Controller\Frontend\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 				$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-			}
-			catch( \Aimeos\MShop\Exception $e )
+			} catch( \Aimeos\MShop\Exception $e )
 			{
 				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 				$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -261,8 +257,7 @@ 
 			$html = $view->render( $view->config( $tplconf, $default ) );
 
 			$this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyBody( $html, $uid );
 		}
@@ -299,8 +294,7 @@ 
 					$output .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
 				}
 				$view->detailHeader = $output;
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			}
@@ -332,8 +326,7 @@ 
 			$html = $view->render( $view->config( $tplconf, $default ) );
 
 			$this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire );
-		}
-		else
+		} else
 		{
 			$html = $this->modifyHeader( $html, $uid );
 		}
@@ -446,23 +439,19 @@ 
 			$context->getSession()->set( 'aimeos/catalog/detail/params/last' . $site, $params );
 
 			parent::process();
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->detailErrorList = $view->get( 'detailErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 

Doc Comments +1 added lines, -1 removed lines

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

client/html/src/Client/Html/Catalog/Base.php

Braces +2 added lines, -4 removed lines

@@ -86,13 +86,11 @@
 			}
 
 			return $filter;
-		}
-		elseif( $catid !== '' && $catfilter === true )
+		} elseif( $catid !== '' && $catfilter === true )
 		{
 			$catIds = $this->getCatalogIds( $catid );
 			return $controller->createIndexFilterCategory( $catIds, $sort, $sortdir, ( $page - 1 ) * $size, $size );
-		}
-		else
+		} else
 		{
 			return $controller->createIndexFilter( $sort, $sortdir, ( $page - 1 ) * $size, $size );
 		}

client/html/src/Client/Html/Catalog/Suggest/Standard.php

Braces +3 added lines, -6 removed lines

@@ -83,8 +83,7 @@ 
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 			}
 			$view->suggestBody = $html;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			return;
@@ -139,8 +138,7 @@ 
 				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
 			}
 			$view->suggestHeader = $html;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			return;
@@ -274,8 +272,7 @@ 
 		try
 		{
 			parent::process();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 		}