aimeos / aimeos-symfony

Controller/CheckoutController.php

Spacing +9 added lines, -9 removed lines

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

Tests/Controller/LocaleControllerTest.php

Spacing +5 added lines, -5 removed lines

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

Tests/Controller/BasketControllerTest.php

Spacing +96 added lines, -96 removed lines

@@ -12,17 +12,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'));
 	}
 
 
@@ -30,18 +30,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'));
 	}
 
 
@@ -49,26 +49,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'));
 	}
 
 
@@ -76,19 +76,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 .delete' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .action .delete')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 0, $crawler->filter( '.basket-standard .product' )->count() );
+		$this->assertEquals(0, $crawler->filter('.basket-standard .product')->count());
 	}
 
 
@@ -96,25 +96,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'));
 	}
 
 
@@ -122,20 +122,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'));
 	}
 
 
@@ -143,26 +143,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());
 	}
 
 
@@ -170,15 +170,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 .product' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-related-bought .product')->count());
 	}
 
 
@@ -186,59 +186,59 @@ 
 	{
 		$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());
 	}
 
 
 	public function testMiniComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\BasketController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\BasketController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->miniComponentAction() );
+		$this->assertSame($response, $mock->miniComponentAction());
 	}
 
 
 	public function testRelatedComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\BasketController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\BasketController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->relatedComponentAction() );
+		$this->assertSame($response, $mock->relatedComponentAction());
 	}
 
 
 	public function testStandardComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\BasketController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\BasketController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->standardComponentAction() );
+		$this->assertSame($response, $mock->standardComponentAction());
 	}
 }

Tests/Controller/CatalogControllerTest.php

Spacing +127 added lines, -127 removed lines

@@ -11,309 +11,309 @@
 	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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->countComponentAction() );
+		$this->assertSame($response, $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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->detailComponentAction() );
+		$this->assertSame($response, $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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->filterComponentAction() );
+		$this->assertSame($response, $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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->listComponentAction() );
+		$this->assertSame($response, $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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->sessionComponentAction() );
+		$this->assertSame($response, $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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->stageComponentAction() );
+		$this->assertSame($response, $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();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->stockComponentAction() );
+		$this->assertSame($response, $mock->stockComponentAction());
 	}
 }

Tests/Controller/CheckoutControllerTest.php

Spacing +159 added lines, -159 removed lines

@@ -13,66 +13,66 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$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-action' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-action')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .current:contains("Adresse")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .basket a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .address a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .delivery a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .payment a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .summary a' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .current:contains("Adresse")')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .basket a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .address a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .delivery a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .payment a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .summary a')->count());
 
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['ca_billingoption']->select( $crawler->filter( '.checkout-standard-address .item-address input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['ca_billingoption']->select($crawler->filter('.checkout-standard-address .item-address input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .basket a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .address a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .current:contains("Versand")' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .delivery a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .payment a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .summary a' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .basket a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .address a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .current:contains("Versand")')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .delivery a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .payment a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .summary a')->count());
 
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_deliveryoption']->select( $crawler->filter( '.checkout-standard-delivery .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_deliveryoption']->select($crawler->filter('.checkout-standard-delivery .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .basket a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .address a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .delivery a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .current:contains("Zahlung")' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .payment a' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .summary a' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .basket a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .address a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .delivery a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .current:contains("Zahlung")')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .payment a')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .summary a')->count());
 
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_paymentoption']->select( $crawler->filter( '.checkout-standard-payment .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_paymentoption']->select($crawler->filter('.checkout-standard-payment .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .basket a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .address a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .delivery a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .payment a' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard .steps .current:contains("Übersicht")' )->count() );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps .summary a' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .basket a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .address a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .delivery a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .payment a')->count());
+		$this->assertEquals(1, $crawler->filter('.checkout-standard .steps .current:contains("Übersicht")')->count());
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps .summary a')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .steps .basket a' )->link();
-		$crawler = $client->click( $link );
-		$this->assertEquals( 0, $crawler->filter( '.checkout-standard .steps' )->count() );
+		$link = $crawler->filter('.checkout-standard .steps .basket a')->link();
+		$crawler = $client->click($link);
+		$this->assertEquals(0, $crawler->filter('.checkout-standard .steps')->count());
 	}
 
 
@@ -81,47 +81,47 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$crawler = $this->_goToSummary( $client );
+		$crawler = $this->_goToSummary($client);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-payment' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-payment')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-delivery' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-delivery')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-address' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-address')->count());
 
 
-		$form = $crawler->filter( '.checkout-standard .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-delivery' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-delivery')->count());
 
 
-		$form = $crawler->filter( '.checkout-standard .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-payment' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-payment')->count());
 
 
-		$form = $crawler->filter( '.checkout-standard .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 	}
 
 
@@ -130,17 +130,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$crawler = $this->_goToSummary( $client );
+		$crawler = $this->_goToSummary($client);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .common-summary-address .payment .modify' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .common-summary-address .payment .modify')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-address' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-address')->count());
 	}
 
 
@@ -149,17 +149,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$crawler = $this->_goToSummary( $client );
+		$crawler = $this->_goToSummary($client);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .common-summary-address .delivery .modify' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .common-summary-address .delivery .modify')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-address' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-address')->count());
 	}
 
 
@@ -168,17 +168,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$crawler = $this->_goToSummary( $client );
+		$crawler = $this->_goToSummary($client);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .common-summary-service .delivery .modify' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .common-summary-service .delivery .modify')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-delivery' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-delivery')->count());
 	}
 
 
@@ -187,17 +187,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$crawler = $this->_goToSummary( $client );
+		$crawler = $this->_goToSummary($client);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .common-summary-service .payment .modify' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .common-summary-service .payment .modify')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-payment' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-payment')->count());
 	}
 
 
@@ -206,17 +206,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$crawler = $this->_goToSummary( $client );
+		$crawler = $this->_goToSummary($client);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
-		$link = $crawler->filter( '.checkout-standard .common-summary-detail .modify' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.checkout-standard .common-summary-detail .modify')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-standard')->count());
 	}
 
 
@@ -225,51 +225,51 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$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-action' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-action')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['ca_billingoption']->select( $crawler->filter( '.checkout-standard-address .item-address input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['ca_billingoption']->select($crawler->filter('.checkout-standard-address .item-address input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_deliveryoption']->select( $crawler->filter( '.checkout-standard-delivery .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_deliveryoption']->select($crawler->filter('.checkout-standard-delivery .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$payId = $crawler->filter( '.checkout-standard-payment .item-service' )->eq( 1 )->filter( 'input' )->attr( 'value' );
-		$form['c_paymentoption']->select( $payId );
-		$form['c_payment[' . $payId . '][directdebit.accountowner]'] = 'test user';
-		$form['c_payment[' . $payId . '][directdebit.accountno]'] = '12345';
-		$form['c_payment[' . $payId . '][directdebit.bankcode]'] = '67890';
-		$form['c_payment[' . $payId . '][directdebit.bankname]'] = 'test bank';
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$payId = $crawler->filter('.checkout-standard-payment .item-service')->eq(1)->filter('input')->attr('value');
+		$form['c_paymentoption']->select($payId);
+		$form['c_payment['.$payId.'][directdebit.accountowner]'] = 'test user';
+		$form['c_payment['.$payId.'][directdebit.accountno]'] = '12345';
+		$form['c_payment['.$payId.'][directdebit.bankcode]'] = '67890';
+		$form['c_payment['.$payId.'][directdebit.bankname]'] = 'test bank';
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-standard-summary' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-standard-summary')->count());
 
 
 		// Test if T&C are not accepted
-		$form = $crawler->filter( '.checkout-standard .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard .btn-action' )->form();
+		$form = $crawler->filter('.checkout-standard .btn-action')->form();
 		$form['cs_option_terms_value']->tick();
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.checkout-confirm' )->count() );
+		$this->assertEquals(1, $crawler->filter('.checkout-confirm')->count());
 	}
 
 
@@ -277,51 +277,51 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'GET', '/unittest/de/EUR/update' );
+		$client->request('GET', '/unittest/de/EUR/update');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
 	}
 
 
 	public function testConfirmComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CheckoutController' )
-		->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CheckoutController')
+		->setMethods(array('getOutput'))
 		->disableOriginalConstructor()
 		->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->confirmComponentAction() );
+		$this->assertSame($response, $mock->confirmComponentAction());
 	}
 
 
 	public function testStandardComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CheckoutController' )
-		->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CheckoutController')
+		->setMethods(array('getOutput'))
 		->disableOriginalConstructor()
 		->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->standardComponentAction() );
+		$this->assertSame($response, $mock->standardComponentAction());
 	}
 
 
 	public function testUpdateComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\CheckoutController' )
-		->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\CheckoutController')
+		->setMethods(array('getOutput'))
 		->disableOriginalConstructor()
 		->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->updateComponentAction() );
+		$this->assertSame($response, $mock->updateComponentAction());
 	}
 
 
@@ -331,30 +331,30 @@ 
 	 * @param \Symfony\Bundle\FrameworkBundle\Client $client HTTP test client
 	 * @return \Symfony\Component\DomCrawler\Crawler Crawler HTTP crawler
 	 */
-	protected function _goToSummary( $client )
+	protected function _goToSummary($client)
 	{
-		$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-action' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-action')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['ca_billingoption']->select( $crawler->filter( '.checkout-standard-address .item-address input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['ca_billingoption']->select($crawler->filter('.checkout-standard-address .item-address input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_deliveryoption']->select( $crawler->filter( '.checkout-standard-delivery .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_deliveryoption']->select($crawler->filter('.checkout-standard-delivery .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_paymentoption']->select( $crawler->filter( '.checkout-standard-payment .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_paymentoption']->select($crawler->filter('.checkout-standard-payment .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
 		return $crawler;
 	}

Controller/CatalogController.php

Spacing +24 added lines, -24 removed lines

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

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 )->setPrivate()->setMaxAge( 300 );
+		$params = $this->get('aimeos_page')->getSections('account-index');
+		return $this->render('AimeosShopBundle:Account:index.html.twig', $params)->setPrivate()->setMaxAge(300);
 	}
 
 
@@ -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 Response::create( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() );
+		return Response::create((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');
 	}
 }

Service/Context.php

Spacing +57 added lines, -57 removed lines

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

Command/JobsCommand.php

Spacing +41 added lines, -41 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,32 +51,32 @@ 
 	 * @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();
 		$process = $context->getProcess();
-		$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(), '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 
-			$context->setLocale( $localeItem );
+			$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 )
+			foreach ($jobs as $jobname)
 			{
-				$fcn = function( $context, $aimeos, $jobname ) {
-					\Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run();
+				$fcn = function($context, $aimeos, $jobname) {
+					\Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run();
 				};
 
-				$process->start( $fcn, [$context, $aimeos, $jobname], true );
+				$process->start($fcn, [$context, $aimeos, $jobname], true);
 			}
 		}
 
@@ -93,15 +93,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;
 	}
@@ -116,19 +116,19 @@ 
 	{
 		$container = $this->getContainer();
 		$aimeos = $container->get('aimeos')->get();
-		$context = $container->get( 'aimeos_context' )->get( false, 'command' );
+		$context = $container->get('aimeos_context')->get(false, 'command');
 
-		$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;
 	}