aimeos / ai-controller-frontend

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

Spacing +126 added lines, -126 removed lines

@@ -17,63 +17,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));
 	}
 
 
@@ -81,286 +81,286 @@ 
 	{
 		$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 \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( array( 0 ), $list[0]->getValue() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(array(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 \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());
 
-		$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 \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('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 \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 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 \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 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 \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( array( 0 ), $list[0]->getValue() );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(array(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 \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( 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 \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 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 \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 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 \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 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 \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( 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 \RuntimeException( 'Catalog item not found' );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException('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( 2, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(2, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testGetProductItems()
 	{
-		$list = $this->object->getProductItems( [-1] );
-		$this->assertEquals( 0, count( $list ) );
+		$list = $this->object->getProductItems([-1]);
+		$this->assertEquals(0, count($list));
 	}
 
 
 	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/Locale/Decorator/Base.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	/**
 	 * Returns the frontend controller
 	 *
-	 * @return \Aimeos\Controller\Frontend\Locale\Iface Frontend controller object
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
 	 */
 	protected function getController()
 	{

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 = array() )
+	public function getItem($id, array $domains = array())
 	{
-		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 = array(), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array(), &$total = null)
 	{
-		return $this->controller->searchItems( $filter, $domains, $total );
+		return $this->controller->searchItems($filter, $domains, $total);
 	}
 
 

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

Spacing +10 added lines, -10 removed lines

@@ -15,31 +15,31 @@
 	{
 		$target = '\\Aimeos\\Controller\\Frontend\\Locale\\Iface';
 
-		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext() );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext());
+		$this->assertInstanceOf($target, $controller);
 
-		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
+		$this->assertInstanceOf($target, $controller);
 	}
 
 
 	public function testCreateControllerInvalidImplementation()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Locale\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Locale\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 }

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

Spacing +17 added lines, -17 removed lines

@@ -16,13 +16,13 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Locale\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Locale\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
@@ -30,29 +30,29 @@ 
 	{
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( 1, count( $filter->getSortations() ) );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(1, count($filter->getSortations()));
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testGetItem()
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'locale');
 		$search = $localeManager->createSearch();
-		$search->setSortations( [$search->sort( '+', 'locale.position' )] );
-		$search->setSlice( 0, 1 );
-		$localeItems = $localeManager->searchItems( $search );
+		$search->setSortations([$search->sort('+', 'locale.position')]);
+		$search->setSlice(0, 1);
+		$localeItems = $localeManager->searchItems($search);
 
-		if( ( $localeItem = reset( $localeItems ) ) === false ) {
-			throw new \Exception( 'No locale item found' );
+		if (($localeItem = reset($localeItems)) === false) {
+			throw new \Exception('No locale item found');
 		}
 
 
-		$result = $this->object->getItem( $localeItem->getId() );
+		$result = $this->object->getItem($localeItem->getId());
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Locale\Item\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Locale\Item\Iface', $result);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	{
 		$total = 0;
 		$filter = $this->object->createFilter();
-		$results = $this->object->searchItems( $filter, [], $total );
+		$results = $this->object->searchItems($filter, [], $total);
 
-		$this->assertEquals( 1, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(1, $total);
+		$this->assertEquals(1, count($results));
 	}
 }

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

Spacing +32 added lines, -32 removed lines

@@ -20,97 +20,97 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\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\Locale\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\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 testCreateFilter()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'createFilter' )
-			->will( $this->returnValue( $search ) );
+		$this->stub->expects($this->once())->method('createFilter')
+			->will($this->returnValue($search));
 
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('getItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Locale\Item\Iface', $this->object->getItem( -1 ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Locale\Item\Iface', $this->object->getItem( -1 ));
 	}
 
 
 	public function testSearchItems()
 	{
-		$filter = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createSearch();
+		$filter = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->searchItems( $filter, ['media'] ) );
+		$this->assertEquals([], $this->object->searchItems($filter, ['media']));
 	}
 
 
 	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\Locale\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Locale\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Locale\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/locale/name
 		 * Class name of the used locale frontend controller implementation
@@ -63,20 +63,20 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/locale/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/locale/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Locale\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Locale\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/locale/decorators/excludes
 		 * Excludes decorators added by the "common" option from the locale frontend controllers
@@ -152,7 +152,7 @@ 
 		 * @see controller/frontend/locale/decorators/excludes
 		 * @see controller/frontend/locale/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'locale' );
+		return self::addControllerDecorators($context, $manager, 'locale');
 	}
 
 }

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 = array() )
+	public function getItem($id, array $domains = array())
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale' )->getItem( $id );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale')->getItem($id);
 	}
 
 
@@ -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 = array(), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array(), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale' )->searchItems( $filter, [], $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale')->searchItems($filter, [], $total);
 	}
 }

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

Spacing +117 added lines, -117 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
 	 *  connections, logger, session, etc.
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 	}
 
 
@@ -49,7 +49,7 @@ 
 	public function clear()
 	{
 		$this->baskets[$this->type] = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 
 		return $this;
 	}
@@ -62,10 +62,10 @@ 
 	 */
 	public function get()
 	{
-		if( !isset( $this->baskets[$this->type] ) )
+		if (!isset($this->baskets[$this->type]))
 		{
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
-			$this->checkLocale( $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->type);
 		}
 
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@ 
 	 */
 	public function save()
 	{
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 		}
 
 		return $this;
@@ -93,7 +93,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
 		$this->type = $type;
 		return $this;
@@ -120,36 +120,36 @@ 
 	 * @param string $stocktype Unique code of the stock type 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 $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ) );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'));
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem );
-		$orderBaseProductItem->setQuantity( $quantity );
-		$orderBaseProductItem->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem);
+		$orderBaseProductItem->setQuantity($quantity);
+		$orderBaseProductItem->setStockType($stocktype);
 
 		$attr = array();
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$price = $priceManager->getLowestPrice($prices, $quantity);
 
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
-		$orderBaseProductItem->setPrice( $price );
-		$orderBaseProductItem->setAttributes( $attr );
+		$orderBaseProductItem->setPrice($price);
+		$orderBaseProductItem->setAttributes($attr);
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -159,17 +159,17 @@ 
 	 *
 	 * @param integer $position Position number (key) of the order product item
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -183,34 +183,34 @@ 
 	 * 	The 'stock'=>false option allows adding products without being in stock.
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $options = array(),
-		array $configAttributeCodes = array() )
+	public function editProduct($position, $quantity, array $options = array(),
+		array $configAttributeCodes = array())
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributes();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributes( $attributes );
+		$product->setAttributes($attributes);
 
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
-		$prices = $productItem->getRefItems( 'price', 'default' );
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
+		$prices = $productItem->getRefItems('price', 'default');
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
 
-		$this->get()->deleteProduct( $position );
-		$this->get()->addProduct( $product, $position );
+		$this->get()->deleteProduct($position);
+		$this->get()->addProduct($product, $position);
 
 		$this->save();
 	}
@@ -222,49 +222,49 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 
-		$search = $codeManager->createSearch( true );
+		$search = $codeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.code.code', $code ),
+			$search->compare('==', 'coupon.code.code', $code),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $codeManager->searchItems( $search );
+		$result = $codeManager->searchItems($search);
 
-		if( ( $codeItem = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
+		if (($codeItem = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
 		}
 
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
 		}
 
 
-		$provider = $manager->getProvider( $item, $code );
+		$provider = $manager->getProvider($item, $code);
 
-		if( $provider->isAvailable( $this->get() ) !== true ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
+		if ($provider->isAvailable($this->get()) !== true) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -275,21 +275,21 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
 		}
 
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
 		$this->save();
 	}
 
@@ -302,28 +302,28 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
+		$address->setType($type);
 
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
 		{
-			$address->copyFrom( $value );
-			$this->get()->setAddress( $address, $type );
+			$address->copyFrom($value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->setAddressFromArray( $address, $value );
-			$this->get()->setAddress( $address, $type );
+			$this->setAddressFromArray($address, $value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( $value === null )
+		else if ($value === null)
 		{
-			$this->get()->deleteAddress( $type );
+			$this->get()->deleteAddress($type);
 		}
 		else
 		{
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
 		}
 
 		$this->save();
@@ -339,42 +339,42 @@ 
 	 * 	entered by the customer when choosing one of the delivery or payment options
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 */
-	public function setService( $type, $id, array $attributes = array() )
+	public function setService($type, $id, array $attributes = array())
 	{
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$serviceItem = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$serviceItem = $this->getDomainItem('service', 'service.id', $id, array('media', 'price', 'text'));
 
-		$provider = $serviceManager->getProvider( $serviceItem );
-		$result = $provider->checkConfigFE( $attributes );
-		$unknown = array_diff_key( $attributes, $result );
+		$provider = $serviceManager->getProvider($serviceItem);
+		$result = $provider->checkConfigFE($attributes);
+		$unknown = array_diff_key($attributes, $result);
 
-		if( count( $unknown ) > 0 )
+		if (count($unknown) > 0)
 		{
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		foreach( $result as $key => $value )
+		foreach ($result as $key => $value)
 		{
-			if( $value !== null ) {
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
+			if ($value !== null) {
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
 			}
 		}
 
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
 		$orderServiceItem = $orderBaseServiceManager->createItem();
-		$orderServiceItem->copyFrom( $serviceItem );
+		$orderServiceItem->copyFrom($serviceItem);
 
-		$price = $provider->calcPrice( $this->get() );
+		$price = $provider->calcPrice($this->get());
 		// remove service rebate of original price
-		$price->setRebate( '0.00' );
-		$orderServiceItem->setPrice( $price );
+		$price->setRebate('0.00');
+		$orderServiceItem->setPrice($price);
 
-		$provider->setConfigFE( $orderServiceItem, $attributes );
+		$provider->setConfigFE($orderServiceItem, $attributes);
 
-		$this->get()->setService( $orderServiceItem, $type );
+		$this->get()->setService($orderServiceItem, $type);
 		$this->save();
 	}
 
@@ -387,18 +387,18 @@ 
 	 * 	an address item.
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
 	{
-		foreach( $map as $key => $value ) {
-			$map[$key] = strip_tags( $value ); // prevent XSS
+		foreach ($map as $key => $value) {
+			$map[$key] = strip_tags($value); // prevent XSS
 		}
 
-		$errors = $address->fromArray( $map );
+		$errors = $address->fromArray($map);
 
-		if( count( $errors ) > 0 )
+		if (count($errors) > 0)
 		{
-			$msg = sprintf( 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
+			$msg = sprintf('Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
 		}
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -311,17 +311,14 @@
 		{
 			$address->copyFrom( $value );
 			$this->get()->setAddress( $address, $type );
-		}
-		else if( is_array( $value ) )
+		} else if( is_array( $value ) )
 		{
 			$this->setAddressFromArray( $address, $value );
 			$this->get()->setAddress( $address, $type );
-		}
-		else if( $value === null )
+		} else if( $value === null )
 		{
 			$this->get()->deleteAddress( $type );
-		}
-		else
+		} else
 		{
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
 		}