aimeos / aimeos-symfony

Tests/Entity/FosUserTest.php

Spacing +45 added lines, -45 removed lines

@@ -17,144 +17,144 @@
 
 	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());
 	}
 
 
 	public function testSetWebsiteInvalid()
 	{
-		$this->setExpectedException( 'Exception' );
-		$this->object->setWebsite( 'aimeos+org' );
+		$this->setExpectedException('Exception');
+		$this->object->setWebsite('aimeos+org');
 	}
 }

Tests/Controller/BasketControllerTest.php

Spacing +81 added lines, -81 removed lines

@@ -11,17 +11,17 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket-standard')->count());
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(1, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 	}
 
 
@@ -29,18 +29,18 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
 		$form['b_prod[0][quantity]'] = 2;
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 2, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket-standard')->count());
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(2, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 	}
 
 
@@ -48,26 +48,26 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(1, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 
 
-		$link = $crawler->filter( '.basket-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 2, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(2, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 	}
 
 
@@ -75,19 +75,19 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
 
-		$link = $crawler->filter( '.basket-standard .product .action .change' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .action .change')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 0, $crawler->filter( '.basket-standard .product' )->count() );
+		$this->assertEquals(0, $crawler->filter('.basket-standard .product')->count());
 	}
 
 
@@ -95,25 +95,25 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
 
-		$link = $crawler->filter( '.basket-standard .product .quantity .change' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .quantity .change')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 2, $crawler->filter( '.basket-standard .product .quantity .value' )->attr( 'value' ) );
+		$this->assertEquals(2, $crawler->filter('.basket-standard .product .quantity .value')->attr('value'));
 
 
-		$link = $crawler->filter( '.basket-standard .product .quantity .change' )->eq( 0 )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .quantity .change')->eq(0)->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard .product .quantity .value' )->attr( 'value' ) );
+		$this->assertEquals(1, $crawler->filter('.basket-standard .product .quantity .value')->attr('value'));
 	}
 
 
@@ -121,20 +121,20 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
 
-		$form = $crawler->filter( '.basket-standard .btn-update' )->form();
+		$form = $crawler->filter('.basket-standard .btn-update')->form();
 		$form['b_prod[0][quantity]'] = 3;
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 3, $crawler->filter( '.basket-standard .product .quantity .value' )->attr( 'value' ) );
+		$this->assertEquals(3, $crawler->filter('.basket-standard .product .quantity .value')->attr('value'));
 	}
 
 
@@ -142,26 +142,26 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
 
-		$form = $crawler->filter( '.basket-standard-coupon .coupon-new button' )->form();
+		$form = $crawler->filter('.basket-standard-coupon .coupon-new button')->form();
 		$form['b_coupon'] = '90AB';
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard .product:contains("Geldwerter Nachlass")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-standard .product:contains("Geldwerter Nachlass")')->count());
 
 
-		$link = $crawler->filter( '.basket-standard-coupon .change' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard-coupon .change')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard .product' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-standard .product')->count());
 	}
 
 
@@ -169,15 +169,15 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-related-bought .bought-item' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-related-bought .bought-item')->count());
 	}
 
 
@@ -185,17 +185,17 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$link = $crawler->filter( '.basket-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail .product:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail .product:contains("Unittest: Bundle")')->count());
 	}
 }

Tests/Controller/PageControllerTest.php

Spacing +4 added lines, -4 removed lines

@@ -10,17 +10,17 @@
 	public function testTerms()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/terms' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/terms');
 
-		$this->assertEquals( 1, $crawler->filter( 'body:contains("Terms")' )->count() );
+		$this->assertEquals(1, $crawler->filter('body:contains("Terms")')->count());
 	}
 
 
 	public function testPrivacy()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/privacy' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/privacy');
 
-		$this->assertEquals( 1, $crawler->filter( 'body:contains("Privacy")' )->count() );
+		$this->assertEquals(1, $crawler->filter('body:contains("Privacy")')->count());
 	}
 }

Tests/Controller/CatalogControllerTest.php

Spacing +92 added lines, -92 removed lines

@@ -10,210 +10,210 @@
 	public function testCount()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/count' );
+		$client->request('GET', '/unittest/de/EUR/count');
 		$content = $client->getResponse()->getContent();
 
-		$this->assertContains( '".catalog-filter-count li.cat-item"', $content );
-		$this->assertContains( '".catalog-filter-attribute .attribute-lists li.attr-item"', $content );
+		$this->assertContains('".catalog-filter-count li.cat-item"', $content);
+		$this->assertContains('".catalog-filter-attribute .attribute-lists li.attr-item"', $content);
 	}
 
 
 	public function testFilterSearch()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-filter-search' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-filter-search')->count());
 
-		$form = $crawler->filter( '.catalog-filter-search button' )->form();
+		$form = $crawler->filter('.catalog-filter-search button')->form();
 		$form['f_search'] = 'Unit';
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Test Selection")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Empty Selection")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Test Selection")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Empty Selection")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->count());
 	}
 
 
  	public function testFilterTree()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-filter-tree' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-filter-tree')->count());
 
-		$link = $crawler->filter( '.catalog-filter-tree a.cat-item' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-filter-tree a.cat-item')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-filter-tree .categories a.cat-item' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-filter-tree .categories a.cat-item')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-filter-tree .coffee a.cat-item' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-filter-tree .coffee a.cat-item')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 3, $crawler->filter( '.catalog-stage-breadcrumb li' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-promo .product a:contains("Cafe Noire Expresso")' )->count() );
+		$this->assertEquals(3, $crawler->filter('.catalog-stage-breadcrumb li')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-promo .product a:contains("Cafe Noire Expresso")')->count());
 	}
 
 
 	public function testFilterAttribute()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-filter-attribute' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-filter-attribute')->count());
 
-		$nodes = $crawler->filter( '.catalog-filter-attribute .attr-size span:contains("XS")' );
-		$id = $nodes->parents()->filter( '.attr-item' )->attr( 'data-id');
+		$nodes = $crawler->filter('.catalog-filter-attribute .attr-size span:contains("XS")');
+		$id = $nodes->parents()->filter('.attr-item')->attr('data-id');
 
-		$form = $crawler->filter( '.catalog-filter .btn-action' )->form();
-		$form['f_attrid'] = array( $id => 'xs' );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-filter .btn-action')->form();
+		$form['f_attrid'] = array($id => 'xs');
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Cappuccino")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Cappuccino")')->count());
 	}
 
 
 	public function testStageBreadcrumb()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-stage-breadcrumb li' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-stage-breadcrumb li')->count());
 
-		$link = $crawler->filter( '.catalog-stage-breadcrumb a' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-stage-breadcrumb a')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Cappuccino")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-list')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Cappuccino")')->count());
 	}
 
 
 	public function testStageNavigator()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-name' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-name')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Bundle")')->count());
 
-		$link = $crawler->filter( '.catalog-stage-navigator a.next' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-stage-navigator a.next')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Empty Selection")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Empty Selection")')->count());
 
-		$link = $crawler->filter( '.catalog-stage-navigator a.prev' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-stage-navigator a.prev')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Bundle")')->count());
 	}
 
 
 	public function testListSortationName()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-name' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-name')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
-		$this->assertEquals( 1, $products->eq( 1 )->filter( 'h2:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 1, $products->eq( 2 )->filter( 'h2:contains("Unittest: Empty Selection")' )->count() );
+		$products = $crawler->filter('.catalog-list-items .product');
+		$this->assertEquals(1, $products->eq(1)->filter('h2:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(1, $products->eq(2)->filter('h2:contains("Unittest: Empty Selection")')->count());
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-name' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-name')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
+		$products = $crawler->filter('.catalog-list-items .product');
 		$count = $products->count();
 
-		$this->assertGreaterThan( 2, $count );
-		$this->assertEquals( 1, $products->eq( $count - 3 )->filter( 'h2:contains("Unittest: Empty Selection")' )->count() );
-		$this->assertEquals( 1, $products->eq( $count - 2 )->filter( 'h2:contains("Unittest: Bundle")' )->count() );
+		$this->assertGreaterThan(2, $count);
+		$this->assertEquals(1, $products->eq($count - 3)->filter('h2:contains("Unittest: Empty Selection")')->count());
+		$this->assertEquals(1, $products->eq($count - 2)->filter('h2:contains("Unittest: Bundle")')->count());
 	}
 
 
 	public function testListSortationPrice()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-price' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-price')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
+		$products = $crawler->filter('.catalog-list-items .product');
 		$count = $products->count();
 
-		$this->assertGreaterThan( 2, $count );
-		$this->assertEquals( 1, $products->eq( $count - 2 )->filter( '.value:contains("600.00 €")' )->count() );
-		$this->assertEquals( 1, $products->eq( $count - 1 )->filter( '.value:contains("600.00 €")' )->count() );
+		$this->assertGreaterThan(2, $count);
+		$this->assertEquals(1, $products->eq($count - 2)->filter('.value:contains("600.00 €")')->count());
+		$this->assertEquals(1, $products->eq($count - 1)->filter('.value:contains("600.00 €")')->count());
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-price' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-price')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
-		$this->assertEquals( 1, $products->eq( 0 )->filter( '.value:contains("600.00 €")' )->count() );
-		$this->assertEquals( 1, $products->eq( 1 )->filter( '.value:contains("600.00 €")' )->count() );
+		$products = $crawler->filter('.catalog-list-items .product');
+		$this->assertEquals(1, $products->eq(0)->filter('.value:contains("600.00 €")')->count());
+		$this->assertEquals(1, $products->eq(1)->filter('.value:contains("600.00 €")')->count());
 	}
 
 
 	public function testDetailPinned()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-detail a.actions-button-pin' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-detail a.actions-button-pin')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-session-pinned .pinned-item' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-session-pinned .pinned-item')->count());
 	}
 
 
 	public function testDetailLastSeen()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-session-seen .seen-item' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-session-seen .seen-item')->count());
 	}
 
 
 	public function testSuggest()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/suggest', array( 'f_search' => 'unit' ) );
+		$client->request('GET', '/unittest/de/EUR/suggest', array('f_search' => 'unit'));
 		$content = $client->getResponse()->getContent();
 
-		$this->assertStringStartsWith( '[{', $content );
+		$this->assertStringStartsWith('[{', $content);
 	}
 
 
 	public function testStock()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/stock' );
+		$client->request('GET', '/unittest/de/EUR/stock');
 		$content = $client->getResponse()->getContent();
 
-		$this->assertContains( '.aimeos .product .stock', $content );
-		$this->assertContains( '.aimeos .catalog-detail-basket', $content );
+		$this->assertContains('.aimeos .product .stock', $content);
+		$this->assertContains('.aimeos .catalog-detail-basket', $content);
 	}
 }

Tests/Command/SetupCommandTest.php

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\SetupCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\SetupCommand());
 
-		$command = $application->find( 'aimeos:setup' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0' ) );
+		$command = $application->find('aimeos:setup');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0'));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 }

Service/Page.php

Spacing +11 added lines, -11 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,23 +40,23 @@ 
 	 * @param string $pageName Name of the configured page
 	 * @return array Associative list with body and header output separated by client name
 	 */
-	public function getSections( $pageName )
+	public function getSections($pageName)
 	{
 		$context = $this->container->get('aimeos_context')->get();
-		$pagesConfig = $this->container->getParameter( 'aimeos_shop.page' );
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
+		$pagesConfig = $this->container->getParameter('aimeos_shop.page');
+		$result = array('aibody' => array(), 'aiheader' => array());
 
 		$langid = $context->getLocale()->getLanguageId();
-		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths( 'client/html/templates' );
-		$view = $this->container->get('aimeos_view')->create( $context->getConfig(), $tmplPaths, $langid );
-		$context->setView( $view );
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/templates');
+		$view = $this->container->get('aimeos_view')->create($context->getConfig(), $tmplPaths, $langid);
+		$context->setView($view);
 
-		if( isset( $pagesConfig[$pageName] ) )
+		if (isset($pagesConfig[$pageName]))
 		{
-			foreach( (array) $pagesConfig[$pageName] as $clientName )
+			foreach ((array) $pagesConfig[$pageName] as $clientName)
 			{
-				$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
-				$client->setView( clone $view );
+				$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+				$client->setView(clone $view);
 				$client->process();
 
 				$result['aibody'][$clientName] = $client->getBody();

Service/View.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 
 			$i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}

Spacing +31 added lines, -31 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param RequestStack $requestStack Current request stack
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( RequestStack $requestStack, Container $container )
+	public function __construct(RequestStack $requestStack, Container $container)
 	{
 		$this->requestStack = $requestStack;
 		$this->container = $container;
@@ -47,57 +47,57 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null)
 	{
 		$params = $fixed = array();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' );
+			$params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params');
 			$fixed = $this->getFixedParams();
 
-			$i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) );
+			$i18n = $this->container->get('aimeos_i18n')->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
 
-		$view = new \Aimeos\MW\View\Standard( $templatePaths );
+		$view = new \Aimeos\MW\View\Standard($templatePaths);
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed);
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
-		$sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' );
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 );
-		$view->addHelper( 'number', $helper );
+		$sepDec = $config->get('client/html/common/format/seperatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/seperator1000', ' ');
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000);
+		$view->addHelper('number', $helper);
 
-		if( $request !== null )
+		if ($request !== null)
 		{
-			$helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request );
-			$view->addHelper( 'request', $helper );
+			$helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request);
+			$view->addHelper('request', $helper);
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view);
+		$view->addHelper('response', $helper);
 
-		$token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' );
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() );
-		$view->addHelper( 'csrf', $helper );
+		$token = $this->container->get('security.csrf.token_manager')->getToken('_token');
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -113,15 +113,15 @@ 
 		$urlparams = array();
 		$attr = $this->requestStack->getMasterRequest()->attributes;
 
-		if( ( $site = $attr->get( 'site' ) ) !== null ) {
+		if (($site = $attr->get('site')) !== null) {
 			$urlparams['site'] = $site;
 		}
 
-		if( ( $lang = $attr->get( 'locale' ) ) !== null ) {
+		if (($lang = $attr->get('locale')) !== null) {
 			$urlparams['locale'] = $lang;
 		}
 
-		if( ( $currency = $attr->get( 'currency' ) ) !== null ) {
+		if (($currency = $attr->get('currency')) !== null) {
 			$urlparams['currency'] = $currency;
 		}
 

Service/Context.php

Braces +1 added lines, -2 removed lines

@@ -107,8 +107,7 @@
 
 		if( $this->container->has( 'security.token_storage' ) ) {
 			$token = $this->container->get( 'security.token_storage' )->getToken();
-		}
-		else if( $this->container->has( 'security.context' ) ) {
+		} else if( $this->container->has( 'security.context' ) ) {
 			$token = $this->container->get( 'security.context' )->getToken();
 		}
 

Spacing +58 added lines, -58 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param RequestStack $requestStack Current request stack
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( RequestStack $requestStack, Container $container )
+	public function __construct(RequestStack $requestStack, Container $container)
 	{
 		$this->requestStack = $requestStack;
 		$this->container = $container;
@@ -47,52 +47,52 @@ 
 	 * @param boolean $locale True to add locale object to context, false if not
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true )
+	public function get($locale = true)
 	{
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
 
 			$config = $this->getConfig();
-			$context->setConfig( $config );
+			$context->setConfig($config);
 
-			$dbm = new \Aimeos\MW\DB\Manager\PDO( $config );
-			$context->setDatabaseManager( $dbm );
+			$dbm = new \Aimeos\MW\DB\Manager\PDO($config);
+			$context->setDatabaseManager($dbm);
 
-			$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $config );
-			$context->setFilesystemManager( $fs );
+			$fs = new \Aimeos\MW\Filesystem\Manager\Standard($config);
+			$context->setFilesystemManager($fs);
 
-			$mq = new \Aimeos\MW\MQueue\Manager\Standard( $config );
-			$context->setMessageQueueManager( $mq );
+			$mq = new \Aimeos\MW\MQueue\Manager\Standard($config);
+			$context->setMessageQueueManager($mq);
 
 			$container = $this->container;
-			$mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } );
-			$context->setMail( $mail );
+			$mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } );
+			$context->setMail($mail);
 
-			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-			$context->setLogger( $logger );
+			$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+			$context->setLogger($logger);
 
-			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-			$context->setCache( $cache );
+			$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+			$context->setCache($cache);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->getLocale( $context );
+			$localeItem = $this->getLocale($context);
 			$langid = $localeItem->getLanguageId();
 
-			$context->setLocale( $localeItem );
-			$context->setI18n( $this->container->get('aimeos_i18n')->get( array( $langid ) ) );
+			$context->setLocale($localeItem);
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($langid)));
 		}
 
-		$session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) );
-		$context->setSession( $session );
+		$session = new \Aimeos\MW\Session\Symfony2($this->container->get('session'));
+		$context->setSession($session);
 
-		$this->addUser( $context );
+		$this->addUser($context);
 
 		return $context;
 	}
@@ -103,39 +103,39 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	protected function addUser( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUser(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$token = null;
 		$username = '';
 
-		if( $this->container->has( 'security.token_storage' ) ) {
-			$token = $this->container->get( 'security.token_storage' )->getToken();
+		if ($this->container->has('security.token_storage')) {
+			$token = $this->container->get('security.token_storage')->getToken();
 		}
-		else if( $this->container->has( 'security.context' ) ) {
-			$token = $this->container->get( 'security.context' )->getToken();
+		else if ($this->container->has('security.context')) {
+			$token = $this->container->get('security.context')->getToken();
 		}
 
-		if( is_object( $token ) )
+		if (is_object($token))
 		{
-			if( method_exists( $token->getUser(), 'getId' ) )
+			if (method_exists($token->getUser(), 'getId'))
 			{
 				$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( is_object( $token->getUser() ) ) {
-				$username =  $token->getUser()->getUsername();
+			if (is_object($token->getUser())) {
+				$username = $token->getUser()->getUsername();
 			} else {
 				$username = $token->getUser();
 			}
 		}
 
-		$context->setEditor( $username );
+		$context->setEditor($username);
 	}
 
 
@@ -146,27 +146,27 @@ 
 	 */
 	protected function getConfig()
 	{
-		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths( 'mysql' );
+		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths('mysql');
 
-		$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( 'apc_store' ) === true && $apc === true ) {
-			$conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix );
+		if (function_exists('apc_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'),
 		);
 
-		return new \Aimeos\MW\Config\Decorator\Memory( $conf, $local );
+		return new \Aimeos\MW\Config\Decorator\Memory($conf, $local);
 	}
 
 
@@ -176,19 +176,19 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	protected function getLocale( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getLocale(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$status = $this->container->getParameter( 'aimeos_shop.disable_sites' );
+			$status = $this->container->getParameter('aimeos_shop.disable_sites');
 			$attr = $this->requestStack->getMasterRequest()->attributes;
 
-			$site = $attr->get( 'site', 'default' );
-			$lang = $attr->get( 'locale', '' );
-			$currency = $attr->get( 'currency', '' );
+			$site = $attr->get('site', 'default');
+			$lang = $attr->get('locale', '');
+			$currency = $attr->get('currency', '');
 
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
 		}
 
 		return $this->locale;

Controller/JsonadmController.php

Braces +1 added lines, -2 removed lines

@@ -210,8 +210,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

Spacing +45 added lines, -45 removed lines

@@ -31,15 +31,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->delete( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->delete($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -51,15 +51,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->get( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->get($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -71,15 +71,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function patchAction( Request $request, $resource, $site = 'default' )
+	public function patchAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->patch( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->patch($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -91,15 +91,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function postAction( Request $request, $resource, $site = 'default' )
+	public function postAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->post( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->post($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -111,15 +111,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function putAction( Request $request, $resource, $site = 'default' )
+	public function putAction(Request $request, $resource, $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->put( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->put($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -131,15 +131,15 @@ 
 	 * @param string $site Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
-	public function optionsAction( Request $request, $resource = '', $site = 'default' )
+	public function optionsAction(Request $request, $resource = '', $site = 'default')
 	{
 		$status = 500;
 		$header = $request->headers->all();
 
-		$client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) );
-		$result = $client->options( $request->getContent(), $header, $status );
+		$client = $this->createClient($site, $resource, $request->get('lang', 'en'));
+		$result = $client->options($request->getContent(), $header, $status);
 
-		return $this->createResponse( $result, $status, $header );
+		return $this->createResponse($result, $status, $header);
 	}
 
 
@@ -151,18 +151,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createClient( $site, $resource, $lang )
+	protected function createClient($site, $resource, $lang)
 	{
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$context = $this->get( 'aimeos_context' )->get( false );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$view = $this->get('aimeos_view')->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -174,14 +174,14 @@ 
 	 * @param array $header List of HTTP headers
 	 * @return Response HTTP response object
 	 */
-	protected function createResponse( $content, $status, array $header )
+	protected function createResponse($content, $status, array $header)
 	{
 		$response = new Response();
-		$response->setContent( $content );
-		$response->setStatusCode( $status );
+		$response->setContent($content);
+		$response->setStatusCode($status);
 
-		foreach( $header as $key => $value ) {
-			$response->headers->set( $key, $value );
+		foreach ($header as $key => $value) {
+			$response->headers->set($key, $value);
 		}
 
 		return $response;
@@ -196,23 +196,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site, $lang )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site, $lang)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( $this->get('aimeos_i18n')->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang)));
 
 		return $context;
 	}