aimeos / ai-controller-frontend

controller/frontend/src/Controller/Frontend/Product/Standard.php

Spacing +71 added lines, -71 removed lines

@@ -31,42 +31,42 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
 	{
-		if( !empty( $attrIds ) )
+		if (!empty($attrIds))
 		{
-			$attrIds = $this->validateIds( $attrIds );
+			$attrIds = $this->validateIds($attrIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
 			$expr = array(
-				$filter->compare( '==', $func, count( $attrIds ) ),
+				$filter->compare('==', $func, count($attrIds)),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		if( !empty( $optIds ) )
+		if (!empty($optIds))
 		{
-			$optIds = $this->validateIds( $optIds );
+			$optIds = $this->validateIds($optIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
 			$expr = array(
-				$filter->compare( '>', $func, 0 ),
+				$filter->compare('>', $func, 0),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		foreach( $oneIds as $type => $list )
+		foreach ($oneIds as $type => $list)
 		{
-			if( ( $list = $this->validateIds( (array) $list ) ) !== [] )
+			if (($list = $this->validateIds((array) $list)) !== [])
 			{
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
 				$expr = array(
-					$filter->compare( '>', $func, 0 ),
+					$filter->compare('>', $func, 0),
 					$filter->getConditions(),
 				);
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
+				$filter->setConditions($filter->combine('&&', $expr));
 			}
 		}
 
@@ -86,38 +86,38 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
 	{
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
 
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 		{
 			$list = [];
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
 
-			foreach( $catIds as $catId )
+			foreach ($catIds as $catId)
 			{
-				$tree = $cntl->getCatalogTree( $catId, [], $level );
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+				$tree = $cntl->getCatalogTree($catId, [], $level);
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
 			}
 
 			$catIds = $list;
 		}
 
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
 		$expr[] = $filter->getConditions();
 
-		if( $sort === 'relevance' )
+		if ($sort === 'relevance')
 		{
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
 
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
 		}
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
 		return $filter;
 	}
@@ -134,13 +134,13 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
 	{
 		$langid = $this->getContext()->getLocale()->getLanguageId();
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
 
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
+		return $filter->setConditions($filter->combine('&&', $expr));
 	}
 
 
@@ -152,9 +152,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2017.03
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
 	}
 
 
@@ -169,46 +169,46 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
 		$sortations = [];
 		$context = $this->getContext();
 
-		$search = \Aimeos\MShop\Factory::createManager( $context, 'index' )->createSearch( true );
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
+		$search = \Aimeos\MShop\Factory::createManager($context, 'index')->createSearch(true);
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'code':
-				$sortations[] = $search->sort( $direction, 'product.code' );
+				$sortations[] = $search->sort($direction, 'product.code');
 				break;
 
 			case 'name':
 				$langid = $context->getLocale()->getLanguageId();
 
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
+				$expr[] = $search->compare('>=', $cmpfunc, '');
 
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $context->getLocale()->getCurrencyId();
 
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
 
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 		}
 
 		$expr[] = $search->getConditions();
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( $sortations );
-		$search->setSlice( $start, $size );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations($sortations);
+		$search->setSlice($start, $size);
 
 		return $search;
 	}
@@ -222,9 +222,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' )->getItem( $productId, $domains, true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($productId, $domains, true);
 	}
 
 
@@ -236,19 +236,19 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
 	 * @since 2017.03
 	 */
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'product.id', $productIds ),
+			$search->compare('==', 'product.id', $productIds),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, count( $productIds ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, count($productIds));
 
-		return $manager->searchItems( $search, $domains );
+		return $manager->searchItems($search, $domains);
 	}
 
 
@@ -261,9 +261,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
 	}
 
 
@@ -273,12 +273,12 @@ 
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
 	 * @return array List of catalog IDs
 	 */
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
 	{
-		$list = array( $item->getId() );
+		$list = array($item->getId());
 
-		foreach( $item->getChildren() as $child ) {
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
+		foreach ($item->getChildren() as $child) {
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
 		}
 
 		return $list;
@@ -291,13 +291,13 @@ 
 	 * @param array $ids List of IDs to validate
 	 * @return array List of validated IDs
 	 */
-	protected function validateIds( array $ids )
+	protected function validateIds(array $ids)
 	{
 		$list = [];
 
-		foreach( $ids as $id )
+		foreach ($ids as $id)
 		{
-			if( $id != '' ) {
+			if ($id != '') {
 				$list[] = (int) $id;
 			}
 		}

controller/frontend/src/Controller/Frontend/Exception.php

Spacing +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
 	 * @param \Exception $previous The previous exception used for the exception chaining.
 	 * @param array $list The associative list of errors and their messages when several errors occured
 	 */
-	public function __construct( $msg = '', $code = 0, \Exception $previous = null, array $list = [] )
+	public function __construct($msg = '', $code = 0, \Exception $previous = null, array $list = [])
 	{
-		parent::__construct( $msg, $code, $previous );
+		parent::__construct($msg, $code, $previous);
 
 		$this->list = $list;
 	}

controller/frontend/src/Controller/Frontend/Common/Factory/Base.php

Spacing +35 added lines, -35 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Controller\Frontend\Iface|null $controller Frontend controller object
 	 */
-	public static function injectController( $classname, \Aimeos\Controller\Frontend\Iface $controller = null )
+	public static function injectController($classname, \Aimeos\Controller\Frontend\Iface $controller = null)
 	{
 		self::$objects[$classname] = $controller;
 	}
@@ -46,29 +46,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Controller\Frontend\Basket\Decorator\"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix )
+	protected static function addDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 			}
 
-			$controller = new $classname( $controller, $context );
+			$controller = new $classname($controller, $context);
 
-			if( !( $controller instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($controller instanceof $iface)) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -84,14 +84,14 @@ 
 	 * @param string $domain Domain name in lower case, e.g. "product"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addControllerDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, $domain )
+	protected static function addControllerDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, $domain)
 	{
-		if( !is_string( $domain ) || $domain === '' ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid domain "%1$s"', $domain ) );
+		if (!is_string($domain) || $domain === '') {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid domain "%1$s"', $domain));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $domain ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $domain)));
 		$config = $context->getConfig();
 
 		/** controller/frontend/common/decorators/default
@@ -116,26 +116,26 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'controller/frontend/common/decorators/default', [] );
-		$excludes = $config->get( 'controller/frontend/' . $domain . '/decorators/excludes', [] );
+		$decorators = $config->get('controller/frontend/common/decorators/default', []);
+		$excludes = $config->get('controller/frontend/' . $domain . '/decorators/excludes', []);
 
-		foreach( $decorators as $key => $name )
+		foreach ($decorators as $key => $name)
 		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
+			if (in_array($name, $excludes)) {
+				unset($decorators[$key]);
 			}
 		}
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/global', [] );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/global', []);
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
-		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $localClass ) . '\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/local', [] );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($localClass) . '\\Decorator\\';
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/local', []);
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		return $controller;
 	}
@@ -149,20 +149,20 @@ 
 	 * @param string $interface Name of the controller interface
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function createControllerBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface )
+	protected static function createControllerBase(\Aimeos\MShop\Context\Item\Iface $context, $classname, $interface)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$controller = new $classname( $context );
+		$controller = new $classname($context);
 
-		if( !( $controller instanceof $interface ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (!($controller instanceof $interface)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
 		return $controller;

controller/frontend/src/Controller/Frontend/Locale/Iface.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = [] );
+	public function getItem($id, array $domains = []);
 
 
 	/**
@@ -48,5 +48,5 @@ 
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null );
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null);
 }

controller/frontend/src/Controller/Frontend/Locale/Decorator/Base.php

Spacing +11 added lines, -11 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 */
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$iface = '\Aimeos\Controller\Frontend\Locale\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -53,9 +53,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->controller, $name ), $param );
+		return @call_user_func_array(array($this->controller, $name), $param);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = [] )
+	public function getItem($id, array $domains = [])
 	{
-		return $this->controller->getItem( $id, $domains );
+		return $this->controller->getItem($id, $domains);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null)
 	{
-		return $this->controller->searchItems( $filter, $domains, $total );
+		return $this->controller->searchItems($filter, $domains, $total);
 	}
 
 

controller/frontend/src/Controller/Frontend/Locale/Standard.php

Spacing +8 added lines, -8 removed lines

@@ -31,15 +31,15 @@ 
 	public function createFilter()
 	{
 		$context = $this->getContext();
-		$filter = \Aimeos\MShop\Factory::createManager( $context, 'locale' )->createSearch( true );
+		$filter = \Aimeos\MShop\Factory::createManager($context, 'locale')->createSearch(true);
 
 		$expr = array(
-			$filter->compare( '==', 'locale.siteid', $context->getLocale()->getSitePath() ),
+			$filter->compare('==', 'locale.siteid', $context->getLocale()->getSitePath()),
 			$filter->getConditions(),
 		);
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
-		$filter->setSortations( array( $filter->sort( '+', 'locale.position' ) ) );
+		$filter->setConditions($filter->combine('&&', $expr));
+		$filter->setSortations(array($filter->sort('+', 'locale.position')));
 
 		return $filter;
 	}
@@ -53,9 +53,9 @@ 
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = [] )
+	public function getItem($id, array $domains = [])
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale' )->getItem( $id, $domains, true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale')->getItem($id, $domains, true);
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale')->searchItems($filter, $domains, $total);
 	}
 }

controller/frontend/src/Controller/Frontend/Factory.php

Spacing +19 added lines, -19 removed lines

@@ -30,11 +30,11 @@ 
 	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
 	 * @param string $path Path describing the controller to clear, e.g. "basket"
 	 */
-	static public function clear( $id = null, $path = null )
+	static public function clear($id = null, $path = null)
 	{
-		if( $id !== null )
+		if ($id !== null)
 		{
-			if( $path !== null ) {
+			if ($path !== null) {
 				self::$controllers[$id][$path] = null;
 			} else {
 				self::$controllers[$id] = [];
@@ -62,37 +62,37 @@ 
 	 * @return \Aimeos\Controller\Frontend\Iface New frontend controller
 	 * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found
 	 */
-	static public function createController( \Aimeos\MShop\Context\Item\Iface $context, $path )
+	static public function createController(\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		if( empty( $path ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
+		if (empty($path)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty'));
 		}
 
 		$id = (string) $context;
 
-		if( self::$cache === false || !isset( self::$controllers[$id][$path] ) )
+		if (self::$cache === false || !isset(self::$controllers[$id][$path]))
 		{
-			$parts = explode( '/', $path );
+			$parts = explode('/', $path);
 
-			foreach( $parts as $key => $part )
+			foreach ($parts as $key => $part)
 			{
-				if( ctype_alnum( $part ) === false ) {
-					throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s" in "%2$s"', $part, $path ) );
+				if (ctype_alnum($part) === false) {
+					throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s" in "%2$s"', $part, $path));
 				}
 
-				$parts[$key] = ucwords( $part );
+				$parts[$key] = ucwords($part);
 			}
 
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . join( '\\', $parts ) . '\\Factory';
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . join('\\', $parts) . '\\Factory';
 
-			if( class_exists( $factory ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+			if (class_exists($factory) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory));
 			}
 
-			$manager = call_user_func_array( array( $factory, 'createController' ), array( $context ) );
+			$manager = call_user_func_array(array($factory, 'createController'), array($context));
 
-			if( $manager === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+			if ($manager === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory));
 			}
 
 			self::$controllers[$id][$path] = $manager;
@@ -108,7 +108,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function setCache( $value )
+	static public function setCache($value)
 	{
 		$old = self::$cache;
 		self::$cache = (boolean) $value;

controller/frontend/src/Controller/Frontend/Customer/Standard.php

Spacing +57 added lines, -57 removed lines

@@ -28,13 +28,13 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values )
+	public function addItem(array $values)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$manager->saveItem( $item );
+		$item->fromArray($values);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -45,13 +45,13 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setStatus( 1 );
+		$item->fromArray($values);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -63,12 +63,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @since 2017.04
 	 */
-	public function deleteItem( $id )
+	public function deleteItem($id)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -80,15 +80,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function editItem( $id, array $values )
+	public function editItem($id, array $values)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		$item = $manager->getItem( $id, [], true );
-		$item->fromArray( $values );
-		$manager->saveItem( $item );
+		$item = $manager->getItem($id, [], true);
+		$item->fromArray($values);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -102,17 +102,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function getItem( $id = null, array $domains = [] )
+	public function getItem($id = null, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		if( $id == null ) {
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
+		if ($id == null) {
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
 		}
 
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		return $manager->getItem( $id, $domains, true );
+		return $manager->getItem($id, $domains, true);
 	}
 
 
@@ -126,9 +126,9 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function findItem( $code, array $domains = [] )
+	public function findItem($code, array $domains = [])
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
 	}
 
 
@@ -137,9 +137,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
 	{
-		\Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
+		\Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -150,15 +150,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function addAddressItem( array $values )
+	public function addAddressItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setParentId( $context->getUserId() );
-		$manager->saveItem( $item );
+		$item->fromArray($values);
+		$item->setParentId($context->getUserId());
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -169,14 +169,14 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function createAddressItem( array $values = [] )
+	public function createAddressItem(array $values = [])
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setParentId( $context->getUserId() );
+		$item->fromArray($values);
+		$item->setParentId($context->getUserId());
 
 		return $item;
 	}
@@ -188,13 +188,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -206,15 +206,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function editAddressItem( $id, array $values )
+	public function editAddressItem($id, array $values)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		$item->fromArray( $values );
-		$manager->saveItem( $item );
+		$item->fromArray($values);
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -227,12 +227,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function getAddressItem( $id )
+	public function getAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
-		$item = $manager->getItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
+		$item = $manager->getItem($id);
 
-		$this->checkUser( $item->getParentId() );
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -243,9 +243,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
 	{
-		\Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
+		\Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -255,12 +255,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
 	 */
-	protected function checkUser( $id )
+	protected function checkUser($id)
 	{
-		if( $id != $this->getContext()->getUserId() )
+		if ($id != $this->getContext()->getUserId())
 		{
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
 		}
 	}
 }

controller/frontend/src/Controller/Frontend/Attribute/Standard.php

Spacing +20 added lines, -20 removed lines

@@ -29,15 +29,15 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterTypes( \Aimeos\MW\Criteria\Iface $filter, array $codes )
+	public function addFilterTypes(\Aimeos\MW\Criteria\Iface $filter, array $codes)
 	{
-		if( !empty( $codes ) )
+		if (!empty($codes))
 		{
 			$expr = [
-				$filter->compare( '==', 'attribute.type.code', $codes ),
+				$filter->compare('==', 'attribute.type.code', $codes),
 				$filter->getConditions(),
 			];
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
 		return $filter;
@@ -53,15 +53,15 @@ 
 	 */
 	public function createFilter()
 	{
-		$filter = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' )->createSearch( true );
+		$filter = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute')->createSearch(true);
 
 		$expr = array(
-			$filter->compare( '==', 'attribute.domain', 'product' ),
+			$filter->compare('==', 'attribute.domain', 'product'),
 			$filter->getConditions(),
 		);
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
-		$filter->setSortations( array( $filter->sort( '+', 'attribute.position' ) ) );
+		$filter->setConditions($filter->combine('&&', $expr));
+		$filter->setSortations(array($filter->sort('+', 'attribute.position')));
 
 		return $filter;
 	}
@@ -75,9 +75,9 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItem($id, array $domains = array('media', 'price', 'text'))
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' )->getItem( $id, $domains, true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute')->getItem($id, $domains, true);
 	}
 
 
@@ -89,20 +89,20 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItems(array $ids, array $domains = array('media', 'price', 'text'))
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
-		$filter = $manager->createSearch( true );
+		$filter = $manager->createSearch(true);
 		$expr = [
-			$filter->compare( '==', 'attribute.domain', 'product' ),
-			$filter->compare( '==', 'attribute.id', $ids ),
+			$filter->compare('==', 'attribute.domain', 'product'),
+			$filter->compare('==', 'attribute.id', $ids),
 			$filter->getConditions(),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
-		$filter->setSortations( array( $filter->sort( '+', 'attribute.position' ) ) );
+		$filter->setConditions($filter->combine('&&', $expr));
+		$filter->setSortations(array($filter->sort('+', 'attribute.position')));
 
-		return $manager->searchItems( $filter, $domains );
+		return $manager->searchItems($filter, $domains);
 	}
 
 
@@ -115,8 +115,8 @@ 
 	 * @return array Ordered list of attribute items implementing \Aimeos\MShop\Attribute\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute')->searchItems($filter, $domains, $total);
 	}
 }