aimeos / ai-controller-frontend

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** controller/frontend/order/name
 		 * Class name of the used order frontend controller implementation
@@ -64,19 +64,19 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/order/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/order/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false ) {
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+		if (ctype_alnum($name) === false) {
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Order\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Order\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/order/decorators/excludes
 		 * Excludes decorators added by the "common" option from the order frontend controllers
@@ -152,6 +152,6 @@ 
 		 * @see controller/frontend/order/decorators/excludes
 		 * @see controller/frontend/order/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'order' );
+		return self::addControllerDecorators($context, $manager, 'order');
 	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -17,33 +17,33 @@
 	protected function setUp()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$cntl = new \Aimeos\Controller\Frontend\Catalog\Standard( $context );
+		$cntl = new \Aimeos\Controller\Frontend\Catalog\Standard($context);
 
-		$this->object = new \Aimeos\Controller\Frontend\Common\Decorator\Example( $cntl, $context );
+		$this->object = new \Aimeos\Controller\Frontend\Common\Decorator\Example($cntl, $context);
 	}
 
 
 	public function testCall()
 	{
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->createManager( 'product' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Manager\Iface', $this->object->createManager('product'));
 	}
 
 
 	public function testCallInvalid()
 	{
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 		$this->object->invalidMethod();
 	}
 
 
 	public function testGetContext()
 	{
-		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $this->object->getContext() );
+		$this->assertInstanceOf('\Aimeos\MShop\Context\Item\Iface', $this->object->getContext());
 	}
 
 
 	public function testGetController()
 	{
-		$this->assertInstanceOf( '\Aimeos\Controller\Frontend\Iface', $this->object->getController() );
+		$this->assertInstanceOf('\Aimeos\Controller\Frontend\Iface', $this->object->getController());
 	}
 }
\ No newline at end of file

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

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$this->context = $context;
 	}
@@ -41,7 +41,7 @@ 
 	 * @param array $param List of method parameter
 	 * @return boolean Returns always false
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
 		return false;
 	}

controller/frontend/config/controller.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	'frontend' => array(
 		'basket' => array(
 			'decorators' => array(
-				'local' => array( 'Category', 'Stock' ),
+				'local' => array('Category', 'Stock'),
 			),
 		),
 	),

controller/frontend/tests/Controller/Frontend/FactoryTest.php

Spacing +33 added lines, -33 removed lines

@@ -17,92 +17,92 @@
 {
 	public function testCreateController()
 	{
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket' );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
 	}
 
 
 	public function testCreateControllerEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), "\t\n" );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), "\t\n");
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 
 	public function testCreateSubControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket/notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket/notexist');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$controller1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+		$controller1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 		\Aimeos\Controller\Frontend\Factory::clear();
-		$controller2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+		$controller2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $controller1, $controller2 );
+		$this->assertNotSame($controller1, $controller2);
 	}
 
 
 	public function testClearSite()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context );
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context);
 
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertNotSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertNotSame($catalog1, $catalog2);
 	}
 
 
 	public function testClearSpecific()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context, 'basket' );
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context, 'basket');
 
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertSame($catalog1, $catalog2);
 	}
 
 }
\ No newline at end of file

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

Spacing +11 added lines, -11 removed lines

@@ -12,35 +12,35 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Category( $object, $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Category($object, $this->context);
 	}
 
 
 	protected function tearDown()
 	{
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', array() );
+		$this->context->getSession()->set('aimeos', array());
 
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAddProductWithCategory()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
-		$item = $manager->findItem( 'CNE' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
+		$item = $manager->findItem('CNE');
 
-		$this->object->addProduct( $item->getId(), 5 );
+		$this->object->addProduct($item->getId(), 5);
 	}
 
 
 	public function testAddProductNoCategory()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
-		$item = $manager->findItem( 'ABCD' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
+		$item = $manager->findItem('ABCD');
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Basket\Exception' );
-		$this->object->addProduct( $item->getId(), 5 );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Basket\Exception');
+		$this->object->addProduct($item->getId(), 5);
 	}
 }

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

Spacing +78 added lines, -78 removed lines

@@ -12,132 +12,132 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Stock( $object, $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Stock($object, $this->context);
 	}
 
 
 	protected function tearDown()
 	{
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', array() );
+		$this->context->getSession()->set('aimeos', array());
 
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAddProductNotEnoughStockException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
 		try
 		{
-			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3' );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->addProduct($item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3');
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$item = $this->object->get()->getProduct( 0 );
-			$this->assertEquals( 3, $item->getQuantity() );
+			$item = $this->object->get()->getProduct(0);
+			$this->assertEquals(3, $item->getQuantity());
 		}
 	}
 
 
 	public function testAddProductNoStockException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'EFGH' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'EFGH'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
 		try
 		{
-			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2' );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->addProduct($item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2');
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$this->assertEquals( array(), $this->object->get()->getProducts() );
+			$this->assertEquals(array(), $this->object->get()->getProducts());
 		}
 	}
 
 
 	public function testAddProductNoStockRequired()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 5, array( 'stock' => false ) );
+		$this->object->addProduct($item->getId(), 5, array('stock' => false));
 	}
 
 
 	public function testAddProductNoStockItem()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'QRST' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'QRST'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testEditProductNotEnoughStock()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3' );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3');
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 2, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(2, $item->getQuantity());
 
 		try
 		{
-			$this->object->editProduct( 0, 5 );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->editProduct(0, 5);
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$item = $this->object->get()->getProduct( 0 );
-			$this->assertEquals( 3, $item->getQuantity() );
-			$this->assertEquals( 'IJKL', $item->getProductCode() );
+			$item = $this->object->get()->getProduct(0);
+			$this->assertEquals(3, $item->getQuantity());
+			$this->assertEquals('IJKL', $item->getProductCode());
 		}
 	}
 
@@ -146,58 +146,58 @@ 
 	{
 		$context = \TestHelperFrontend::getContext();
 
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$orderProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$orderProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product');
 		$orderProductItem = $orderProductManager->createItem();
-		$orderProductItem->copyFrom( $item );
-		$orderProductItem->setQuantity( 2 );
-		$orderProductItem->setWarehouseCode( 'unit_warehouse3' );
+		$orderProductItem->copyFrom($item);
+		$orderProductItem->setQuantity(2);
+		$orderProductItem->setWarehouseCode('unit_warehouse3');
 
-		$pos = $this->object->get()->addProduct( $orderProductItem, 1 );
+		$pos = $this->object->get()->addProduct($orderProductItem, 1);
 
-		$item = $this->object->get()->getProduct( $pos );
-		$this->assertEquals( 2, $item->getQuantity() );
+		$item = $this->object->get()->getProduct($pos);
+		$this->assertEquals(2, $item->getQuantity());
 
 		try
 		{
-			$this->object->editProduct( $pos, 5 );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->editProduct($pos, 5);
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$this->assertEquals( 3, $this->object->get()->getProduct( $pos )->getQuantity() );
+			$this->assertEquals(3, $this->object->get()->getProduct($pos)->getQuantity());
 		}
 	}
 
 
 	public function testEditProductStockNotChecked()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3' );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3');
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 2, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(2, $item->getQuantity());
 
-		$this->object->editProduct( 0, 5, array( 'stock' => false ) );
+		$this->object->editProduct(0, 5, array('stock' => false));
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 5, $item->getQuantity() );
-		$this->assertEquals( 'IJKL', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(5, $item->getQuantity());
+		$this->assertEquals('IJKL', $item->getProductCode());
 	}
 }

Braces +4 added lines, -8 removed lines

@@ -359,8 +359,7 @@ 
 		{
 			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3' );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$item = $this->object->get()->getProduct( 0 );
 			$this->assertEquals( 3, $item->getQuantity() );
@@ -385,8 +384,7 @@ 
 		{
 			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2' );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$this->assertEquals( array(), $this->object->get()->getProducts() );
 		}
@@ -619,8 +617,7 @@ 
 		{
 			$this->object->editProduct( 0, 5 );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$item = $this->object->get()->getProduct( 0 );
 			$this->assertEquals( 3, $item->getQuantity() );
@@ -657,8 +654,7 @@ 
 		{
 			$this->object->editProduct( $pos, 5 );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$this->assertEquals( 3, $this->object->get()->getProduct( $pos )->getQuantity() );
 		}

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

Spacing +124 added lines, -124 removed lines

@@ -15,63 +15,63 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCreateManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->createManager( 'product' ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->createManager('product'));
 	}
 
 
 	public function testCreateCatalogFilter()
 	{
-		$filter = $this->object->createCatalogFilter( true );
+		$filter = $this->object->createCatalogFilter(true);
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Compare\\Iface', $filter->getConditions() );
-		$this->assertEquals( 'catalog.status', $filter->getConditions()->getName() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Compare\\Iface', $filter->getConditions());
+		$this->assertEquals('catalog.status', $filter->getConditions()->getName());
 	}
 
 
 	public function testGetCatalogPath()
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$item = $manager->getTree( null, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$item = $manager->getTree(null, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST);
 
 		$list = array();
-		foreach( $this->object->getCatalogPath( $item->getChild( 0 )->getId(), array( 'text' ) ) as $item ) {
+		foreach ($this->object->getCatalogPath($item->getChild(0)->getId(), array('text')) as $item) {
 			$list[$item->getCode()] = $item;
 		}
 
-		$this->assertEquals( 2, count( $list ) );
-		$this->assertArrayHasKey( 'root', $list );
-		$this->assertArrayHasKey( 'categories', $list );
+		$this->assertEquals(2, count($list));
+		$this->assertArrayHasKey('root', $list);
+		$this->assertArrayHasKey('categories', $list);
 	}
 
 
 	public function testGetCatalogTree()
 	{
-		$item = $this->object->getCatalogTree( null, array( 'text' ), \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
+		$item = $this->object->getCatalogTree(null, array('text'), \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE);
 
-		$this->assertEquals( 'Root', $item->getName() );
-		$this->assertEquals( 0, count( $item->getChildren() ) );
+		$this->assertEquals('Root', $item->getName());
+		$this->assertEquals(0, count($item->getChildren()));
 	}
 
 
 	public function testAggregateIndex()
 	{
 		$filter = $this->object->createIndexFilter();
-		$list = $this->object->aggregateIndex( $filter, 'index.attribute.id' );
+		$list = $this->object->aggregateIndex($filter, 'index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
@@ -79,279 +79,279 @@ 
 	{
 		$filter = $this->object->createIndexFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterCategory()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0 );
+		$filter = $this->object->createIndexFilterCategory(0);
 
-		$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 \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 
 
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterCategoryPosition()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'relevance', '-', 1, 2, 'test' );
+		$filter = $this->object->createIndexFilterCategory(0, 'relevance', '-', 1, 2, '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('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());
 
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterCategoryCode()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'code' );
+		$filter = $this->object->createIndexFilterCategory(0, '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertStringStartsWith( 'product.code', $item->getName() );
+		$this->assertStringStartsWith('product.code', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterCategoryName()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'name' );
+		$filter = $this->object->createIndexFilterCategory(0, '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('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 testCreateIndexFilterCategoryPrice()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'price' );
+		$filter = $this->object->createIndexFilterCategory(0, '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('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 testCreateIndexFilterCategoryInvalidSortation()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'failure' );
+		$filter = $this->object->createIndexFilterCategory(0, 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testAddIndexFilterCategory()
 	{
 		$filter = $this->object->createIndexFilter();
-		$filter = $this->object->addIndexFilterCategory( $filter, 0 );
+		$filter = $this->object->addIndexFilterCategory($filter, 0);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testCreateIndexFilterText()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso' );
+		$filter = $this->object->createIndexFilterText('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 \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('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( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterTextRelevance()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'relevance', '-', 1, 2, 'test' );
+		$filter = $this->object->createIndexFilterText('Espresso', 'relevance', '-', 1, 2, 'test');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterTextCode()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'code' );
+		$filter = $this->object->createIndexFilterText('Espresso', '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.code', $item->getName() );
+		$this->assertEquals('product.code', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterTextName()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'name' );
+		$filter = $this->object->createIndexFilterText('Espresso', '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('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 testCreateIndexFilterTextPrice()
 	{
-		$filter = $this->object->createIndexFilterCategory( 'Espresso', 'price' );
+		$filter = $this->object->createIndexFilterCategory('Espresso', '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 \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('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 testCreateIndexFilterTextInvalidSortation()
 	{
-		$filter = $this->object->createIndexFilterText( '', 'failure' );
+		$filter = $this->object->createIndexFilterText('', 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testAddIndexFilterText()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso' );
-		$filter = $this->object->addIndexFilterText( $filter, 'Espresso' );
+		$filter = $this->object->createIndexFilterText('Espresso');
+		$filter = $this->object->addIndexFilterText($filter, 'Espresso');
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testGetIndexItemsCategory()
 	{
-		$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 \Exception( 'Catalog item not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Catalog item not found');
 		}
 
 		$total = 0;
-		$filter = $this->object->createIndexFilterCategory( $item->getId(), 'position', '+', 1, 1 );
-		$results = $this->object->getIndexItems( $filter, array(), $total );
+		$filter = $this->object->createIndexFilterCategory($item->getId(), 'position', '+', 1, 1);
+		$results = $this->object->getIndexItems($filter, array(), $total);
 
-		$this->assertEquals( 3, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(3, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testGetIndexItemsText()
 	{
 		$total = 0;
-		$filter = $this->object->createIndexFilterText( 'Expresso', 'relevance', '+', 0, 1, 'unittype13' );
-		$results = $this->object->getIndexItems( $filter, array(), $total );
+		$filter = $this->object->createIndexFilterText('Expresso', 'relevance', '+', 0, 1, 'unittype13');
+		$results = $this->object->getIndexItems($filter, array(), $total);
 
-		$this->assertEquals( 1, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(1, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testCreateTextFilter()
 	{
-		$filter = $this->object->createTextFilter( 'Expresso', 'name', '+', 0, 1 );
+		$filter = $this->object->createTextFilter('Expresso', 'name', '+', 0, 1);
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions() );
-		$this->assertEquals( 3, count( $filter->getConditions()->getExpressions() ) );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions());
+		$this->assertEquals(3, count($filter->getConditions()->getExpressions()));
 	}
 
 
 	public function testGetTextListName()
 	{
-		$filter = $this->object->createTextFilter( 'Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name' );
-		$results = $this->object->getTextList( $filter );
+		$filter = $this->object->createTextFilter('Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name');
+		$results = $this->object->getTextList($filter);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertContains( 'Cafe Noire Cappuccino', $results );
+		$this->assertEquals(1, count($results));
+		$this->assertContains('Cafe Noire Cappuccino', $results);
 	}
 
 }

controller/frontend/src/Controller/Frontend/Basket/Decorator/Stock.php

Spacing +32 added lines, -32 removed lines

@@ -41,29 +41,29 @@ 
 	 * @param string $warehouse Unique code of the warehouse to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantIds = array(),
-		array $configIds = array(), array $hiddenIds = array(), array $customValues = array(), $warehouse = 'default' )
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantIds = array(),
+		array $configIds = array(), array $hiddenIds = array(), array $customValues = array(), $warehouse = 'default')
 	{
 		$stocklevel = null;
 
-		if( !isset( $options['stock'] ) || $options['stock'] != false ) {
-			$stocklevel = $this->getStockLevel( $prodid, $warehouse );
+		if (!isset($options['stock']) || $options['stock'] != false) {
+			$stocklevel = $this->getStockLevel($prodid, $warehouse);
 		}
 
-		$qty = ( $stocklevel !== null ? min( $stocklevel, $quantity ) : $quantity );
+		$qty = ($stocklevel !== null ? min($stocklevel, $quantity) : $quantity);
 
-		if( $qty > 0 )
+		if ($qty > 0)
 		{
 			$this->getController()->addProduct(
 				$prodid, $qty, $options, $variantIds, $configIds, $hiddenIds, $customValues, $warehouse
 			);
 		}
 
-		if( $qty < $quantity )
+		if ($qty < $quantity)
 		{
-			$product = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' )->getItem( $prodid );
-			$msg = sprintf( 'There are not enough products "%1$s" in stock', $product->getName() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$product = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($prodid);
+			$msg = sprintf('There are not enough products "%1$s" in stock', $product->getName());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 	}
 
@@ -77,23 +77,23 @@ 
 	 * 	The 'stock'=>false option allows adding products without being in stock.
 	 * @param string[] $configCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $options = array(), array $configCodes = array() )
+	public function editProduct($position, $quantity, array $options = array(), array $configCodes = array())
 	{
 		$stocklevel = null;
-		$product = $this->getController()->get()->getProduct( $position );
+		$product = $this->getController()->get()->getProduct($position);
 
-		if( !isset( $options['stock'] ) || $options['stock'] != false ) {
-			$stocklevel = $this->getStockLevel( $product->getProductId(), $product->getWarehouseCode() );
+		if (!isset($options['stock']) || $options['stock'] != false) {
+			$stocklevel = $this->getStockLevel($product->getProductId(), $product->getWarehouseCode());
 		}
 
-		$qty = ( $stocklevel !== null ? min( $stocklevel, $quantity ) : $quantity );
+		$qty = ($stocklevel !== null ? min($stocklevel, $quantity) : $quantity);
 
-		$this->getController()->editProduct( $position, $qty, $options, $configCodes );
+		$this->getController()->editProduct($position, $qty, $options, $configCodes);
 
-		if( $qty < $quantity )
+		if ($qty < $quantity)
 		{
-			$msg = sprintf( 'There are not enough products "%1$s" in stock', $product->getName() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('There are not enough products "%1$s" in stock', $product->getName());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 	}
 
@@ -105,35 +105,35 @@ 
 	 * @param string $warehouse Unique code of the warehouse
 	 * @return integer|null Number of available items in stock (null for unlimited stock)
 	 */
-	protected function getStockLevel( $prodid, $warehouse )
+	protected function getStockLevel($prodid, $warehouse)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/stock');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'product.stock.parentid', $prodid ),
+			$search->compare('==', 'product.stock.parentid', $prodid),
 			$search->getConditions(),
-			$search->compare( '==', 'product.stock.warehouse.code', $warehouse ),
+			$search->compare('==', 'product.stock.warehouse.code', $warehouse),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( empty( $result ) )
+		if (empty($result))
 		{
-			$msg = sprintf( 'No stock for product ID "%1$s" and warehouse "%2$s" available', $prodid, $warehouse );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No stock for product ID "%1$s" and warehouse "%2$s" available', $prodid, $warehouse);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		$stocklevel = null;
 
-		foreach( $result as $item )
+		foreach ($result as $item)
 		{
-			if( ( $stock = $item->getStockLevel() ) === null ) {
+			if (($stock = $item->getStockLevel()) === null) {
 				return null;
 			}
 
-			$stocklevel = max( (int) $stocklevel, $item->getStockLevel() );
+			$stocklevel = max((int) $stocklevel, $item->getStockLevel());
 		}
 
 		return $stocklevel;