aimeos / aimeos-symfony

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;
 	}

Tests/Controller/JqadmControllerTest.php

Spacing +35 added lines, -35 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/css' );
+		$client->request('GET', '/unittest/jqadm/file/css');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
 	}
 
 
@@ -26,12 +26,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/js' );
+		$client->request('GET', '/unittest/jqadm/file/js');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
 	}
 
 
@@ -40,13 +40,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/copy/product/0' );
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -55,13 +55,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
+		$client->request('GET', '/unittest/jqadm/create/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -70,13 +70,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -85,13 +85,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/get/product/0' );
+		$client->request('GET', '/unittest/jqadm/get/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -100,13 +100,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product/0' );
+		$client->request('POST', '/unittest/jqadm/save/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -115,13 +115,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
+		$client->request('GET', '/unittest/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -130,11 +130,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
+		$client->request('GET', '/invalid/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 500, $response->getStatusCode() );
+		$this->assertEquals(500, $response->getStatusCode());
 	}
 }

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;
 	}

Tests/Controller/JsonapiControllerTest.php

Spacing +202 added lines, -202 removed lines

@@ -10,74 +10,74 @@ 
 	public function testOptionsAction()
 	{
 		$client = static::createClient();
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 	}
 
 
 	public function testPutAction()
 	{
 		$client = static::createClient();
-		$client->request( 'PUT', '/unittest/de/EUR/jsonapi/basket' );
+		$client->request('PUT', '/unittest/de/EUR/jsonapi/basket');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 403, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'errors', $json );
+		$this->assertNotNull($json);
+		$this->assertEquals(403, $response->getStatusCode());
+		$this->assertArrayHasKey('errors', $json);
 	}
 
 
 	public function testGetAttributeAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/attribute', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/attribute', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 25, $json['meta']['total'] );
-		$this->assertEquals( 25, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(25, $json['meta']['total']);
+		$this->assertEquals(25, count($json['data']));
 	}
 
 
 	public function testGetCatalogAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/catalog', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/catalog', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
-		$this->assertEquals( 4, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(4, count($json['data']));
 	}
 
 
 	public function testGetLocaleAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/locale', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/locale', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(1, count($json['data']));
 	}
 
 
@@ -86,58 +86,58 @@ 
 		$client = static::createClient();
 
 		$params = ['filter' => ['f_search' => 'Cafe Noire Cap', 'f_listtype' => 'unittype19']];
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/product', $params );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/product', $params);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
-		$this->assertEquals( 1, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'id', $json['data'][0] );
-		$this->assertEquals( 'CNC', $json['data'][0]['attributes']['product.code'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(1, count($json['data']));
+		$this->assertArrayHasKey('id', $json['data'][0]);
+		$this->assertEquals('CNC', $json['data'][0]['attributes']['product.code']);
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/product?id=' . $json['data'][0]['id'] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/product?id='.$json['data'][0]['id']);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
-		$this->assertArrayHasKey( 'id', $json['data'] );
-		$this->assertEquals( 'CNC', $json['data']['attributes']['product.code'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertArrayHasKey('id', $json['data']);
+		$this->assertEquals('CNC', $json['data']['attributes']['product.code']);
 	}
 
 
 	public function testGetServiceAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/service', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/service', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 4, $json['meta']['total'] );
-		$this->assertEquals( 4, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(4, $json['meta']['total']);
+		$this->assertEquals(4, count($json['data']));
 	}
 
 
 	public function testGetStockAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/stock', ['filter' => ['s_prodcode' => ['CNC', 'CNE']]] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/stock', ['filter' => ['s_prodcode' => ['CNC', 'CNE']]]);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, $json['meta']['total'] );
-		$this->assertEquals( 2, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, $json['meta']['total']);
+		$this->assertEquals(2, count($json['data']));
 	}
 
 
@@ -145,24 +145,24 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$optJson = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $optJson['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$optJson = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($optJson['meta']['resources']));
 
 		// catalog root
-		$client->request( 'GET', $optJson['meta']['resources']['catalog'], ['include' => 'catalog'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'categories', $json['included'][0]['attributes']['catalog.code'] );
+		$client->request('GET', $optJson['meta']['resources']['catalog'], ['include' => 'catalog']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('categories', $json['included'][0]['attributes']['catalog.code']);
 
 		// "categories" category
-		$client->request( 'GET', $json['included'][0]['links']['self']['href'], ['include' => 'catalog'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'cafe', $json['included'][0]['attributes']['catalog.code'] );
+		$client->request('GET', $json['included'][0]['links']['self']['href'], ['include' => 'catalog']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('cafe', $json['included'][0]['attributes']['catalog.code']);
 
 		// product list for "cafe" category
-		$client->request( 'GET', $optJson['meta']['resources']['product'], ['f_catid' => $json['included'][0]['id']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'CNE', $json['data'][0]['attributes']['product.code'] );
+		$client->request('GET', $optJson['meta']['resources']['product'], ['f_catid' => $json['included'][0]['id']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('CNE', $json['data'][0]['attributes']['product.code']);
 	}
 
 
@@ -170,26 +170,26 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$options = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $options['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$options = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($options['meta']['resources']));
 
 		// all available attrbutes
-		$client->request( 'GET', $options['meta']['resources']['attribute'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
+		$client->request('GET', $options['meta']['resources']['attribute']);
+		$json = json_decode($client->getResponse()->getContent(), true);
 
-		foreach( $json['data'] as $entry )
+		foreach ($json['data'] as $entry)
 		{
-			if( $entry['attributes']['attribute.code'] === 'xl' )
+			if ($entry['attributes']['attribute.code'] === 'xl')
 			{
 				// products with attrbute "xl"
-				$client->request( 'GET', $options['meta']['resources']['product'], ['filter' => ['f_attrid' => $entry['id']]] );
+				$client->request('GET', $options['meta']['resources']['product'], ['filter' => ['f_attrid' => $entry['id']]]);
 				break;
 			}
 		}
 
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(2, $json['meta']['total']);
 	}
 
 
@@ -197,14 +197,14 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// product list for full text search
-		$client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'selection']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 3, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'selection']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(3, count($json['data']));
 	}
 
 
@@ -212,23 +212,23 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// get empty basket
-		$client->request( 'GET', $json['meta']['resources']['basket'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket', $json['data']['type'] );
+		$client->request('GET', $json['meta']['resources']['basket']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket', $json['data']['type']);
 
 		$content = '{"data": {"id": "delivery", "attributes": {"order.base.address.firstname": "test"}}}';
-		$client->request( 'POST', $json['links']['basket/address']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/address', $json['included'][0]['type'] );
+		$client->request('POST', $json['links']['basket/address']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/address', $json['included'][0]['type']);
 
-		$client->request( 'DELETE', $json['included'][0]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 0, count( $json['included'] ) );
+		$client->request('DELETE', $json['included'][0]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(0, count($json['included']));
 	}
 
 
@@ -236,31 +236,31 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// product for code "CNC"
-		$client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
 		// add product "CNC" as prerequisite
-		$content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/product', $json['included'][0]['type'] );
+		$content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/product', $json['included'][0]['type']);
 
 		// add coupon "GHIJ"
 		$content = '{"data": {"id": "GHIJ"}}';
-		$client->request( 'POST', $json['links']['basket/coupon']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/coupon', $json['included'][2]['type'] );
+		$client->request('POST', $json['links']['basket/coupon']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/coupon', $json['included'][2]['type']);
 
 		// remove coupon "GHIJ" again
-		$client->request( 'DELETE', $json['included'][2]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['included'] ) );
+		$client->request('DELETE', $json['included'][2]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['included']));
 	}
 
 
@@ -268,28 +268,28 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// product for code "CNC"
-		$client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'ABCD']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'ABCD']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
-		$content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/product', $json['included'][0]['type'] );
+		$content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/product', $json['included'][0]['type']);
 
 		$content = '{"data": {"attributes": {"quantity": 2}}}';
-		$client->request( 'PATCH', $json['included'][0]['links']['self']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 2, $json['included'][0]['attributes']['order.base.product.quantity'] );
+		$client->request('PATCH', $json['included'][0]['links']['self']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(2, $json['included'][0]['attributes']['order.base.product.quantity']);
 
-		$client->request( 'DELETE', $json['included'][0]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 0, count( $json['included'] ) );
+		$client->request('DELETE', $json['included'][0]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(0, count($json['included']));
 	}
 
 
@@ -297,14 +297,14 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// payment services
-		$client->request( 'GET', $json['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 3, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(3, count($json['data']));
 
 		$content = ['data' => ['id' => 'payment', 'attributes' => [
 			'service.id' => $json['data'][1]['id'],
@@ -313,15 +313,15 @@ 
 			'directdebit.bankcode' => 'ABCDEFGH',
 			'directdebit.bankname' => 'test bank',
 		]]];
-		$client->request( 'POST', $json['data'][1]['links']['basket/service']['href'], [], [], [], json_encode( $content ) );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/service', $json['included'][0]['type'] );
-		$this->assertEquals( 'directdebit-test', $json['included'][0]['attributes']['order.base.service.code'] );
-		$this->assertEquals( 5, count( $json['included'][0]['attributes']['attribute'] ) );
-
-		$client->request( 'DELETE', $json['included'][0]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 0, count( $json['included'] ) );
+		$client->request('POST', $json['data'][1]['links']['basket/service']['href'], [], [], [], json_encode($content));
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/service', $json['included'][0]['type']);
+		$this->assertEquals('directdebit-test', $json['included'][0]['attributes']['order.base.service.code']);
+		$this->assertEquals(5, count($json['included'][0]['attributes']['attribute']));
+
+		$client->request('DELETE', $json['included'][0]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(0, count($json['included']));
 	}
 
 
@@ -330,17 +330,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/customer', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/customer', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
-		$this->assertEquals( 4, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(4, count($json['data']));
 	}
 
 
@@ -349,22 +349,22 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/customer', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/customer', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$client->request( 'GET', $json['links']['customer/address']['href'], [] );
+		$client->request('GET', $json['links']['customer/address']['href'], []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(1, count($json['data']));
 	}
 
 
@@ -373,17 +373,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/order', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/order', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 5, $json['meta']['total'] );
-		$this->assertEquals( 5, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(5, $json['meta']['total']);
+		$this->assertEquals(5, count($json['data']));
 	}
 
 
@@ -391,63 +391,63 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$optJson = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $optJson['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$optJson = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($optJson['meta']['resources']));
 
 		// product for code "CNC"
-		$client->request( 'GET', $optJson['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $optJson['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
 		// add product "CNC"
-		$content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/product', $json['included'][0]['type'] );
+		$content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/product', $json['included'][0]['type']);
 
 		// delivery services
-		$client->request( 'GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'delivery']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'delivery']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
 		// add delivery service
-		$content = '{"data": {"id": "delivery", "attributes": {"service.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/service', $json['included'][1]['type'] );
+		$content = '{"data": {"id": "delivery", "attributes": {"service.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/service', $json['included'][1]['type']);
 
 		// payment services
-		$client->request( 'GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 3, count( $json['data'] ) );
+		$client->request('GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(3, count($json['data']));
 
 		// add payment service
-		$content = '{"data": {"id": "payment", "attributes": {"service.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/service', $json['included'][2]['type'] );
+		$content = '{"data": {"id": "payment", "attributes": {"service.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/service', $json['included'][2]['type']);
 
 		// add address
 		$content = '{"data": {"id": "payment", "attributes": {"order.base.address.firstname": "test"}}}';
-		$client->request( 'POST', $json['links']['basket/address']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/address', $json['included'][3]['type'] );
+		$client->request('POST', $json['links']['basket/address']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/address', $json['included'][3]['type']);
 
 		// store basket
-		$client->request( 'POST', $json['data']['links']['self']['href'] );
-		$basketJson = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( true, ctype_digit( $basketJson['data']['id'] ) );
+		$client->request('POST', $json['data']['links']['self']['href']);
+		$basketJson = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(true, ctype_digit($basketJson['data']['id']));
 
 		// add order
-		$content = '{"data": {"attributes": {"order.baseid": ' . $basketJson['data']['id'] . '}}}';
-		$client->request( 'POST', $basketJson['links']['order']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( true, ctype_digit( $json['data']['id'] ) );
+		$content = '{"data": {"attributes": {"order.baseid": '.$basketJson['data']['id'].'}}}';
+		$client->request('POST', $basketJson['links']['order']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(true, ctype_digit($json['data']['id']));
 
 
 		// delete created order
-		$context = static::$kernel->getContainer()->get( 'aimeos_context' )->get();
-		\Aimeos\MShop\Factory::createManager( $context, 'order/base' )->deleteItem( $basketJson['data']['id'] );
+		$context = static::$kernel->getContainer()->get('aimeos_context')->get();
+		\Aimeos\MShop\Factory::createManager($context, 'order/base')->deleteItem($basketJson['data']['id']);
 	}
 }

Controller/JsonapiController.php

Spacing +19 added lines, -19 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource )
+	public function deleteAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->delete( $request, new Response() );
+		return $this->createClient($request, $resource)->delete($request, new Response());
 	}
 
 
@@ -43,9 +43,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource )
+	public function getAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->get( $request, new Response() );
+		return $this->createClient($request, $resource)->get($request, new Response());
 	}
 
 
@@ -56,9 +56,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource )
+	public function patchAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->patch( $request, new Response() );
+		return $this->createClient($request, $resource)->patch($request, new Response());
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource )
+	public function postAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->post( $request, new Response() );
+		return $this->createClient($request, $resource)->post($request, new Response());
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource )
+	public function putAction(ServerRequestInterface $request, $resource)
 	{
-		return $this->createClient( $request, $resource )->put( $request, new Response() );
+		return $this->createClient($request, $resource)->put($request, new Response());
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '')
 	{
-		return $this->createClient( $request, $resource )->options( $request, new Response() );
+		return $this->createClient($request, $resource)->options($request, new Response());
 	}
 
 
@@ -108,19 +108,19 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 */
-	protected function createClient( ServerRequestInterface $request, $resource )
+	protected function createClient(ServerRequestInterface $request, $resource)
 	{
 		$args = $request->getAttributes();
 		$params = $request->getQueryParams();
-		$related = ( isset( $args['related'] ) ? $args['related'] : ( isset( $params['related'] ) ? $params['related'] : null ) );
+		$related = (isset($args['related']) ? $args['related'] : (isset($params['related']) ? $params['related'] : null));
 
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' );
-		$context = $this->container->get( 'aimeos_context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates');
+		$context = $this->container->get('aimeos_context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
+		$context->setView($view);
 
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
 	}
 }

Controller/JqadmController.php

Spacing +47 added lines, -47 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,21 +162,21 @@ 
 	 * @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->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
 
-		$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 )->setAimeos( $aimeos );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource)->setAimeos($aimeos);
 	}
 
 
@@ -186,12 +186,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();
-		$extnames = implode( ',', $this->get( 'aimeos' )->get()->getExtensions() );
-		$content = str_replace( ['{type}', '{version}', '{extensions}'], ['Symfony', $version, $extnames], $content );
+		$version = $this->get('aimeos')->getVersion();
+		$extnames = implode(',', $this->get('aimeos')->get()->getExtensions());
+		$content = str_replace(['{type}', '{version}', '{extensions}'], ['Symfony', $version, $extnames], $content);
 
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 }