aimeos / ai-controller-frontend

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/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);
 	}
 }

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

Spacing +18 added lines, -18 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values );
+	public function addItem(array $values);
 
 
 	/**
@@ -35,7 +35,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function createItem( array $values = [] );
+	public function createItem(array $values = []);
 
 
 	/**
@@ -44,7 +44,7 @@ 
 	 * @param string $id Unique customer ID
 	 * @since 2017.04
 	 */
-	public function deleteItem( $id );
+	public function deleteItem($id);
 
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function editItem( $id, array $values );
+	public function editItem($id, array $values);
 
 
 	/**
@@ -66,7 +66,7 @@ 
 	 * @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 = []);
 
 
 	/**
@@ -79,7 +79,7 @@ 
 	 * @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 = []);
 
 
 	/**
@@ -89,7 +89,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 * @since 2017.04
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item );
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item);
 
 
 	/**
@@ -99,7 +99,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function addAddressItem( array $values );
+	public function addAddressItem(array $values);
 
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function createAddressItem( array $values = [] );
+	public function createAddressItem(array $values = []);
 
 
 	/**
@@ -117,7 +117,7 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id );
+	public function deleteAddressItem($id);
 
 
 	/**
@@ -128,7 +128,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function editAddressItem( $id, array $values );
+	public function editAddressItem($id, array $values);
 
 
 	/**
@@ -138,7 +138,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function getAddressItem( $id );
+	public function getAddressItem($id);
 
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 * @since 2017.04
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item );
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item);
 
 	/**
 	 * Creates and returns a new list item object
@@ -157,7 +157,7 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function addListItem( array $values );
+	public function addListItem(array $values);
 
 	/**
 	 * Returns a new customer lists filter criteria object
@@ -173,7 +173,7 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.06
 	 */
-	public function deleteListItem( $id );
+	public function deleteListItem($id);
 
 	/**
 	 * Saves a modified customer lists item object
@@ -183,7 +183,7 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function editListItem( $id, array $values );
+	public function editListItem($id, array $values);
 
 	/**
 	 * Returns the customer item for the given customer ID
@@ -192,7 +192,7 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.06
 	 */
-	public function getListItem( $id );
+	public function getListItem($id);
 
 	/**
 	 * Returns the customer lists items filtered by the given criteria
@@ -202,5 +202,5 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
 	 * @since 2017.06
 	 */
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
 }

controller/frontend/tests/TestHelperFrontend.php

Spacing +27 added lines, -27 removed lines

@@ -15,15 +15,15 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
-		\Aimeos\Controller\Frontend\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
+		\Aimeos\Controller\Frontend\Factory::setCache(false);
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -32,13 +32,13 @@ 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(dirname(dirname(__FILE__)))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
@@ -48,7 +48,7 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
@@ -58,38 +58,38 @@ 
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf );
-		$ctx->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($conf);
+		$ctx->setMessageQueueManager($mq);
 
 
-		$logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, '', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, '', '', false);
+		$ctx->setLocale($locale);
 
 
-		$ctx->setEditor( 'core:controller/frontend' );
+		$ctx->setEditor('core:controller/frontend');
 
 		return $ctx;
 	}

controller/frontend/tests/Controller/Frontend/Customer/StandardTest.php

Spacing +70 added lines, -70 removed lines

@@ -18,121 +18,121 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object );
+		unset($this->context, $this->object);
 	}
 
 
 	public function testAddEditSaveDeleteItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$id = $manager->findItem( 'UTC001' )->getId();
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$id = $manager->findItem('UTC001')->getId();
 
-		$this->context->setUserId( $id );
-		$item = $this->object->addItem( ['customer.code' => 'unittest-ctnl', 'customer.status' => 1] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$this->context->setUserId($id);
+		$item = $this->object->addItem(['customer.code' => 'unittest-ctnl', 'customer.status' => 1]);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 
-		$this->context->setUserId( $item->getId() );
-		$item = $this->object->editItem( $item->getId(), ['customer.code' => 'unittest-ctnl2'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$this->context->setUserId($item->getId());
+		$item = $this->object->editItem($item->getId(), ['customer.code' => 'unittest-ctnl2']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 
-		$item->setStatus( 0 );
-		$item = $this->object->saveItem( $item );
-		$this->assertEquals( 0, $item->getStatus() );
+		$item->setStatus(0);
+		$item = $this->object->saveItem($item);
+		$this->assertEquals(0, $item->getStatus());
 
-		$this->object->deleteItem( $item->getId() );
+		$this->object->deleteItem($item->getId());
 
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
-		$manager->findItem( 'unittest-ctnl' );
+		$this->setExpectedException('\Aimeos\MShop\Exception');
+		$manager->findItem('unittest-ctnl');
 	}
 
 
 	public function testAddExistingItem()
 	{
-		$item = $this->object->addItem( ['customer.code' => 'UTC001'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$item = $this->object->addItem(['customer.code' => 'UTC001']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 	}
 
 
 	public function testCreateItem()
 	{
 		$result = $this->object->createItem();
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
 	}
 
 
 	public function testGetItem()
 	{
-		$id = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' )->getId();
-		$this->context->setUserId( $id );
+		$id = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001')->getId();
+		$this->context->setUserId($id);
 
-		$result = $this->object->getItem( $id, ['customer/address', 'text'] );
+		$result = $this->object->getItem($id, ['customer/address', 'text']);
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
-		$this->assertEquals( 1, count( $result->getRefItems( 'text' ) ) );
-		$this->assertEquals( 1, count( $result->getAddressItems() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
+		$this->assertEquals(1, count($result->getRefItems('text')));
+		$this->assertEquals(1, count($result->getAddressItems()));
 	}
 
 
 	public function testFindItem()
 	{
-		$result = $this->object->findItem( 'UTC001' );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
+		$result = $this->object->findItem('UTC001');
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
 	}
 
 
 	public function testAddEditSaveDeleteAddressItem()
 	{
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
-		$item = $this->object->addAddressItem( ['customer.address.lastname' => 'unittest-ctnl'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
+		$item = $this->object->addAddressItem(['customer.address.lastname' => 'unittest-ctnl']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
 
-		$item = $this->object->editAddressItem( $item->getId(), ['customer.address.lastname' => 'unittest-ctnl2'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
+		$item = $this->object->editAddressItem($item->getId(), ['customer.address.lastname' => 'unittest-ctnl2']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
 
-		$item->setLastName( 'test' );
-		$this->object->saveAddressItem( $item );
-		$this->assertEquals( 'test', $item->getLastName() );
+		$item->setLastName('test');
+		$this->object->saveAddressItem($item);
+		$this->assertEquals('test', $item->getLastName());
 
-		$this->object->deleteAddressItem( $item->getId() );
+		$this->object->deleteAddressItem($item->getId());
 	}
 
 
 	public function testCreateAddressItem()
 	{
 		$result = $this->object->createAddressItem();
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
 	}
 
 
 	public function testGetAddressItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address');
 		$search = $manager->createSearch();
-		$search->setSlice( 0, 1 );
-		$result = $manager->searchItems( $search );
+		$search->setSlice(0, 1);
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No customer address available' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No customer address available');
 		}
 
-		$this->context->setUserId( $item->getParentId() );
-		$result = $this->object->getAddressItem( $item->getId() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
+		$this->context->setUserId($item->getParentId());
+		$result = $this->object->getAddressItem($item->getId());
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
 	}
 
 
 	public function testAddEditDeleteListItem()
 	{
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
 		$values = [
 			'customer.lists.type' => 'favorite',
@@ -140,8 +140,8 @@ 
 			'customer.lists.refid' => '-1'
 		];
 
-		$item = $this->object->addListItem( $values );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
+		$item = $this->object->addListItem($values);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
 
 		$values = [
 			'customer.lists.type' => 'favorite',
@@ -149,46 +149,46 @@ 
 			'customer.lists.refid' => '-2'
 		];
 
-		$item = $this->object->editListItem( $item->getId(), $values );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
+		$item = $this->object->editListItem($item->getId(), $values);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
 
-		$this->object->deleteListItem( $item->getId() );
+		$this->object->deleteListItem($item->getId());
 
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
-		$this->object->getListItem( $item->getId() );
+		$this->setExpectedException('\Aimeos\MShop\Exception');
+		$this->object->getListItem($item->getId());
 	}
 
 
 	public function testGetListItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/lists');
 		$search = $manager->createSearch();
-		$search->setSlice( 0, 1 );
-		$result = $manager->searchItems( $search );
+		$search->setSlice(0, 1);
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No customer lists item available' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No customer lists item available');
 		}
 
-		$this->context->setUserId( $item->getParentId() );
-		$result = $this->object->getListItem( $item->getId() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $result );
+		$this->context->setUserId($item->getParentId());
+		$result = $this->object->getListItem($item->getId());
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $result);
 	}
 
 
 	public function testSearchListItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$customer = $manager->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$customer = $manager->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
 		$filter = $this->object->createListsFilter();
-		$result = $this->object->searchListItems( $filter );
+		$result = $this->object->searchListItems($filter);
 
-		foreach( $result as $item )
+		foreach ($result as $item)
 		{
-			$this->assertEquals( $customer->getId(), $item->getParentId() );
-			$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
+			$this->assertEquals($customer->getId(), $item->getParentId());
+			$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
 		}
 	}
 }

controller/frontend/tests/Controller/Frontend/Product/StandardTest.php

Spacing +110 added lines, -110 removed lines

@@ -17,22 +17,22 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Product\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Product\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAggregate()
 	{
 		$filter = $this->object->createFilter();
-		$list = $this->object->aggregate( $filter, 'index.attribute.id' );
+		$list = $this->object->aggregate($filter, 'index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
@@ -40,113 +40,113 @@ 
 	{
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( [], $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals([], $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateFilterIgnoreDates()
 	{
-		$this->context->getConfig()->set( 'controller/frontend/product/ignore-dates', true );
+		$this->context->getConfig()->set('controller/frontend/product/ignore-dates', true);
 
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 	}
 
 
 	public function testAddFilterAttribute()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, array( 0, 1 ), [], [] );
+		$filter = $this->object->addFilterAttribute($filter, array(0, 1), [], []);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([0,1])', $list[0]->getName() );
-		$this->assertEquals( 2, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([0,1])', $list[0]->getName());
+		$this->assertEquals(2, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterAttributeOptions()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, [], array( 1 ), [] );
+		$filter = $this->object->addFilterAttribute($filter, [], array(1), []);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([1])', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([1])', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterAttributeOne()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, [], [], array( 'test' => array( 2 ) ) );
+		$filter = $this->object->addFilterAttribute($filter, [], [], array('test' => array(2)));
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([2])', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([2])', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterCategory()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
 
-		$catId = $manager->findItem( 'root' )->getId();
+		$catId = $manager->findItem('root')->getId();
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
 
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterCategory( $filter, $catId, $level );
+		$filter = $this->object->addFilterCategory($filter, $catId, $level);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( 3, count( $list[0]->getValue() ) );
-		$this->assertEquals( [], $filter->getSortations() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(3, count($list[0]->getValue()));
+		$this->assertEquals([], $filter->getSortations());
 	}
 
 
 	public function testAddFilterText()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
+		$filter = $this->object->addFilterText($filter, 'Espresso');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$list = $filter->getConditions()->getExpressions();
 
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 
-		$this->assertEquals( [], $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals([], $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
@@ -155,177 +155,177 @@ 
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterCategory( $filter, 0, $level, 'relevance', '-', 'test' );
+		$filter = $this->object->addFilterCategory($filter, 0, $level, 'relevance', '-', 'test');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.catalog.position("test",["0"])', $item->getName() );
-		$this->assertEquals( '-', $item->getOperator() );
+		$this->assertEquals('sort:index.catalog.position("test",["0"])', $item->getName());
+		$this->assertEquals('-', $item->getOperator());
 	}
 
 
 	public function testCreateFilterSortRelevanceText()
 	{
-		$filter = $this->object->createFilter( 'relevance', '-', 1, 2, 'test' );
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
+		$filter = $this->object->createFilter('relevance', '-', 1, 2, 'test');
+		$filter = $this->object->addFilterText($filter, 'Espresso');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( [], $filter->getSortations() );
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals([], $filter->getSortations());
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateFilterSortCode()
 	{
-		$filter = $this->object->createFilter( 'code' );
+		$filter = $this->object->createFilter('code');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.code', $item->getName() );
+		$this->assertEquals('product.code', $item->getName());
 	}
 
 
 	public function testCreateFilterSortCtime()
 	{
-		$filter = $this->object->createFilter( 'ctime' );
+		$filter = $this->object->createFilter('ctime');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.ctime', $item->getName() );
+		$this->assertEquals('product.ctime', $item->getName());
 	}
 
 
 	public function testCreateFilterSortName()
 	{
-		$filter = $this->object->createFilter( 'name' );
+		$filter = $this->object->createFilter('name');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
 	}
 
 
 	public function testCreateFilterSortPrice()
 	{
-		$filter = $this->object->createFilter( 'price' );
+		$filter = $this->object->createFilter('price');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
 	}
 
 
 	public function testCreateFilterSortInvalid()
 	{
-		$filter = $this->object->createFilter( '', 'failure' );
+		$filter = $this->object->createFilter('', 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( [], $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals([], $filter->getSortations());
 	}
 
 
 	public function testGetItem()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$id = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'CNC' )->getId();
+		$id = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('CNC')->getId();
 
-		$result = $this->object->getItem( $id );
+		$result = $this->object->getItem($id);
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $result );
-		$this->assertGreaterThan( 0, $result->getPropertyItems() );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'attribute' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'media' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'price' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'product' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'text' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $result);
+		$this->assertGreaterThan(0, $result->getPropertyItems());
+		$this->assertGreaterThan(0, $result->getRefItems('attribute'));
+		$this->assertGreaterThan(0, $result->getRefItems('media'));
+		$this->assertGreaterThan(0, $result->getRefItems('price'));
+		$this->assertGreaterThan(0, $result->getRefItems('product'));
+		$this->assertGreaterThan(0, $result->getRefItems('text'));
 	}
 
 
 	public function testGetItems()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$context->getConfig()->set( 'controller/frontend/product/ignore-dates', true );
+		$context->getConfig()->set('controller/frontend/product/ignore-dates', true);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', array( 'CNC', 'CNE' ) ) );
+		$search->setConditions($search->compare('==', 'product.code', array('CNC', 'CNE')));
 
 		$ids = [];
-		foreach( $manager->searchItems( $search ) as $productItem ) {
+		foreach ($manager->searchItems($search) as $productItem) {
 			$ids[] = $productItem->getId();
 		}
 
 
-		$result = $this->object->getItems( $ids );
+		$result = $this->object->getItems($ids);
 
-		$this->assertEquals( 2, count( $result ) );
+		$this->assertEquals(2, count($result));
 
-		foreach( $result as $productItem ) {
-			$this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $productItem );
+		foreach ($result as $productItem) {
+			$this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $productItem);
 		}
 	}
 
 
 	public function testSearchItemsCategory()
 	{
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $catalogManager->createSearch();
 
-		$search->setConditions( $search->compare( '==', 'catalog.code', 'new' ) );
-		$search->setSlice( 0, 1 );
-		$items = $catalogManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'catalog.code', 'new'));
+		$search->setSlice(0, 1);
+		$items = $catalogManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( 'Product item not found' );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException('Product item not found');
 		}
 
-		$filter = $this->object->createFilter( 'position', '+', 1, 1 );
-		$filter = $this->object->addFilterCategory( $filter, $item->getId() );
+		$filter = $this->object->createFilter('position', '+', 1, 1);
+		$filter = $this->object->addFilterCategory($filter, $item->getId());
 
 		$total = 0;
-		$results = $this->object->searchItems( $filter, [], $total );
+		$results = $this->object->searchItems($filter, [], $total);
 
-		$this->assertEquals( 3, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(3, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testSearchItemsText()
 	{
-		$filter = $this->object->createFilter( 'relevance', '+', 0, 1, 'unittype13' );
-		$filter = $this->object->addFilterText( $filter, 'Expresso', 'relevance', '+', 'unittype13' );
+		$filter = $this->object->createFilter('relevance', '+', 0, 1, 'unittype13');
+		$filter = $this->object->addFilterText($filter, 'Expresso', 'relevance', '+', 'unittype13');
 
 		$total = 0;
-		$results = $this->object->searchItems( $filter, [], $total );
+		$results = $this->object->searchItems($filter, [], $total);
 
-		$this->assertEquals( 2, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(2, $total);
+		$this->assertEquals(1, count($results));
 	}
 }

controller/frontend/tests/Controller/Frontend/Basket/Decorator/BaseTest.php

Spacing +45 added lines, -45 removed lines

@@ -20,54 +20,54 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testClear()
 	{
-		$this->stub->expects( $this->once() )->method( 'clear' );
+		$this->stub->expects($this->once())->method('clear');
 
 		$this->object->clear();
 	}
@@ -76,18 +76,18 @@ 
 	public function testGet()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->createItem();
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $order ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($order));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
 	}
 
 
 	public function testSave()
 	{
-		$this->stub->expects( $this->once() )->method( 'save' );
+		$this->stub->expects($this->once())->method('save');
 
 		$this->object->save();
 	}
@@ -95,15 +95,15 @@ 
 
 	public function testSetType()
 	{
-		$this->stub->expects( $this->once() )->method( 'setType' );
+		$this->stub->expects($this->once())->method('setType');
 
-		$this->object->setType( 'test' );
+		$this->object->setType('test');
 	}
 
 
 	public function testStore()
 	{
-		$this->stub->expects( $this->once() )->method( 'store' );
+		$this->stub->expects($this->once())->method('store');
 
 		$this->object->store();
 	}
@@ -111,7 +111,7 @@ 
 
 	public function testLoad()
 	{
-		$this->stub->expects( $this->once() )->method( 'load' );
+		$this->stub->expects($this->once())->method('load');
 
 		$this->object->load( -1 );
 	}
@@ -119,7 +119,7 @@ 
 
 	public function testAddProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'addProduct' );
+		$this->stub->expects($this->once())->method('addProduct');
 
 		$this->object->addProduct( -1 );
 	}
@@ -127,73 +127,73 @@ 
 
 	public function testDeleteProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteProduct' );
+		$this->stub->expects($this->once())->method('deleteProduct');
 
-		$this->object->deleteProduct( 0 );
+		$this->object->deleteProduct(0);
 	}
 
 
 	public function testEditProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'editProduct' );
+		$this->stub->expects($this->once())->method('editProduct');
 
-		$this->object->editProduct( 0, 1 );
+		$this->object->editProduct(0, 1);
 	}
 
 
 	public function testAddCoupon()
 	{
-		$this->stub->expects( $this->once() )->method( 'addCoupon' );
+		$this->stub->expects($this->once())->method('addCoupon');
 
-		$this->object->addCoupon( 'test' );
+		$this->object->addCoupon('test');
 	}
 
 
 	public function testDeleteCoupon()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteCoupon' );
+		$this->stub->expects($this->once())->method('deleteCoupon');
 
-		$this->object->deleteCoupon( 'test' );
+		$this->object->deleteCoupon('test');
 	}
 
 
 	public function testSetAddress()
 	{
-		$this->stub->expects( $this->once() )->method( 'setAddress' );
+		$this->stub->expects($this->once())->method('setAddress');
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null);
 	}
 
 
 	public function testAddService()
 	{
-		$this->stub->expects( $this->once() )->method( 'addService' );
+		$this->stub->expects($this->once())->method('addService');
 
-		$this->object->addService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1 );
+		$this->object->addService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1);
 	}
 
 
 	public function testDeleteService()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteService' );
+		$this->stub->expects($this->once())->method('deleteService');
 
-		$this->object->deleteService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT );
+		$this->object->deleteService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT);
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}