aimeos / aimeos-symfony

Controller/JsonadmController.php

Spacing +27 added lines, -27 removed lines

@@ -31,10 +31,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function deleteAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createClient( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->delete( $request, new Response() );
+		$client = $this->createClient($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->delete($request, new Response());
 	}
 
 
@@ -46,10 +46,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function getAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createClient( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->get( $request, new Response() );
+		$client = $this->createClient($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->get($request, new Response());
 	}
 
 
@@ -61,10 +61,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function patchAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createClient( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->patch( $request, new Response() );
+		$client = $this->createClient($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->patch($request, new Response());
 	}
 
 
@@ -76,10 +76,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function postAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createClient( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->post( $request, new Response() );
+		$client = $this->createClient($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->post($request, new Response());
 	}
 
 
@@ -91,10 +91,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource, $site = 'default' )
+	public function putAction(ServerRequestInterface $request, $resource, $site = 'default')
 	{
-		$client = $this->createClient( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->put( $request, new Response() );
+		$client = $this->createClient($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->put($request, new Response());
 	}
 
 
@@ -106,10 +106,10 @@ 
 	 * @param string $site Unique site code
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '', $site = 'default' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '', $site = 'default')
 	{
-		$client = $this->createClient( $site, $resource, $request->getAttribute( 'lang', 'en' ) );
-		return $client->options( $request, new Response() );
+		$client = $this->createClient($site, $resource, $request->getAttribute('lang', 'en'));
+		return $client->options($request, new Response());
 	}
 
 
@@ -121,18 +121,18 @@ 
 	 * @param string $lang Language code
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item
 	 */
-	protected function createClient( $site, $resource, $lang )
+	protected function createClient($site, $resource, $lang)
 	{
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates');
 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context->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\JsonAdm\Factory::createClient( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $aimeos, $resource);
 	}
 }

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, 'account/download' );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, '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');
 	}
 }

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, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $resource.'/'.$related);
 	}
 }

Controller/AbstractController.php

Spacing +11 added lines, -11 removed lines

@@ -28,29 +28,29 @@
 	 * @param string $clientName Html client name
 	 * @return Response Response object containing the generated output
 	 */
-	protected function getOutput( $clientName )
+	protected function getOutput($clientName)
 	{
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/html/templates' );
-		$context = $this->container->get( 'aimeos_context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/html/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);
 
-		$client = \Aimeos\Client\Html\Factory::createClient( $context, $clientName );
-		$client->setView( $view );
+		$client = \Aimeos\Client\Html\Factory::createClient($context, $clientName);
+		$client->setView($view);
 		$client->process();
 
-		$twig = $this->container->get( 'twig' );
+		$twig = $this->container->get('twig');
 		$vars = $twig->getGlobals();
 
-		if( !isset( $vars['aiheader'] ) ) {
+		if (!isset($vars['aiheader'])) {
 			$vars['aiheader'] = array();
 		}
 
 		$vars['aiheader'][$clientName] = (string) $client->getHeader();
-		$twig->addGlobal( 'aiheader', $vars['aiheader'] );
+		$twig->addGlobal('aiheader', $vars['aiheader']);
 
-		return new Response( (string) $client->getBody() );
+		return new Response((string) $client->getBody());
 	}
 }

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-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->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-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->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-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->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;
 	}

Service/Page.php

Spacing +11 added lines, -11 removed lines

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

Tests/Controller/BasketControllerTest.php

Spacing +96 added lines, -96 removed lines

@@ -12,17 +12,17 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket-standard')->count());
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(1, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 	}
 
 
@@ -30,18 +30,18 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
 		$form['b_prod[0][quantity]'] = 2;
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 2, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket-standard')->count());
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(2, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 	}
 
 
@@ -49,26 +49,26 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(1, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 
 
-		$link = $crawler->filter( '.basket-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 2, $crawler->filter( '.basket .product .quantity .value' )->attr('value') );
+		$this->assertEquals(1, $crawler->filter('.basket:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(2, $crawler->filter('.basket .product .quantity .value')->attr('value'));
 	}
 
 
@@ -76,19 +76,19 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
 
-		$link = $crawler->filter( '.basket-standard .product .action .delete' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .action .delete')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 0, $crawler->filter( '.basket-standard .product' )->count() );
+		$this->assertEquals(0, $crawler->filter('.basket-standard .product')->count());
 	}
 
 
@@ -96,25 +96,25 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
 
-		$link = $crawler->filter( '.basket-standard .product .quantity .change' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .quantity .change')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 2, $crawler->filter( '.basket-standard .product .quantity .value' )->attr( 'value' ) );
+		$this->assertEquals(2, $crawler->filter('.basket-standard .product .quantity .value')->attr('value'));
 
 
-		$link = $crawler->filter( '.basket-standard .product .quantity .change' )->eq( 0 )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .product .quantity .change')->eq(0)->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard .product .quantity .value' )->attr( 'value' ) );
+		$this->assertEquals(1, $crawler->filter('.basket-standard .product .quantity .value')->attr('value'));
 	}
 
 
@@ -122,20 +122,20 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
 
-		$form = $crawler->filter( '.basket-standard .btn-update' )->form();
+		$form = $crawler->filter('.basket-standard .btn-update')->form();
 		$form['b_prod[0][quantity]'] = 3;
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 3, $crawler->filter( '.basket-standard .product .quantity .value' )->attr( 'value' ) );
+		$this->assertEquals(3, $crawler->filter('.basket-standard .product .quantity .value')->attr('value'));
 	}
 
 
@@ -143,26 +143,26 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
 
-		$form = $crawler->filter( '.basket-standard-coupon .coupon-new button' )->form();
+		$form = $crawler->filter('.basket-standard-coupon .coupon-new button')->form();
 		$form['b_coupon'] = '90AB';
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard .product:contains("Geldwerter Nachlass")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-standard .product:contains("Geldwerter Nachlass")')->count());
 
 
-		$link = $crawler->filter( '.basket-standard-coupon .delete' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard-coupon .delete')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-standard .product' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-standard .product')->count());
 	}
 
 
@@ -170,15 +170,15 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.basket-related-bought .product' )->count() );
+		$this->assertEquals(1, $crawler->filter('.basket-related-bought .product')->count());
 	}
 
 
@@ -186,59 +186,59 @@ 
 	{
 		$client = static::createClient();
 
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-primary' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-primary')->form();
+		$crawler = $client->submit($form);
 
-		$link = $crawler->filter( '.basket-standard .btn-back' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-back')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail .product:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail .product:contains("Unittest: Bundle")')->count());
 	}
 
 
 	public function testMiniComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\BasketController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\BasketController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->miniComponentAction() );
+		$this->assertSame($response, $mock->miniComponentAction());
 	}
 
 
 	public function testRelatedComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\BasketController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\BasketController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->relatedComponentAction() );
+		$this->assertSame($response, $mock->relatedComponentAction());
 	}
 
 
 	public function testStandardComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\BasketController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\BasketController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->standardComponentAction() );
+		$this->assertSame($response, $mock->standardComponentAction());
 	}
 }

Service/Locale.php

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param RequestStack $requestStack Current request stack
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( RequestStack $requestStack, Container $container )
+	public function __construct(RequestStack $requestStack, Container $container)
 	{
 		$this->requestStack = $requestStack;
 		$this->container = $container;
@@ -45,19 +45,19 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function get( \Aimeos\MShop\Context\Item\Iface $context )
+	public function get(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		if( $this->locale === null )
+		if ($this->locale === null)
 		{
-			$status = $this->container->getParameter( 'aimeos_shop.disable_sites' );
+			$status = $this->container->getParameter('aimeos_shop.disable_sites');
 			$request = $this->requestStack->getMasterRequest();
 
-			$site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) );
-			$currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) );
-			$lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) );
+			$site = $request->attributes->get('site', $request->query->get('site', 'default'));
+			$currency = $request->attributes->get('currency', $request->query->get('currency', ''));
+			$lang = $request->attributes->get('locale', $request->query->get('locale', ''));
 
-			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-			$this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status );
+			$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+			$this->locale = $localeManager->bootstrap($site, $lang, $currency, $status);
 		}
 
 		return $this->locale;
@@ -71,13 +71,13 @@ 
 	 * @param string $site Unique site code
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item object
 	 */
-	public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $site, '', '', false, null, true );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($site, '', '', false, null, true);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 

Controller/AdminController.php

Spacing +19 added lines, -19 removed lines

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