aimeos / aimeos-symfony

Tests/Controller/CatalogControllerTest.php

Spacing +120 added lines, -120 removed lines

@@ -10,302 +10,302 @@
 	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 = $crawler->filter('.catalog-filter .btn-action')->form();
 		$values = $form->getPhpValues();
-		$values['f_attrid'] = array( $id );
-		$crawler = $client->request( $form->getMethod(), $form->getUri(), $values, $form->getPhpFiles() );
+		$values['f_attrid'] = array($id);
+		$crawler = $client->request($form->getMethod(), $form->getUri(), $values, $form->getPhpFiles());
 
-		$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);
 	}
 
 
 	public function testCountComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->countComponentAction() );
+		$this->assertEquals('test', $mock->countComponentAction());
 	}
 
 
 	public function testDetailComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->detailComponentAction() );
+		$this->assertEquals('test', $mock->detailComponentAction());
 	}
 
 
 	public function testFilterComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->filterComponentAction() );
+		$this->assertEquals('test', $mock->filterComponentAction());
 	}
 
 
 	public function testListComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->listComponentAction() );
+		$this->assertEquals('test', $mock->listComponentAction());
 	}
 
 
 	public function testSessionComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->sessionComponentAction() );
+		$this->assertEquals('test', $mock->sessionComponentAction());
 	}
 
 
 	public function testStageComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->stageComponentAction() );
+		$this->assertEquals('test', $mock->stageComponentAction());
 	}
 
 
 	public function testStockComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CatalogController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CatalogController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->stockComponentAction() );
+		$this->assertEquals('test', $mock->stockComponentAction());
 	}
 }

Controller/AccountController.php

Spacing +11 added lines, -11 removed lines

@@ -28,8 +28,8 @@ 
 	 */
 	public function indexAction()
 	{
-		$params = $this->get( 'aimeos_page' )->getSections( 'account-index' );
-		return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params );
+		$params = $this->get('aimeos_page')->getSections('account-index');
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params);
 	}
 
 
@@ -43,15 +43,15 @@ 
 		$context = $this->container->get('aimeos_context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get('aimeos_view')->create( $context, array(), $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos_view')->create($context, array(), $langid);
+		$context->setView($view);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, array(), 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, array(), 'account/download');
+		$client->setView($view);
 		$client->process();
 
 		$response = $view->response();
-		return new Response( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		return new Response((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
 	}
 
 
@@ -62,7 +62,7 @@ 
 	 */
 	public function favoriteComponentAction()
 	{
-		return $this->getOutput( 'account/favorite' );
+		return $this->getOutput('account/favorite');
 	}
 
 
@@ -73,7 +73,7 @@ 
 	 */
 	public function historyComponentAction()
 	{
-		return $this->getOutput( 'account/history' );
+		return $this->getOutput('account/history');
 	}
 
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function profileComponentAction()
 	{
-		return $this->getOutput( 'account/profile' );
+		return $this->getOutput('account/profile');
 	}
 
 
@@ -95,6 +95,6 @@ 
 	 */
 	public function watchComponentAction()
 	{
-		return $this->getOutput( 'account/watch' );
+		return $this->getOutput('account/watch');
 	}
 }

Tests/Controller/AccountControllerTest.php

Spacing +22 added lines, -22 removed lines

@@ -10,69 +10,69 @@
 	public function testAccount()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount' );
+		$client->request('GET', '/unittest/de/EUR/myaccount');
 
-		$this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() );
+		$this->assertContains('aimeos account-profile', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-history', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-watch', $client->getResponse()->getContent());
 	}
 
 
 	public function testDownload()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' );
+		$client->request('GET', '/unittest/de/EUR/myaccount/download/0');
 
-		$this->assertEquals( 401, $client->getResponse()->getStatusCode() );
+		$this->assertEquals(401, $client->getResponse()->getStatusCode());
 	}
 
 
 	public function testFavoriteComponent()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' );
+		$client->request('GET', '/unittest/de/EUR/test/favoritecomponent');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
 	}
 
 
 	public function testHistoryComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->historyComponentAction() );
+		$this->assertEquals('test', $mock->historyComponentAction());
 	}
 
 
 	public function testProfileComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->profileComponentAction() );
+		$this->assertEquals('test', $mock->profileComponentAction());
 	}
 
 
 	public function testWatchComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->watchComponentAction() );
+		$this->assertEquals('test', $mock->watchComponentAction());
 	}
 }

DependencyInjection/Configuration.php

Spacing +14 added lines, -14 removed lines

@@ -29,25 +29,25 @@
 	public function getConfigTreeBuilder()
 	{
 		$treeBuilder = new TreeBuilder();
-		$rootNode = $treeBuilder->root( 'aimeos_shop' );
+		$rootNode = $treeBuilder->root('aimeos_shop');
 
 		$rootNode
 			->children()
-				->booleanNode('disable_sites')->defaultValue( true )->end()
-				->booleanNode('apc_enable')->defaultValue( false )->end()
-				->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end()
+				->booleanNode('disable_sites')->defaultValue(true)->end()
+				->booleanNode('apc_enable')->defaultValue(false)->end()
+				->scalarNode('apc_prefix')->defaultValue('sf2:')->end()
 				->scalarNode('extdir')->end()
 				->scalarNode('uploaddir')->end()
-				->variableNode('admin')->defaultValue( array() )->end()
-				->variableNode('client')->defaultValue( array() )->end()
-				->variableNode('controller')->defaultValue( array() )->end()
-				->variableNode('i18n')->defaultValue( array() )->end()
-				->variableNode('madmin')->defaultValue( array() )->end()
-				->variableNode('mshop')->defaultValue( array() )->end()
-				->variableNode('resource')->defaultValue( array() )->end()
-				->variableNode('page')->defaultValue( array() )->end()
-				->variableNode('backend')->defaultValue( array() )->end()
-				->variableNode('frontend')->defaultValue( array() )->end()
+				->variableNode('admin')->defaultValue(array())->end()
+				->variableNode('client')->defaultValue(array())->end()
+				->variableNode('controller')->defaultValue(array())->end()
+				->variableNode('i18n')->defaultValue(array())->end()
+				->variableNode('madmin')->defaultValue(array())->end()
+				->variableNode('mshop')->defaultValue(array())->end()
+				->variableNode('resource')->defaultValue(array())->end()
+				->variableNode('page')->defaultValue(array())->end()
+				->variableNode('backend')->defaultValue(array())->end()
+				->variableNode('frontend')->defaultValue(array())->end()
 			->end()
 		;
 

Controller/JsonadmController.php

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, 'backend' );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context = $this->setLocale($context, $site, $lang);
 
-		$view = $this->get('aimeos_view')->create( $context, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context, $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;
 	}

Controller/ExtadmController.php

Spacing +71 added lines, -71 removed lines

@@ -30,63 +30,63 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated output for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
-		$lang = $request->attributes->get( 'lang', $request->query->get( 'lang', 'en' ) );
-		$tab = $request->attributes->get( 'tab', $request->query->get( 'tab', 0 ) );
+		$site = $request->attributes->get('site', $request->query->get('site', 'default'));
+		$lang = $request->attributes->get('lang', $request->query->get('lang', 'en'));
+		$tab = $request->attributes->get('tab', $request->query->get('tab', 0));
 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context = $this->setLocale($context, $site, $lang);
 
-		$aimeos = $this->get( 'aimeos' );
+		$aimeos = $this->get('aimeos');
 		$bootstrap = $aimeos->get();
 
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
+				$jsbAbsPath = $base.'/'.$path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' );
-		$adminUrl = $this->generateUrl( 'aimeos_shop_extadm', $params );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = $this->generateUrl('aimeos_shop_extadm', $params);
 
-		$token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue();
-		$jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) );
+		$token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue();
+		$jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site));
 
-		$jqadmUrl = $this->generateUrl( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) );
+		$jqadmUrl = $this->generateUrl('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product'));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
 			'languages' => $this->getJsonLanguages(),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => urldecode( $adminUrl ),
-			'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => urldecode($adminUrl),
+			'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'),
 			'version' => $aimeos->getVersion(),
 			'jqadmurl' => $jqadmUrl,
 			'activeTab' => $tab,
 		);
 
-		return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars );
+		return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars);
 	}
 
 
@@ -96,23 +96,23 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response JSON RPC message response
 	 */
-	public function doAction( Request $request )
+	public function doAction(Request $request)
 	{
 		$csrfProvider = $this->get('security.csrf.token_manager');
 
-		if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token',  $request->query->get( '_token' ) ) ) !== true ) {
-			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' );
+		if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) {
+			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid');
 		}
 
-		$cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' );
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context->setView( $this->get( 'aimeos_view' )->create( $context, array() ) );
-		$context = $this->setLocale( $context );
+		$cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs');
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context->setView($this->get('aimeos_view')->create($context, array()));
+		$context = $this->setLocale($context);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( $request->request->all(), $request->getContent() );
-		return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) );
+		$response = $controller->process($request->request->all(), $request->getContent());
+		return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response));
 	}
 
 
@@ -125,27 +125,27 @@ 
 	{
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = new Response($contents);
+		$response->headers->set('Content-Type', 'application/javascript');
 
 		return $response;
 	}
@@ -160,11 +160,11 @@ 
 	{
 		$result = array();
 
-		foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -174,10 +174,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -188,16 +188,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang );
+		$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang);
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -209,19 +209,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -233,17 +233,17 @@ 
 	 * @param string $locale 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, $sitecode = 'default', $locale = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

Controller/JqadmController.php

Spacing +53 added lines, -53 removed lines

@@ -29,35 +29,35 @@ 
 	 * @param $type File type, i.e. "css" or "js"
 	 * @return Response Response object
 	 */
-	public function fileAction( $type )
+	public function fileAction($type)
 	{
 		$contents = '';
 		$files = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
+		$response = new Response($contents);
 
-		if( $type === 'js' ) {
-			$response->headers->set( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->headers->set( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->headers->set('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->headers->set('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -72,10 +72,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function copyAction( Request $request, $resource, $site = 'default' )
+	public function copyAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->copy() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -87,10 +87,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function createAction( Request $request, $resource, $site = 'default' )
+	public function createAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->create() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -102,10 +102,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->delete().$cntl->search());
 	}
 
 
@@ -117,10 +117,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->get() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -132,10 +132,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function saveAction( Request $request, $resource, $site = 'default' )
+	public function saveAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -147,10 +147,10 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function searchAction( Request $request, $resource, $site = 'default' )
+	public function searchAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -162,20 +162,20 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
-	protected function createClient( Request $request, $site, $resource )
+	protected function createClient(Request $request, $site, $resource)
 	{
-		$lang = $request->get( 'lang', 'en' );
+		$lang = $request->get('lang', 'en');
 
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context = $this->setLocale($context, $site, $lang);
 
-		$view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -185,12 +185,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return Response View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		$version = $this->get( 'aimeos' )->getVersion();
-		$content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content );
+		$version = $this->get('aimeos')->getVersion();
+		$content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content);
 
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 
 
@@ -202,23 +202,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, 'en' ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
 
 		return $context;
 	}

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( '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'),
 		);
 
-		$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;

Command/JobsCommand.php

Spacing +37 added lines, -37 removed lines

@@ -29,19 +29,19 @@ 
 	protected function configure()
 	{
 		$names = '';
-		$aimeos = new \Aimeos\Bootstrap( array() );
-		$cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' );
-		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers( $this->getBareContext(), $aimeos, $cntlPaths );
+		$aimeos = new \Aimeos\Bootstrap(array());
+		$cntlPaths = $aimeos->getCustomPaths('controller/jobs');
+		$controllers = \Aimeos\Controller\Jobs\Factory::getControllers($this->getBareContext(), $aimeos, $cntlPaths);
 
-		foreach( $controllers as $key => $controller ) {
-			$names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL;
+		foreach ($controllers as $key => $controller) {
+			$names .= str_pad($key, 30).$controller->getName().PHP_EOL;
 		}
 
-		$this->setName( 'aimeos:jobs' );
-		$this->setDescription( 'Executes the job controllers' );
-		$this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' );
-		$this->setHelp( "Available jobs are:\n" . $names );
+		$this->setName('aimeos:jobs');
+		$this->setDescription('Executes the job controllers');
+		$this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)');
+		$this->setHelp("Available jobs are:\n".$names);
 	}
 
 
@@ -51,23 +51,23 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$context = $this->getContext();
-		$aimeos = $this->getContainer()->get( 'aimeos' )->get();
+		$aimeos = $this->getContainer()->get('aimeos')->get();
 
-		$jobs = explode( ' ', $input->getArgument( 'jobs' ) );
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$jobs = explode(' ', $input->getArgument('jobs'));
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
 
-		foreach( $this->getSiteItems( $context, $input ) as $siteItem )
+		foreach ($this->getSiteItems($context, $input) as $siteItem)
 		{
-			$localeItem = $localeManager->bootstrap( $siteItem->getCode(), 'en', '', false );
-			$context->setLocale( $localeItem );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), 'en', '', false);
+			$context->setLocale($localeItem);
 
-			$output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) );
+			$output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode()));
 
-			foreach( $jobs as $jobname ) {
-				\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
+			foreach ($jobs as $jobname) {
+				\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
 			}
 		}
 	}
@@ -82,15 +82,15 @@ 
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), array() );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), array());
+		$ctx->setConfig($conf);
 
-		$locale = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' )->createItem();
-		$locale->setLanguageId( 'en' );
-		$ctx->setLocale( $locale );
+		$locale = \Aimeos\MShop\Factory::createManager($ctx, 'locale')->createItem();
+		$locale->setLanguageId('en');
+		$ctx->setLocale($locale);
 
-		$i18n = new \Aimeos\MW\Translation\None( 'en' );
-		$ctx->setI18n( array( 'en' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('en');
+		$ctx->setI18n(array('en' => $i18n));
 
 		return $ctx;
 	}
@@ -105,19 +105,19 @@ 
 	{
 		$container = $this->getContainer();
 		$aimeos = $container->get('aimeos')->get();
-		$context = $container->get( 'aimeos_context' )->get( false, 'backend' );
+		$context = $container->get('aimeos_context')->get(false, 'backend');
 
-		$tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' );
-		$tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) );
-		$view = $container->get('aimeos_view')->create( $context, $tmplPaths );
+		$tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates');
+		$tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates'));
+		$view = $container->get('aimeos_view')->create($context, $tmplPaths);
 
-		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' );
-		$langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) );
-		$i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids );
+		$langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language');
+		$langids = array_keys($langManager->searchItems($langManager->createSearch(true)));
+		$i18n = $this->getContainer()->get('aimeos_i18n')->get($langids);
 
-		$context->setEditor( 'aimeos:jobs' );
-		$context->setView( $view );
-		$context->setI18n( $i18n );
+		$context->setEditor('aimeos:jobs');
+		$context->setView($view);
+		$context->setI18n($i18n);
 
 		return $context;
 	}