aimeos / ai-controller-frontend

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

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +60 added lines, -60 removed lines

@@ -20,76 +20,76 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\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\Customer\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\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 testAddItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'addItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('addItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->addItem( [] ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->addItem([]));
 	}
 
 
 	public function testCreateItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'createItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('createItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->createItem());
 	}
 
 
 	public function testDeleteItem()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteItem' );
+		$this->stub->expects($this->once())->method('deleteItem');
 
 		$this->object->deleteItem( -1 );
 	}
@@ -97,61 +97,61 @@ 
 
 	public function testEditItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'editItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('editItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->editItem( -1, [] ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->editItem( -1, [] ));
 	}
 
 
 	public function testGetItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->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\Customer\Item\Iface', $this->object->getItem( -1 ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->getItem( -1 ));
 	}
 
 
 	public function testFindItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'findItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('findItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->findItem( 'test' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->findItem('test'));
 	}
 
 
 	public function testSaveItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'saveItem' );
+		$this->stub->expects($this->once())->method('saveItem');
 
-		$this->object->saveItem( $item );
+		$this->object->saveItem($item);
 	}
 
 
 	public function testCreateAddressItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'createAddressItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('createAddressItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->createAddressItem() );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->createAddressItem());
 	}
 
 
 	public function testDeleteAddressItem()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteAddressItem' );
+		$this->stub->expects($this->once())->method('deleteAddressItem');
 
 		$this->object->deleteAddressItem( -1 );
 	}
@@ -159,49 +159,49 @@ 
 
 	public function testEditAddressItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'editAddressItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('editAddressItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->editAddressItem( -1, [] ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->editAddressItem( -1, [] ));
 	}
 
 
 	public function testGetAddressItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getAddressItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('getAddressItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->getAddressItem( -1 ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->getAddressItem( -1 ));
 	}
 
 
 	public function testSaveAddressItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'saveAddressItem' );
+		$this->stub->expects($this->once())->method('saveAddressItem');
 
-		$this->object->saveAddressItem( $item );
+		$this->object->saveAddressItem($item);
 	}
 
 
 	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\Customer\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Customer\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +14 added lines, -14 removed lines

@@ -18,40 +18,40 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Bundle( $object, $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Bundle($object, $this->context);
 	}
 
 
 	protected function tearDown()
 	{
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', [] );
+		$this->context->getSession()->set('aimeos', []);
 
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAddProductBundle()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'U:BUNDLE' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('U:BUNDLE');
 
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->object->addProduct($item->getId(), 1);
 
-		$this->assertEquals( 1, count( $this->object->get()->getProducts() ) );
-		$this->assertEquals( 'U:BUNDLE', $this->object->get()->getProduct( 0 )->getProductCode() );
-		$this->assertEquals( 2, count( $this->object->get()->getProduct( 0 )->getProducts() ) );
+		$this->assertEquals(1, count($this->object->get()->getProducts()));
+		$this->assertEquals('U:BUNDLE', $this->object->get()->getProduct(0)->getProductCode());
+		$this->assertEquals(2, count($this->object->get()->getProduct(0)->getProducts()));
 	}
 
 
 	public function testAddProductNoBundle()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
 
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->object->addProduct($item->getId(), 1);
 
-		$this->assertEquals( 1, count( $this->object->get()->getProducts() ) );
-		$this->assertEquals( 'CNC', $this->object->get()->getProduct( 0 )->getProductCode() );
-		$this->assertEquals( 0, count( $this->object->get()->getProduct( 0 )->getProducts() ) );
+		$this->assertEquals(1, count($this->object->get()->getProducts()));
+		$this->assertEquals('CNC', $this->object->get()->getProduct(0)->getProductCode());
+		$this->assertEquals(0, count($this->object->get()->getProduct(0)->getProducts()));
 	}
 }

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

Spacing +11 added lines, -11 removed lines

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

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

Spacing +12 added lines, -12 removed lines

@@ -20,33 +20,33 @@
 		$this->context = \TestHelperFrontend::getContext();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/frontend/common/decorators/default', [] );
-		$config->set( 'controller/frontend/catalog/decorators/global', [] );
-		$config->set( 'controller/frontend/catalog/decorators/local', [] );
+		$config->set('controller/frontend/common/decorators/default', []);
+		$config->set('controller/frontend/catalog/decorators/global', []);
+		$config->set('controller/frontend/catalog/decorators/local', []);
 
 	}
 
 
 	public function testInjectController()
 	{
-		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller );
+		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller);
 
-		$injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
+		$injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
 
-		$this->assertSame( $controller, $injectedController );
+		$this->assertSame($controller, $injectedController);
 	}
 
 
 	public function testInjectControllerReset()
 	{
-		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller );
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null );
+		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller);
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null);
 
-		$new = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
+		$new = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
 
-		$this->assertNotSame( $controller, $new );
+		$this->assertNotSame($controller, $new);
 	}
 
 }
\ No newline at end of file

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +35 added lines, -35 removed lines

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