aimeos / aimeos-symfony

Service/Config.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -40,33 +40,33 @@ 
 	 * @param string $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MW\Config\Iface Config object
 	 */
-	public function get( $type = 'frontend' )
+	public function get($type = 'frontend')
 	{
 		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths();
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths);
 
-		$apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' );
-		$prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' );
+		$apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable');
+		$prefix = $this->container->getParameter('aimeos_shop.apc_prefix');
 
-		if( function_exists( 'apcu_store' ) === true && $apc === true ) {
-			$conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix );
+		if (function_exists('apcu_store') === true && $apc === true) {
+			$conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix);
 		}
 
 		$local = array(
-			'admin' => $this->container->getParameter( 'aimeos_shop.admin' ),
-			'client' => $this->container->getParameter( 'aimeos_shop.client' ),
-			'controller' => $this->container->getParameter( 'aimeos_shop.controller' ),
-			'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ),
-			'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ),
-			'resource' => $this->container->getParameter( 'aimeos_shop.resource' ),
+			'admin' => $this->container->getParameter('aimeos_shop.admin'),
+			'client' => $this->container->getParameter('aimeos_shop.client'),
+			'controller' => $this->container->getParameter('aimeos_shop.controller'),
+			'madmin' => $this->container->getParameter('aimeos_shop.madmin'),
+			'mshop' => $this->container->getParameter('aimeos_shop.mshop'),
+			'resource' => $this->container->getParameter('aimeos_shop.resource'),
 		);
 
-		$config = new \Aimeos\MW\Config\Decorator\Memory( $conf, $local );
-		$settings = $this->container->getParameter( 'aimeos_shop.' . $type );
+		$config = new \Aimeos\MW\Config\Decorator\Memory($conf, $local);
+		$settings = $this->container->getParameter('aimeos_shop.'.$type);
 
-		if( $settings !== array() ) {
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $settings );
+		if ($settings !== array()) {
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $settings);
 		}
 
 		return $config;

Tests/Entity/FosUserTest.php

Spacing +44 added lines, -44 removed lines

@@ -19,138 +19,138 @@ 
 
 	public function testGetId()
 	{
-		$this->assertEquals( null, $this->object->getId() );
+		$this->assertEquals(null, $this->object->getId());
 	}
 
 
 	public function testGetSetCompany()
 	{
-		$this->object->setCompany( 'ABC' );
-		$this->assertEquals( 'ABC', $this->object->getCompany() );
+		$this->object->setCompany('ABC');
+		$this->assertEquals('ABC', $this->object->getCompany());
 	}
 
 
 	public function testGetSetVatID()
 	{
-		$this->object->setVatID( 'AT0000' );
-		$this->assertEquals( 'AT0000', $this->object->getVatID() );
+		$this->object->setVatID('AT0000');
+		$this->assertEquals('AT0000', $this->object->getVatID());
 	}
 
 
 	public function testGetSetSalutation()
 	{
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation());
 	}
 
 
 	public function testGetSetTitle()
 	{
-		$this->object->setTitle( 'Prof. Dr.' );
-		$this->assertEquals( 'Prof. Dr.', $this->object->getTitle() );
+		$this->object->setTitle('Prof. Dr.');
+		$this->assertEquals('Prof. Dr.', $this->object->getTitle());
 	}
 
 
 	public function testGetSetFirstname()
 	{
-		$this->object->setFirstname( 'first' );
-		$this->assertEquals( 'first', $this->object->getFirstname() );
+		$this->object->setFirstname('first');
+		$this->assertEquals('first', $this->object->getFirstname());
 	}
 
 
 	public function testGetSetLastname()
 	{
-		$this->object->setLastname( 'last' );
-		$this->assertEquals( 'last', $this->object->getLastname() );
+		$this->object->setLastname('last');
+		$this->assertEquals('last', $this->object->getLastname());
 	}
 
 
 	public function testGetSetAddress1()
 	{
-		$this->object->setAddress1( 'test street' );
-		$this->assertEquals( 'test street', $this->object->getAddress1() );
+		$this->object->setAddress1('test street');
+		$this->assertEquals('test street', $this->object->getAddress1());
 	}
 
 
 	public function testGetSetAddress2()
 	{
-		$this->object->setAddress2( '1' );
-		$this->assertEquals( '1', $this->object->getAddress2() );
+		$this->object->setAddress2('1');
+		$this->assertEquals('1', $this->object->getAddress2());
 	}
 
 
 	public function testGetSetAddress3()
 	{
-		$this->object->setAddress3( 'EG' );
-		$this->assertEquals( 'EG', $this->object->getAddress3() );
+		$this->object->setAddress3('EG');
+		$this->assertEquals('EG', $this->object->getAddress3());
 	}
 
 
 	public function testGetSetPostal()
 	{
-		$this->object->setPostal( '12345' );
-		$this->assertEquals( '12345', $this->object->getPostal() );
+		$this->object->setPostal('12345');
+		$this->assertEquals('12345', $this->object->getPostal());
 	}
 
 
 	public function testGetSetCity()
 	{
-		$this->object->setCity( 'Munich' );
-		$this->assertEquals( 'Munich', $this->object->getCity() );
+		$this->object->setCity('Munich');
+		$this->assertEquals('Munich', $this->object->getCity());
 	}
 
 
 	public function testGetSetState()
 	{
-		$this->object->setState( 'Bayern' );
-		$this->assertEquals( 'Bayern', $this->object->getState() );
+		$this->object->setState('Bayern');
+		$this->assertEquals('Bayern', $this->object->getState());
 	}
 
 
 	public function testGetSetCountryId()
 	{
-		$this->object->setCountryId( 'DE' );
-		$this->assertEquals( 'DE', $this->object->getCountryId() );
+		$this->object->setCountryId('DE');
+		$this->assertEquals('DE', $this->object->getCountryId());
 	}
 
 
 	public function testGetSetLanguageId()
 	{
-		$this->object->setLanguageId( 'de' );
-		$this->assertEquals( 'de', $this->object->getLanguageId() );
+		$this->object->setLanguageId('de');
+		$this->assertEquals('de', $this->object->getLanguageId());
 	}
 
 
 	public function testGetSetTelephone()
 	{
-		$this->object->setTelephone( '089123456789' );
-		$this->assertEquals( '089123456789', $this->object->getTelephone() );
+		$this->object->setTelephone('089123456789');
+		$this->assertEquals('089123456789', $this->object->getTelephone());
 	}
 
 
 	public function testGetSetTelefax()
 	{
-		$this->object->setTelefax( '089987654321' );
-		$this->assertEquals( '089987654321', $this->object->getTelefax() );
+		$this->object->setTelefax('089987654321');
+		$this->assertEquals('089987654321', $this->object->getTelefax());
 	}
 
 
 	public function testGetSetWebsite()
 	{
-		$this->object->setWebsite( 'http://aimeos.org' );
-		$this->assertEquals( 'http://aimeos.org', $this->object->getWebsite() );
+		$this->object->setWebsite('http://aimeos.org');
+		$this->assertEquals('http://aimeos.org', $this->object->getWebsite());
 	}
 
 
@@ -159,6 +159,6 @@ 
 	 */
 	public function testSetWebsiteInvalid()
 	{
-		$this->object->setWebsite( 'aimeos+org' );
+		$this->object->setWebsite('aimeos+org');
 	}
 }

Tests/Entity/UserTest.php

Spacing +9 added lines, -9 removed lines

@@ -19,50 +19,50 @@
 
 	public function testGetId()
 	{
-		$this->assertEquals( null, $this->object->getId() );
+		$this->assertEquals(null, $this->object->getId());
 	}
 
 
 	public function testGetUsername()
 	{
-		$this->assertEquals( null, $this->object->getUsername() );
+		$this->assertEquals(null, $this->object->getUsername());
 	}
 
 
 	public function testGetPassword()
 	{
-		$this->assertEquals( null, $this->object->getPassword() );
+		$this->assertEquals(null, $this->object->getPassword());
 	}
 
 
 	public function testGetSalt()
 	{
-		$this->assertEquals( 'mshop', $this->object->getSalt() );
+		$this->assertEquals('mshop', $this->object->getSalt());
 	}
 
 
 	public function testGetRoles()
 	{
-		$this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() );
+		$this->assertEquals(array('ROLE_USER'), $this->object->getRoles());
 	}
 
 
 	public function testEraseCredentials()
 	{
 		$this->object->eraseCredentials();
-		$this->assertNull( $this->object->getPassword() );
+		$this->assertNull($this->object->getPassword());
 	}
 
 
 	public function testSerialize()
 	{
-		$this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() );
+		$this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize());
 	}
 
 
 	public function testUnserialize()
 	{
-		$this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' );
-		$this->assertNull( $this->object->getId() );
+		$this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}');
+		$this->assertNull($this->object->getId());
 	}
 }

Controller/BasketController.php

Spacing +5 added lines, -5 removed lines

@@ -28,8 +28,8 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'basket-index' );
-		$response =  $this->render( 'AimeosShopBundle:Basket:index.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('basket-index');
+		$response = $this->render('AimeosShopBundle:Basket:index.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -41,7 +41,7 @@ 
 	 */
 	public function miniComponentAction()
 	{
-		$response = $this->getOutput( 'basket/mini' );
+		$response = $this->getOutput('basket/mini');
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -54,7 +54,7 @@ 
 	 */
 	public function relatedComponentAction()
 	{
-		$response = $this->getOutput( 'basket/related' );
+		$response = $this->getOutput('basket/related');
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -67,7 +67,7 @@ 
 	 */
 	public function standardComponentAction()
 	{
-		$response = $this->getOutput( 'basket/standard' );
+		$response = $this->getOutput('basket/standard');
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}

Controller/CheckoutController.php

Spacing +9 added lines, -9 removed lines

@@ -28,8 +28,8 @@ 
 	 */
 	public function confirmAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'checkout-confirm' );
-		$response = $this->render( 'AimeosShopBundle:Checkout:confirm.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('checkout-confirm');
+		$response = $this->render('AimeosShopBundle:Checkout:confirm.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -42,8 +42,8 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'checkout-index' );
-		$response = $this->render( 'AimeosShopBundle:Checkout:index.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('checkout-index');
+		$response = $this->render('AimeosShopBundle:Checkout:index.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -56,8 +56,8 @@ 
 	 */
 	public function updateAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'checkout-update' );
-		$response = $this->render( 'AimeosShopBundle:Checkout:update.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('checkout-update');
+		$response = $this->render('AimeosShopBundle:Checkout:update.html.twig', $params);
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -70,7 +70,7 @@ 
 	 */
 	public function confirmComponentAction()
 	{
-		$response = $this->getOutput( 'checkout/confirm' );
+		$response = $this->getOutput('checkout/confirm');
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -83,7 +83,7 @@ 
 	 */
 	public function standardComponentAction()
 	{
-		$response = $this->getOutput( 'checkout/standard' );
+		$response = $this->getOutput('checkout/standard');
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}
@@ -96,7 +96,7 @@ 
 	 */
 	public function updateComponentAction()
 	{
-		$response = $this->getOutput( 'checkout/update' );
+		$response = $this->getOutput('checkout/update');
 		$response->headers->set('Cache-Control', 'no-store');
 		return $response;
 	}

Tests/Controller/LocaleControllerTest.php

Spacing +5 added lines, -5 removed lines

@@ -10,14 +10,14 @@
 {
 	public function testSelectComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\LocaleController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\LocaleController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->selectComponentAction() );
+		$this->assertSame($response, $mock->selectComponentAction());
 	}
 }

Controller/CatalogController.php

Spacing +24 added lines, -24 removed lines

@@ -28,9 +28,9 @@ 
 	 */
 	public function countAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-count' );
-		$response = $this->render( 'AimeosShopBundle:Catalog:count.html.twig', $params )->setMaxAge( 300 );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$params = $this->get('aimeos_page')->getSections('catalog-count');
+		$response = $this->render('AimeosShopBundle:Catalog:count.html.twig', $params)->setMaxAge(300);
+		$response->headers->set('Content-Type', 'application/javascript');
 		return $response;
 	}
 
@@ -42,8 +42,8 @@ 
 	 */
 	public function detailAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-detail' );
-		return $this->render( 'AimeosShopBundle:Catalog:detail.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-detail');
+		return $this->render('AimeosShopBundle:Catalog:detail.html.twig', $params);
 	}
 
 
@@ -54,8 +54,8 @@ 
 	 */
 	public function listAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-list' );
-		return $this->render( 'AimeosShopBundle:Catalog:list.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('catalog-list');
+		return $this->render('AimeosShopBundle:Catalog:list.html.twig', $params);
 	}
 
 
@@ -66,9 +66,9 @@ 
 	 */
 	public function stockAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-stock' );
-		$response = $this->render( 'AimeosShopBundle:Catalog:stock.html.twig', $params )->setMaxAge( 30 );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$params = $this->get('aimeos_page')->getSections('catalog-stock');
+		$response = $this->render('AimeosShopBundle:Catalog:stock.html.twig', $params)->setMaxAge(30);
+		$response->headers->set('Content-Type', 'application/javascript');
 		return $response;
 	}
 
@@ -80,9 +80,9 @@ 
 	 */
 	public function suggestAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'catalog-suggest' );
-		$response = $this->render( 'AimeosShopBundle:Catalog:suggest.html.twig', $params );
-		$response->headers->set( 'Content-Type', 'application/json' );
+		$params = $this->get('aimeos_page')->getSections('catalog-suggest');
+		$response = $this->render('AimeosShopBundle:Catalog:suggest.html.twig', $params);
+		$response->headers->set('Content-Type', 'application/json');
 		return $response;
 	}
 
@@ -94,8 +94,8 @@ 
 	 */
 	public function countComponentAction()
 	{
-		$response = $this->getOutput( 'catalog/count' )->setMaxAge( 300 );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = $this->getOutput('catalog/count')->setMaxAge(300);
+		$response->headers->set('Content-Type', 'application/javascript');
 		return $response;
 	}
 
@@ -107,7 +107,7 @@ 
 	 */
 	public function detailComponentAction()
 	{
-		return $this->getOutput( 'catalog/detail' );
+		return $this->getOutput('catalog/detail');
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function filterComponentAction()
 	{
-		return $this->getOutput( 'catalog/filter' );
+		return $this->getOutput('catalog/filter');
 	}
 
 
@@ -129,7 +129,7 @@ 
 	 */
 	public function listComponentAction()
 	{
-		return $this->getOutput( 'catalog/lists' );
+		return $this->getOutput('catalog/lists');
 	}
 
 
@@ -140,7 +140,7 @@ 
 	 */
 	public function sessionComponentAction()
 	{
-		return $this->getOutput( 'catalog/session' );
+		return $this->getOutput('catalog/session');
 	}
 
 
@@ -151,7 +151,7 @@ 
 	 */
 	public function stageComponentAction()
 	{
-		return $this->getOutput( 'catalog/stage' );
+		return $this->getOutput('catalog/stage');
 	}
 
 
@@ -162,8 +162,8 @@ 
 	 */
 	public function stockComponentAction()
 	{
-		$response = $this->getOutput( 'catalog/stock' )->setMaxAge( 30 );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = $this->getOutput('catalog/stock')->setMaxAge(30);
+		$response->headers->set('Content-Type', 'application/javascript');
 		return $response;
 	}
 
@@ -175,8 +175,8 @@ 
 	 */
 	public function suggestComponentAction()
 	{
-		$response = $this->getOutput( 'catalog/suggest' );
-		$response->headers->set( 'Content-Type', 'application/json' );
+		$response = $this->getOutput('catalog/suggest');
+		$response->headers->set('Content-Type', 'application/json');
 		return $response;
 	}
 }

Service/Context.php

Spacing +57 added lines, -57 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -44,38 +44,38 @@ 
 	 * @param string $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->container->get( 'aimeos_config' )->get( $type );
+		$config = $this->container->get('aimeos_config')->get($type);
 
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
+			$context->setConfig($config);
 
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
-			$this->addProcess( $context);
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
+			$this->addProcess($context);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
-		$context->setConfig( $config );
+		$context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->container->get('aimeos_locale')->get( $context );
-			$context->setI18n( $this->container->get('aimeos_i18n')->get( array( $localeItem->getLanguageId() ) ) );
-			$context->setLocale( $localeItem );
+			$localeItem = $this->container->get('aimeos_locale')->get($context);
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($localeItem->getLanguageId())));
+			$context->setLocale($localeItem);
 		}
 
-		$this->addSession( $context );
-		$this->addUserGroups( $context);
+		$this->addSession($context);
+		$this->addUserGroups($context);
 
 		return $context;
 	}
@@ -87,11 +87,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
 
-		return $context->setCache( $cache );
+		return $context->setCache($cache);
 	}
 
 
@@ -101,11 +101,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
 
-		return $context->setDatabaseManager( $dbm );
+		return $context->setDatabaseManager($dbm);
 	}
 
 
@@ -115,11 +115,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig());
 
-		return $context->setFilesystemManager( $fs );
+		return $context->setFilesystemManager($fs);
 	}
 
 
@@ -129,11 +129,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
 
-		return $context->setLogger( $logger );
+		return $context->setLogger($logger);
 	}
 
 
@@ -144,12 +144,12 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$container = $this->container;
-		$mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } );
+		$mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } );
 
-		return $context->setMail( $mail );
+		return $context->setMail($mail);
 	}
 
 
@@ -159,11 +159,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
 
-		return $context->setMessageQueueManager( $mq );
+		return $context->setMessageQueueManager($mq);
 	}
 
 
@@ -173,16 +173,16 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addProcess( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addProcess(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$config = $context->getConfig();
-		$max = $config->get( 'pcntl_max', 4 );
-		$prio = $config->get( 'pcntl_priority', 19 );
+		$max = $config->get('pcntl_max', 4);
+		$prio = $config->get('pcntl_priority', 19);
 
-		$process = new \Aimeos\MW\Process\Pcntl( $max, $prio );
-		$process = new \Aimeos\MW\Process\Decorator\Check( $process );
+		$process = new \Aimeos\MW\Process\Pcntl($max, $prio);
+		$process = new \Aimeos\MW\Process\Decorator\Check($process);
 
-		return $context->setProcess( $process );
+		return $context->setProcess($process);
 	}
 
 
@@ -192,11 +192,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) );
+		$session = new \Aimeos\MW\Session\Symfony2($this->container->get('session'));
 
-		return $context->setSession( $session );
+		return $context->setSession($session);
 	}
 
 
@@ -206,29 +206,29 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addUserGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUserGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$username = '';
-		$token = $this->container->get( 'security.token_storage' )->getToken();
+		$token = $this->container->get('security.token_storage')->getToken();
 
-		if( is_object( $token ) && is_object( $token->getUser() ) && method_exists( $token->getUser(), 'getId' ) )
+		if (is_object($token) && is_object($token->getUser()) && method_exists($token->getUser(), 'getId'))
 		{
-			$username =  $token->getUser()->getUsername();
+			$username = $token->getUser()->getUsername();
 			$userid = $token->getUser()->getId();
-			$context->setUserId( $userid );
-			$context->setGroupIds( function() use ( $context, $userid )
+			$context->setUserId($userid);
+			$context->setGroupIds(function() use ($context, $userid)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-				return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+				$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+				return $manager->getItem($userid, array('customer/group'))->getGroups();
 			} );
 		}
 
-		if( $username === '' && $this->container->has( 'request_stack' )
-			&& ( $request = $this->container->get('request_stack')->getMasterRequest() ) !== null
+		if ($username === '' && $this->container->has('request_stack')
+			&& ($request = $this->container->get('request_stack')->getMasterRequest()) !== null
 		) {
 			$username = $request->getClientIp();
 		}
 
-		return $context->setEditor( $username );
+		return $context->setEditor($username);
 	}
 }

Controller/AdminController.php

Doc Comments +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 * Returns the initial HTML view for the admin interface.
 	 *
 	 * @param Request $request Symfony request object
-	 * @return Response Generated HTML page for the admin interface
+	 * @return \Symfony\Component\HttpFoundation\Response Generated HTML page for the admin interface
 	 */
 	public function indexAction( Request $request )
 	{
@@ -58,7 +58,7 @@ 
 	/**
 	 * Checks if the used is authenticated and has the admin role
 	 *
-	 * @param array $roles List of role names where at least one must match
+	 * @param string[] $roles List of role names where at least one must match
 	 * @return boolean True if authenticated and is admin, false if not
 	 */
 	protected function hasRole( array $roles )

Spacing +19 added lines, -19 removed lines

@@ -28,36 +28,36 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated HTML page for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( $this->hasRole( ['ROLE_ADMIN', 'ROLE_SUPER_ADMIN'] ) )
+		if ($this->hasRole(['ROLE_ADMIN', 'ROLE_SUPER_ADMIN']))
 		{
-			$context = $this->get( 'aimeos_context' )->get( false );
-			$user = $this->get( 'security.token_storage' )->getToken()->getUser();
-			$siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
-			$siteCode = ( $user->getSiteId() ? $siteManager->getItem( $user->getSiteId() )->getCode() : 'default' );
-			$locale = $user->getLanguageId() ?: $this->getParameter( 'locale' );
+			$context = $this->get('aimeos_context')->get(false);
+			$user = $this->get('security.token_storage')->getToken()->getUser();
+			$siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
+			$siteCode = ($user->getSiteId() ? $siteManager->getItem($user->getSiteId())->getCode() : 'default');
+			$locale = $user->getLanguageId() ?: $this->getParameter('locale');
 
 			$params = array(
 				'resource' => 'dashboard',
-				'site' => $request->attributes->get( 'site', $request->query->get( 'site', $siteCode ) ),
-				'lang' => $request->attributes->get( 'lang', $request->query->get( 'lang', $locale ) ),
+				'site' => $request->attributes->get('site', $request->query->get('site', $siteCode)),
+				'lang' => $request->attributes->get('lang', $request->query->get('lang', $locale)),
 			);
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
+			return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params));
 		}
 
 
-		$param = array( 'error' => '', 'username' => '' );
+		$param = array('error' => '', 'username' => '');
 
-		if( $this->has( 'security.authentication_utils' ) )
+		if ($this->has('security.authentication_utils'))
 		{
-			$auth = $this->get( 'security.authentication_utils' );
+			$auth = $this->get('security.authentication_utils');
 
 			$param['error'] = $auth->getLastAuthenticationError();
 			$param['username'] = $auth->getLastUsername();
 		}
 
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param );
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $param);
 	}
 
 
@@ -67,15 +67,15 @@ 
 	 * @param array $roles List of role names where at least one must match
 	 * @return boolean True if authenticated and is admin, false if not
 	 */
-	protected function hasRole( array $roles )
+	protected function hasRole(array $roles)
 	{
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken() )
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken())
 		{
-			$checker = $this->get( 'security.authorization_checker' );
+			$checker = $this->get('security.authorization_checker');
 
-			foreach( $roles as $role )
+			foreach ($roles as $role)
 			{
-				if( $checker->isGranted( $role ) ) {
+				if ($checker->isGranted($role)) {
 					return true;
 				}
 			}