aimeos / ai-controller-frontend

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

Spacing +17 added lines, -17 removed lines

@@ -30,12 +30,12 @@ 
 	 * @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::class;
-		$this->controller = \Aimeos\MW\Common\Base::checkClass( $iface, $controller );
+		$this->controller = \Aimeos\MW\Common\Base::checkClass($iface, $controller);
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -47,9 +47,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);
 	}
 
 
@@ -71,9 +71,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Subscription\Iface Subscription controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value )
+	public function compare($operator, $key, $value)
 	{
-		$this->controller->compare( $operator, $key, $value );
+		$this->controller->compare($operator, $key, $value);
 		return $this;
 	}
 
@@ -85,9 +85,9 @@ 
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id )
+	public function get($id)
 	{
-		return $this->controller->get( $id );
+		return $this->controller->get($id);
 	}
 
 
@@ -98,9 +98,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Subscription\Iface Subscription controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions )
+	public function parse(array $conditions)
 	{
-		$this->controller->parse( $conditions );
+		$this->controller->parse($conditions);
 		return $this;
 	}
 
@@ -112,9 +112,9 @@ 
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Ordered list of subscription items
 	 * @since 2019.04
 	 */
-	public function search( &$total = null )
+	public function search(&$total = null)
 	{
-		return $this->controller->search( $total );
+		return $this->controller->search($total);
 	}
 
 
@@ -126,9 +126,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Subscription\Iface Subscription controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit )
+	public function slice($start, $limit)
 	{
-		$this->controller->slice( $start, $limit );
+		$this->controller->slice($start, $limit);
 		return $this;
 	}
 
@@ -140,9 +140,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Subscription\Iface Subscription controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null )
+	public function sort($key = null)
 	{
-		$this->controller->sort( $key );
+		$this->controller->sort($key);
 		return $this;
 	}
 

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

Spacing +13 added lines, -13 removed lines

@@ -18,19 +18,19 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Locale\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Locale\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testCompare()
 	{
-		$this->assertEquals( 1, count( $this->object->compare( '>', 'locale.status', 0 )->search() ) );
+		$this->assertEquals(1, count($this->object->compare('>', 'locale.status', 0)->search()));
 	}
 
 
@@ -38,48 +38,48 @@ 
 	{
 		$expected = \Aimeos\MShop\Locale\Item\Iface::class;
 
-		$manager = \Aimeos\MShop::create( $this->context, 'locale' );
-		$items = $manager->searchItems( $manager->createSearch( true ) );
+		$manager = \Aimeos\MShop::create($this->context, 'locale');
+		$items = $manager->searchItems($manager->createSearch(true));
 
-		$this->assertInstanceOf( $expected, $this->object->get( reset( $items )->getId() ) );
+		$this->assertInstanceOf($expected, $this->object->get(reset($items)->getId()));
 	}
 
 
 	public function testParse()
 	{
 		$cond = ['>' => ['locale.status' => 0]];
-		$this->assertEquals( 1, count( $this->object->parse( $cond )->search() ) );
+		$this->assertEquals(1, count($this->object->parse($cond)->search()));
 	}
 
 
 	public function testSearch()
 	{
 		$total = 0;
-		$this->assertGreaterThanOrEqual( 1, count( $this->object->search( $total ) ) );
-		$this->assertGreaterThanOrEqual( 1, $total );
+		$this->assertGreaterThanOrEqual(1, count($this->object->search($total)));
+		$this->assertGreaterThanOrEqual(1, $total);
 	}
 
 
 	public function testSlice()
 	{
-		$this->assertEquals( 1, count( $this->object->slice( 0, 1 )->search() ) );
+		$this->assertEquals(1, count($this->object->slice(0, 1)->search()));
 	}
 
 
 	public function testSort()
 	{
-		$this->assertEquals( 1, count( $this->object->sort()->search() ) );
+		$this->assertEquals(1, count($this->object->sort()->search()));
 	}
 
 
 	public function testSortPosition()
 	{
-		$this->assertEquals( 1, count( $this->object->sort( 'position' )->search() ) );
+		$this->assertEquals(1, count($this->object->sort('position')->search()));
 	}
 
 
 	public function testSortGeneric()
 	{
-		$this->assertEquals( 1, count( $this->object->sort( 'locale.status' )->search() ) );
+		$this->assertEquals(1, count($this->object->sort('locale.status')->search()));
 	}
 }

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

Spacing +40 added lines, -40 removed lines

@@ -20,48 +20,48 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Locale\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Locale\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Locale\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Locale\Decorator\Base::class)
+			->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::class )->getMock();
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Iface::class)->getMock();
 
-		$this->setExpectedException( \Aimeos\MW\Common\Exception::class );
+		$this->setExpectedException(\Aimeos\MW\Common\Exception::class);
 
-		$this->getMockBuilder( \Aimeos\Controller\Frontend\Locale\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Locale\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Locale\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Locale\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Locale\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Locale\Decorator\Base::class)
+			->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());
 	}
 
 
@@ -69,21 +69,21 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Locale\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'compare' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('compare')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->compare( '==', 'locale.status', 1 ) );
+		$this->assertInstanceOf($expected, $this->object->compare('==', 'locale.status', 1));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'locale' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'locale')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( \Aimeos\MShop\Locale\Item\Iface::class, $this->object->get( -1 ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Locale\Item\Iface::class, $this->object->get( -1 ));
 	}
 
 
@@ -91,21 +91,21 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Locale\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'parse' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('parse')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->parse( [] ) );
+		$this->assertInstanceOf($expected, $this->object->parse([]));
 	}
 
 
 	public function testSearch()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'locale' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'locale')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'search' )
-			->will( $this->returnValue( [$item] ) );
+		$this->stub->expects($this->once())->method('search')
+			->will($this->returnValue([$item]));
 
-		$this->assertEquals( [$item], $this->object->search() );
+		$this->assertEquals([$item], $this->object->search());
 	}
 
 
@@ -113,10 +113,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Locale\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'slice' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('slice')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->slice( 0, 100 ) );
+		$this->assertInstanceOf($expected, $this->object->slice(0, 100));
 	}
 
 
@@ -124,26 +124,26 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Locale\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'sort' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('sort')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->sort( 'position' ) );
+		$this->assertInstanceOf($expected, $this->object->sort('position'));
 	}
 
 
 	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::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Locale\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +70 added lines, -70 removed lines

@@ -17,237 +17,237 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Product\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Product\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAggregate()
 	{
-		$list = $this->object->aggregate( 'index.attribute.id' );
+		$list = $this->object->aggregate('index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
 	public function testAllOf()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$length = $manager->findItem( '30', [], 'product', 'length' )->getId();
-		$width = $manager->findItem( '29', [], 'product', 'width' )->getId();
+		$length = $manager->findItem('30', [], 'product', 'length')->getId();
+		$width = $manager->findItem('29', [], 'product', 'width')->getId();
 
-		$this->assertEquals( 2, count( $this->object->allOf( [$length, $width] )->search() ) );
+		$this->assertEquals(2, count($this->object->allOf([$length, $width])->search()));
 	}
 
 
 	public function testCategory()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
-		$catId = $manager->findItem( 'cafe' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
+		$catId = $manager->findItem('cafe')->getId();
 
-		$this->assertEquals( 2, count( $this->object->category( $catId, 'promotion' )->search() ) );
+		$this->assertEquals(2, count($this->object->category($catId, 'promotion')->search()));
 	}
 
 
 	public function testCategoryTree()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
 
-		$catId = $manager->findItem( 'categories' )->getId();
-		$grpId = $manager->findItem( 'group' )->getId();
+		$catId = $manager->findItem('categories')->getId();
+		$grpId = $manager->findItem('group')->getId();
 
-		$this->object->category( [$catId, $grpId], 'promotion', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE );
-		$this->assertEquals( 3, count( $this->object->search() ) );
+		$this->object->category([$catId, $grpId], 'promotion', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE);
+		$this->assertEquals(3, count($this->object->search()));
 	}
 
 
 	public function testCompare()
 	{
-		$this->assertEquals( 1, count( $this->object->compare( '==', 'product.type', 'bundle' )->search() ) );
+		$this->assertEquals(1, count($this->object->compare('==', 'product.type', 'bundle')->search()));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'CNC' );
+		$item = \Aimeos\MShop::create($this->context, 'product')->findItem('CNC');
 
-		$this->assertInstanceOf( \Aimeos\MShop\Product\Item\Iface::class, $this->object->get( $item->getId() ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Product\Item\Iface::class, $this->object->get($item->getId()));
 	}
 
 
 	public function testFind()
 	{
-		$this->assertInstanceOf( \Aimeos\MShop\Product\Item\Iface::class, $this->object->find( 'CNC' ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Product\Item\Iface::class, $this->object->find('CNC'));
 	}
 
 
 	public function testOneOf()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$length = $manager->findItem( '30', [], 'product', 'length' )->getId();
-		$width = $manager->findItem( '29', [], 'product', 'width' )->getId();
+		$length = $manager->findItem('30', [], 'product', 'length')->getId();
+		$width = $manager->findItem('29', [], 'product', 'width')->getId();
 
-		$this->assertEquals( 4, count( $this->object->oneOf( [$length, $width] )->search() ) );
+		$this->assertEquals(4, count($this->object->oneOf([$length, $width])->search()));
 	}
 
 
 	public function testOneOfList()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$length = $manager->findItem( '30', [], 'product', 'length' )->getId();
-		$width = $manager->findItem( '29', [], 'product', 'width' )->getId();
+		$length = $manager->findItem('30', [], 'product', 'length')->getId();
+		$width = $manager->findItem('29', [], 'product', 'width')->getId();
 
-		$this->assertEquals( 4, count( $this->object->oneOf( [[$length, $width]] )->search() ) );
+		$this->assertEquals(4, count($this->object->oneOf([[$length, $width]])->search()));
 	}
 
 
 	public function testParse()
 	{
 		$cond = ['&&' => [['>' => ['product.status' => 0]], ['==' => ['product.type' => 'default']]]];
-		$this->assertEquals( 4, count( $this->object->parse( $cond )->search() ) );
+		$this->assertEquals(4, count($this->object->parse($cond)->search()));
 	}
 
 
 	public function testProduct()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'product' );
+		$manager = \Aimeos\MShop::create($this->context, 'product');
 
-		$cncId = $manager->findItem( 'CNC' )->getId();
-		$cneId = $manager->findItem( 'CNE' )->getId();
+		$cncId = $manager->findItem('CNC')->getId();
+		$cneId = $manager->findItem('CNE')->getId();
 
-		$this->assertEquals( 2, count( $this->object->product( [$cncId, $cneId] )->search() ) );
+		$this->assertEquals(2, count($this->object->product([$cncId, $cneId])->search()));
 	}
 
 
 	public function testSearch()
 	{
 		$total = 0;
-		$this->assertEquals( 8, count( $this->object->search( [], $total ) ) );
-		$this->assertEquals( 8, $total );
+		$this->assertEquals(8, count($this->object->search([], $total)));
+		$this->assertEquals(8, $total);
 	}
 
 
 	public function testSlice()
 	{
-		$this->assertEquals( 2, count( $this->object->slice( 0, 2 )->search() ) );
+		$this->assertEquals(2, count($this->object->slice(0, 2)->search()));
 	}
 
 
 	public function testSort()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( 'relevance' )->search() ) );
+		$this->assertEquals(8, count($this->object->sort('relevance')->search()));
 	}
 
 
 	public function testSortGeneric()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( 'product.status' )->search() ) );
+		$this->assertEquals(8, count($this->object->sort('product.status')->search()));
 	}
 
 
 	public function testSortCode()
 	{
-		$result = $this->object->sort( 'code' )->search( [] );
-		$this->assertEquals( 'CNC', reset( $result )->getCode() );
+		$result = $this->object->sort('code')->search([]);
+		$this->assertEquals('CNC', reset($result)->getCode());
 	}
 
 
 	public function testSortCodeDesc()
 	{
-		$result = $this->object->sort( '-code' )->search( [] );
-		$this->assertStringStartsWith( 'U:', reset( $result )->getCode() );
+		$result = $this->object->sort('-code')->search([]);
+		$this->assertStringStartsWith('U:', reset($result)->getCode());
 	}
 
 
 	public function testSortCtime()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( 'ctime' )->search( [] ) ) );
+		$this->assertEquals(8, count($this->object->sort('ctime')->search([])));
 	}
 
 
 	public function testSortCtimeDesc()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( '-ctime' )->search( [] ) ) );
+		$this->assertEquals(8, count($this->object->sort('-ctime')->search([])));
 	}
 
 
 	public function testSortName()
 	{
-		$result = $this->object->sort( 'name' )->search( ['text'] );
-		$this->assertEquals( 'Cafe Noire Cappuccino', reset( $result )->getName() );
+		$result = $this->object->sort('name')->search(['text']);
+		$this->assertEquals('Cafe Noire Cappuccino', reset($result)->getName());
 	}
 
 
 	public function testSortNameDesc()
 	{
-		$result = $this->object->sort( '-name' )->search( ['text'] );
-		$this->assertEquals( 'Unterproduct 3', reset( $result )->getName() );
+		$result = $this->object->sort('-name')->search(['text']);
+		$this->assertEquals('Unterproduct 3', reset($result)->getName());
 	}
 
 
 	public function testSortPrice()
 	{
-		$result = $this->object->sort( 'price' )->search( ['price'] );
-		$prices = reset( $result )->getRefItems( 'price', 'default', 'default' );
+		$result = $this->object->sort('price')->search(['price']);
+		$prices = reset($result)->getRefItems('price', 'default', 'default');
 
-		$this->assertEquals( '12.00', reset( $prices )->getValue() );
+		$this->assertEquals('12.00', reset($prices)->getValue());
 	}
 
 
 	public function testSortPriceDesc()
 	{
-		$result = $this->object->sort( '-price' )->search( ['price'] );
-		$prices = reset( $result )->getRefItems( 'price', 'default', 'default' );
+		$result = $this->object->sort('-price')->search(['price']);
+		$prices = reset($result)->getRefItems('price', 'default', 'default');
 
-		$this->assertEquals( '600.00', reset( $prices )->getValue() );
+		$this->assertEquals('600.00', reset($prices)->getValue());
 	}
 
 
 	public function testSortRelevanceCategory()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
-		$catId = $manager->findItem( 'new' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
+		$catId = $manager->findItem('new')->getId();
 
-		$result = $this->object->category( $catId )->sort( 'relevance' )->search( [] );
+		$result = $this->object->category($catId)->sort('relevance')->search([]);
 
-		$this->assertEquals( 3, count( $result ) );
-		$this->assertEquals( 'CNE', reset( $result )->getCode() );
-		$this->assertEquals( 'U:BUNDLE', end( $result )->getCode() );
+		$this->assertEquals(3, count($result));
+		$this->assertEquals('CNE', reset($result)->getCode());
+		$this->assertEquals('U:BUNDLE', end($result)->getCode());
 	}
 
 
 	public function testSortRelevanceSupplier()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'supplier' );
-		$supId = $manager->findItem( 'unitCode001' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'supplier');
+		$supId = $manager->findItem('unitCode001')->getId();
 
-		$result = $this->object->supplier( $supId )->sort( 'relevance' )->search( [] );
+		$result = $this->object->supplier($supId)->sort('relevance')->search([]);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 'CNC', reset( $result )->getCode() );
-		$this->assertEquals( 'CNE', end( $result )->getCode() );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals('CNC', reset($result)->getCode());
+		$this->assertEquals('CNE', end($result)->getCode());
 	}
 
 
 	public function testSupplier()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'supplier' );
-		$supId = $manager->findItem( 'unitCode001' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'supplier');
+		$supId = $manager->findItem('unitCode001')->getId();
 
-		$this->assertEquals( 2, count( $this->object->supplier( $supId )->search( [] ) ) );
+		$this->assertEquals(2, count($this->object->supplier($supId)->search([])));
 	}
 
 
 	public function testText()
 	{
-		$this->assertEquals( 3, count( $this->object->text( 'Cafe' )->search( [] ) ) );
+		$this->assertEquals(3, count($this->object->text('Cafe')->search([])));
 	}
 }

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

Spacing +130 added lines, -130 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::create( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop::create($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->baskets[$this->type]->getLocale(), $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->baskets[$this->type]->getLocale(), $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;
@@ -127,7 +127,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/basket/limit-count', 5 );
+		$count = $config->get('controller/frontend/basket/limit-count', 5);
 
 		/** controller/frontend/basket/limit-seconds
 		 * Order limitation time frame in seconds
@@ -145,34 +145,34 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/basket/limit-seconds', 300);
 
 		$search = $this->domainManager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.base.editor', $context->getEditor() ),
-			$search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.base.editor', $context->getEditor()),
+			$search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$this->domainManager->searchItems( $search, [], $total );
+		$this->domainManager->searchItems($search, [], $total);
 
-		if( $total > $count )
+		if ($total > $count)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Temporary order limit reached' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Temporary order limit reached');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
 		$basket = $this->get()->finish();
-		$basket->setCustomerId( (string) $context->getUserId() );
+		$basket->setCustomerId((string) $context->getUserId());
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		$this->save(); // for reusing unpaid orders, might have side effects (!)
-		$this->createSubscriptions( $basket );
+		$this->createSubscriptions($basket);
 
 		return $basket;
 	}
@@ -186,9 +186,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->domainManager->load( $id, $parts, false, $default );
+		return $this->domainManager->load($id, $parts, false, $default);
 	}
 
 
@@ -207,34 +207,34 @@ 
 	 * @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, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
+		$productManager = \Aimeos\MShop::create($context, 'product');
 
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
 
-		$orderBaseProductItem = \Aimeos\MShop::create( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop::create($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -244,17 +244,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 = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -266,32 +266,32 @@ 
 	 * @param integer $quantity New quantiy of the product item
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $configAttributeCodes = [])
 	{
-		$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 = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be changed' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be changed');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributeItems();
-		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->setAttributeItems( $attributes );
+		$product->setAttributeItems($attributes);
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product' );
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ), true );
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product');
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'), true);
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
 
-		$this->get()->addProduct( $product, $position );
+		$this->get()->addProduct($product, $position);
 
 		$this->save();
 	}
@@ -303,7 +303,7 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
 
@@ -323,44 +323,44 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$allowed = $context->getConfig()->get( 'controller/frontend/basket/standard/coupon/allowed', 1 );
+		$allowed = $context->getConfig()->get('controller/frontend/basket/standard/coupon/allowed', 1);
 
-		if( $allowed <= count( $this->get()->getCoupons() ) )
+		if ($allowed <= count($this->get()->getCoupons()))
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Number of coupon codes exceeds the limit' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Number of coupon codes exceeds the limit');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$manager = \Aimeos\MShop::create( $context, 'coupon' );
-		$codeManager = \Aimeos\MShop::create( $context, 'coupon/code' );
+		$manager = \Aimeos\MShop::create($context, 'coupon');
+		$codeManager = \Aimeos\MShop::create($context, 'coupon/code');
 
-		$search = $manager->createSearch( true )->setSlice( 0, 1 );
+		$search = $manager->createSearch(true)->setSlice(0, 1);
 		$expr = [
-			$search->compare( '==', 'coupon.code.code', $code ),
-			$codeManager->createSearch( true )->getConditions(),
+			$search->compare('==', 'coupon.code.code', $code),
+			$codeManager->createSearch(true)->getConditions(),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid or not available any more' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid or not available any more'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$provider = $manager->getProvider( $item, $code );
+		$provider = $manager->getProvider($item, $code);
 
-		if( $provider->isAvailable( $this->get() ) !== true )
+		if ($provider->isAvailable($this->get()) !== true)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -371,24 +371,24 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'coupon' );
+		$manager = \Aimeos\MShop::create($context, '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 )
+		if (($item = reset($result)) === false)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $code ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $code));
 		}
 
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
 		$this->save();
 	}
 
@@ -401,28 +401,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)
 	{
 		$context = $this->getContext();
-		$address = \Aimeos\MShop::create( $context, 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop::create($context, '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)
 		{
-			$this->get()->setAddress( $address->copyFrom( $value ), $type );
+			$this->get()->setAddress($address->copyFrom($value), $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->get()->setAddress( $this->setAddressFromArray( $address, $value ), $type );
+			$this->get()->setAddress($this->setAddressFromArray($address, $value), $type);
 		}
-		else if( $value === null )
+		else if ($value === null)
 		{
-			$this->get()->deleteAddress( $type );
+			$this->get()->deleteAddress($type);
 		}
 		else
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid value for address type "%1$s"');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $type));
 		}
 
 		$this->save();
@@ -438,42 +438,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 addService( $type, $id, array $attributes = [] )
+	public function addService($type, $id, array $attributes = [])
 	{
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop::create( $context, 'service' );
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop::create($context, 'service');
+		$serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text'));
 
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
-		$result = $provider->checkConfigFE( $attributes );
-		$unknown = array_diff_key( $attributes, $result );
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
+		$result = $provider->checkConfigFE($attributes);
+		$unknown = array_diff_key($attributes, $result);
 
-		if( count( $unknown ) > 0 )
+		if (count($unknown) > 0)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Unknown attributes "%1$s"' );
-			$msg = sprintf( $msg, implode( '","', array_keys( $unknown ) ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Unknown attributes "%1$s"');
+			$msg = sprintf($msg, 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::create( $context, 'order/base/service' );
+		$orderBaseServiceManager = \Aimeos\MShop::create($context, 'order/base/service');
 		$orderServiceItem = $orderBaseServiceManager->createItem();
-		$orderServiceItem->copyFrom( $serviceItem );
+		$orderServiceItem->copyFrom($serviceItem);
 
 		// remove service rebate of original price
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
-		$orderServiceItem->setPrice( $price );
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
+		$orderServiceItem->setPrice($price);
 
-		$provider->setConfigFE( $orderServiceItem, $attributes );
+		$provider->setConfigFE($orderServiceItem, $attributes);
 
-		$this->get()->addService( $orderServiceItem, $type );
+		$this->get()->addService($orderServiceItem, $type);
 		$this->save();
 	}
 
@@ -483,9 +483,9 @@ 
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
 	 */
-	public function deleteService( $type )
+	public function deleteService($type)
 	{
-		$this->get()->deleteService( $type );
+		$this->get()->deleteService($type);
 		$this->save();
 	}
 
@@ -499,18 +499,18 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Base\Address\Iface Updated 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
 		}
 
-		$address = $address->fromArray( $map );
+		$address = $address->fromArray($map);
 
-		if( count( $map ) > 0 )
+		if (count($map) > 0)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $map );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $map);
 		}
 
 		return $address;

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

Spacing +39 added lines, -39 removed lines

@@ -35,14 +35,14 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
 
-		$item = $manager->getItem( $serviceId, [], true );
-		$provider = $manager->getProvider( $item, $item->getType() );
+		$item = $manager->getItem($serviceId, [], true);
+		$provider = $manager->getProvider($item, $item->getType());
 
-		return array_filter( $provider->checkConfigFE( $attributes ) );
+		return array_filter($provider->checkConfigFE($attributes));
 	}
 
 
@@ -53,12 +53,12 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
-		$item = $manager->getItem( $serviceId, $ref, true );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->getItem($serviceId, $ref, true);
 
-		return $manager->getProvider( $item, $item->getType() );
+		return $manager->getProvider($item, $item->getType());
 	}
 
 
@@ -69,25 +69,25 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
 	{
 		$list = [];
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
 
-		$search = $manager->createSearch( true );
-		$search->setSortations( [$search->sort( '+', 'service.position' )] );
+		$search = $manager->createSearch(true);
+		$search->setSortations([$search->sort('+', 'service.position')]);
 
-		if( $type != null )
+		if ($type != null)
 		{
 			$expr = array(
 				$search->getConditions(),
-				$search->compare( '==', 'service.type', $type ),
+				$search->compare('==', 'service.type', $type),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 		}
 
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
-			$list[$id] = $manager->getProvider( $item, $item->getType() );
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
+			$list[$id] = $manager->getProvider($item, $item->getType());
 		}
 
 		return $list;
@@ -105,15 +105,15 @@ 
 	 * @return \Aimeos\MShop\Common\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
-		$item = $manager->getItem( $serviceId, [], true );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->getItem($serviceId, [], true);
 
-		$provider = $manager->getProvider( $item, $item->getType() );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($item, $item->getType());
+		$provider->injectGlobalConfigBE($urls);
 
-		return $provider->process( $orderItem, $params );
+		return $provider->process($orderItem, $params);
 	}
 
 
@@ -125,14 +125,14 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code )
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'service' );
-		$item = $manager->findItem( $code );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'service');
+		$item = $manager->findItem($code);
 
-		$provider = $manager->getProvider( $item, $item->getType() );
+		$provider = $manager->getProvider($item, $item->getType());
 
-		return $provider->updatePush( $request, $response );
+		return $provider->updatePush($request, $response);
 	}
 
 
@@ -144,24 +144,24 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid )
+	public function updateSync(ServerRequestInterface $request, $code, $orderid)
 	{
 		$context = $this->getContext();
-		$orderManager = \Aimeos\MShop::create( $context, 'order' );
-		$serviceManager = \Aimeos\MShop::create( $context, 'service' );
+		$orderManager = \Aimeos\MShop::create($context, 'order');
+		$serviceManager = \Aimeos\MShop::create($context, 'service');
 
-		$orderItem = $orderManager->getItem( $orderid );
-		$serviceItem = $serviceManager->findItem( $code );
+		$orderItem = $orderManager->getItem($orderid);
+		$serviceItem = $serviceManager->findItem($code);
 
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
 
-		if( ( $orderItem = $provider->updateSync( $request, $orderItem ) ) !== null )
+		if (($orderItem = $provider->updateSync($request, $orderItem)) !== null)
 		{
-			if( $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
-				&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
+			if ($orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
+				&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
 			) {
-				$provider->query( $orderItem );
+				$provider->query($orderItem);
 			}
 		}
 

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

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes );
+	public function checkAttributes($serviceId, array $attributes);
 
 	/**
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@ 
 	 * @return \Aimeos\MShop\Common\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
 
 
 	/**
@@ -72,7 +72,7 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code );
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code);
 
 
 	/**
@@ -83,5 +83,5 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid );
+	public function updateSync(ServerRequestInterface $request, $code, $orderid);
 }

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

Spacing +17 added lines, -17 removed lines

@@ -33,13 +33,13 @@ 
 	 * @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)
 	{
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Frontend\\Service\\Iface', $controller );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Frontend\\Service\\Iface', $controller);
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -51,9 +51,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);
 	}
 
 
@@ -64,9 +64,9 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		return $this->controller->checkAttributes( $serviceId, $attributes );
+		return $this->controller->checkAttributes($serviceId, $attributes);
 	}
 
 
@@ -77,9 +77,9 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		return $this->controller->getProvider( $serviceId, $ref );
+		return $this->controller->getProvider($serviceId, $ref);
 	}
 
 
@@ -90,9 +90,9 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
 	{
-		return $this->controller->getProviders( $type, $ref );
+		return $this->controller->getProviders($type, $ref);
 	}
 
 
@@ -107,9 +107,9 @@ 
 	 * @return \Aimeos\MShop\Common\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
 	{
-		return $this->controller->process( $orderItem, $serviceId, $urls, $params );
+		return $this->controller->process($orderItem, $serviceId, $urls, $params);
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code )
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code)
 	{
-		return $this->controller->updatePush( $request, $response, $code );
+		return $this->controller->updatePush($request, $response, $code);
 	}
 
 
@@ -135,9 +135,9 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid )
+	public function updateSync(ServerRequestInterface $request, $code, $orderid)
 	{
-		return $this->controller->updateSync( $request, $code, $orderid );
+		return $this->controller->updateSync($request, $code, $orderid);
 	}
 
 

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

Spacing +50 added lines, -50 removed lines

@@ -19,122 +19,122 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Service\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Service\Standard($this->context);
 	}
 
 
 	public static function setUpBeforeClass()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::create( \TestHelperFrontend::getContext() );
-		$orderBaseMgr = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::create(\TestHelperFrontend::getContext());
+		$orderBaseMgr = $orderManager->getSubManager('base');
 		self::$basket = $orderBaseMgr->createItem();
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
-		unset( $this->object, $this->context );
+		\Aimeos\MShop::cache(false);
+		unset($this->object, $this->context);
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$attributes = $this->object->checkAttributes( $this->getServiceItem()->getId(), [] );
-		$this->assertEquals( [], $attributes );
+		$attributes = $this->object->checkAttributes($this->getServiceItem()->getId(), []);
+		$this->assertEquals([], $attributes);
 	}
 
 
 	public function testGetProviders()
 	{
-		$providers = $this->object->getProviders( 'delivery' );
-		$this->assertGreaterThan( 0, count( $providers ) );
+		$providers = $this->object->getProviders('delivery');
+		$this->assertGreaterThan(0, count($providers));
 
-		foreach( $providers as $provider ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		foreach ($providers as $provider) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 		}
 	}
 
 
 	public function testGetProvider()
 	{
-		$provider = $this->object->getProvider( $this->getServiceItem()->getId() );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		$provider = $this->object->getProvider($this->getServiceItem()->getId());
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 	}
 
 
 	public function testProcess()
 	{
 		$form = new \Aimeos\MShop\Common\Helper\Form\Standard();
-		$item = \Aimeos\MShop::create( $this->context, 'order' )->createItem();
-		$serviceId = \Aimeos\MShop::create( $this->context, 'service' )->findItem( 'unitcode' )->getId();
+		$item = \Aimeos\MShop::create($this->context, 'order')->createItem();
+		$serviceId = \Aimeos\MShop::create($this->context, 'service')->findItem('unitcode')->getId();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['process'] )
+			->setMethods(['process'])
 			->getMock();
 
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getProvider'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop::inject( 'service', $manager );
+		\Aimeos\MShop::inject('service', $manager);
 
-		$provider->expects( $this->once() )->method( 'process' )->will( $this->returnValue( $form ) );
-		$manager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
+		$provider->expects($this->once())->method('process')->will($this->returnValue($form));
+		$manager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
 
 
-		$result = $this->object->process( $item, $serviceId, [], [] );
-		$this->assertInstanceOf( \Aimeos\MShop\Common\Helper\Form\Iface::class, $result );
+		$result = $this->object->process($item, $serviceId, [], []);
+		$this->assertInstanceOf(\Aimeos\MShop\Common\Helper\Form\Iface::class, $result);
 	}
 
 
 	public function testUpdatePush()
 	{
-		$request = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
-		$response = $this->getMockBuilder( \Psr\Http\Message\ResponseInterface::class )->getMock();
+		$request = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
+		$response = $this->getMockBuilder(\Psr\Http\Message\ResponseInterface::class)->getMock();
 
-		$response->expects( $this->once() )->method( 'withStatus' )->will( $this->returnValue( $response ) );
+		$response->expects($this->once())->method('withStatus')->will($this->returnValue($response));
 
-		$this->assertInstanceOf( \Psr\Http\Message\ResponseInterface::class, $this->object->updatePush( $request, $response, 'unitcode' ) );
+		$this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $this->object->updatePush($request, $response, 'unitcode'));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'order' )->createItem();
-		$request = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
+		$item = \Aimeos\MShop::create($this->context, 'order')->createItem();
+		$request = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setMethods( ['updateSync', 'query', 'isImplemented'] )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setMethods(['updateSync', 'query', 'isImplemented'])
 			->disableOriginalConstructor()
 			->getMock();
 
-		$orderManager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getItem'] )
+		$orderManager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getItem'])
 			->getMock();
 
-		$serviceManager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getProvider'] )
+		$serviceManager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop::inject( 'order', $orderManager );
-		\Aimeos\MShop::inject( 'service', $serviceManager );
+		\Aimeos\MShop::inject('order', $orderManager);
+		\Aimeos\MShop::inject('service', $serviceManager);
 
 
-		$orderManager->expects( $this->once() )->method( 'getItem' )->will( $this->returnValue( $item ) );
-		$serviceManager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
-		$provider->expects( $this->once() )->method( 'updateSync' )->will( $this->returnValue( $item ) );
-		$provider->expects( $this->once() )->method( 'isImplemented' )->will( $this->returnValue( true ) );
-		$provider->expects( $this->once() )->method( 'query' );
+		$orderManager->expects($this->once())->method('getItem')->will($this->returnValue($item));
+		$serviceManager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
+		$provider->expects($this->once())->method('updateSync')->will($this->returnValue($item));
+		$provider->expects($this->once())->method('isImplemented')->will($this->returnValue(true));
+		$provider->expects($this->once())->method('query');
 
-		$this->object->updateSync( $request, 'unitcode', -1 );
+		$this->object->updateSync($request, 'unitcode', -1);
 	}
 
 
@@ -143,7 +143,7 @@ 
 	 */
 	protected function getServiceItem()
 	{
-		$manager = \Aimeos\MShop\Service\Manager\Factory::create( \TestHelperFrontend::getContext() );
-		return $manager->findItem( 'unitcode' );
+		$manager = \Aimeos\MShop\Service\Manager\Factory::create(\TestHelperFrontend::getContext());
+		return $manager->findItem('unitcode');
 	}
 }