aimeos / aimeos-symfony

Service/I18n.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -41,27 +41,27 @@ 
 	 * @param array $languageIds List of two letter ISO language IDs
 	 * @return \Aimeos\MW\Translation\Interface[] List of translation objects
 	 */
-	public function get( array $languageIds )
+	public function get(array $languageIds)
 	{
-		$i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths();
+		$i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths();
 
-		foreach( $languageIds as $langid )
+		foreach ($languageIds as $langid)
 		{
-			if( !isset( $this->i18n[$langid] ) )
+			if (!isset($this->i18n[$langid]))
 			{
-				$i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid );
+				$i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid);
 
-				$apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' );
-				$prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' );
+				$apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable');
+				$prefix = $this->container->getParameter('aimeos_shop.apc_prefix');
 
-				if( function_exists( 'apc_store' ) === true && $apc === true ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix );
+				if (function_exists('apc_store') === true && $apc === true) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix);
 				}
 
-				$translations = $this->container->getParameter( 'aimeos_shop.i18n' );
+				$translations = $this->container->getParameter('aimeos_shop.i18n');
 
-				if( isset( $translations[$langid] ) ) {
-					$i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] );
+				if (isset($translations[$langid])) {
+					$i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]);
 				}
 
 				$this->i18n[$langid] = $i18n;

Service/Aimeos.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -42,10 +42,10 @@ 
 	 */
 	public function get()
 	{
-		if( $this->object === null )
+		if ($this->object === null)
 		{
-			$extDirs = (array) $this->container->getParameter( 'aimeos_shop.extdir' );
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
+			$extDirs = (array) $this->container->getParameter('aimeos_shop.extdir');
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
 		}
 
 		return $this->object;
@@ -59,14 +59,14 @@ 
 	 */
 	public function getVersion()
 	{
-		$filename = dirname( $this->container->get( 'kernel' )->getRootDir() ) . DIRECTORY_SEPARATOR . 'composer.lock';
+		$filename = dirname($this->container->get('kernel')->getRootDir()).DIRECTORY_SEPARATOR.'composer.lock';
 
-		if( file_exists( $filename ) === true && ( $content = file_get_contents( $filename ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (file_exists($filename) === true && ($content = file_get_contents($filename)) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-symfony' ) {
+				if ($item['name'] === 'aimeos/aimeos-symfony') {
 					return $item['version'];
 				}
 			}

Tests/Fixtures/app/AppKernel.php

Spacing +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function registerContainerConfiguration( LoaderInterface $loader )
+	public function registerContainerConfiguration(LoaderInterface $loader)
 	{
-		$loader->load( __DIR__ . '/config/config.yml' );
+		$loader->load(__DIR__.'/config/config.yml');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getCacheDir()
 	{
-		return sys_get_temp_dir() . '/aimeos-symfony2/cache';
+		return sys_get_temp_dir().'/aimeos-symfony2/cache';
 	}
 
 
@@ -48,6 +48,6 @@ 
 	 */
 	public function getLogDir()
 	{
-		return sys_get_temp_dir() . '/aimeos-symfony2/logs';
+		return sys_get_temp_dir().'/aimeos-symfony2/logs';
 	}
 }

Tests/bootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -3,24 +3,24 @@ 
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
 
-setlocale( LC_ALL, 'en_US.UTF-8' );
+setlocale(LC_ALL, 'en_US.UTF-8');
 
 // if the bundle is within a symfony project, try to reuse the project's autoload
 $files = array(
-	__DIR__ . '/../vendor/autoload.php',
-	__DIR__ . '/../../vendor/autoload.php',
+	__DIR__.'/../vendor/autoload.php',
+	__DIR__.'/../../vendor/autoload.php',
 );
 
 $autoload = false;
-foreach( $files as $file )
+foreach ($files as $file)
 {
-	if( is_file( $file ) ) {
+	if (is_file($file)) {
 		$autoload = include_once $file;
 		break;
 	}
 }
 
-if( !$autoload )
+if (!$autoload)
 {
 	exit(
 	"Unable to find autoload.php file, please use composer to load dependencies:
@@ -30,4 +30,4 @@ 
 	);
 }
 
-AnnotationRegistry::registerLoader( array( $autoload, 'loadClass' ) );
+AnnotationRegistry::registerLoader(array($autoload, 'loadClass'));

Tests/Controller/ExtadmControllerTest.php

Spacing +14 added lines, -14 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
-		$crawler = $client->request( 'GET', '/unittest/extadm/de/0' );
+		));
+		$crawler = $client->request('GET', '/unittest/extadm/de/0');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertEquals( 1, $crawler->filter( 'head:contains("/{site}/extadm/{lang}/{tab}")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( 'body:contains("You need to enable javascript!")' )->count() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertEquals(1, $crawler->filter('head:contains("/{site}/extadm/{lang}/{tab}")')->count());
+		$this->assertEquals(1, $crawler->filter('body:contains("You need to enable javascript!")')->count());
 	}
 
 
@@ -26,17 +26,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$token = $client->getContainer()->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' );
+		$token = $client->getContainer()->get('security.csrf.token_manager')->getToken('aimeos_admin_token');
 
-		$client->request( 'POST', '/unittest/extadm/do?_token=' . $token->getValue(),
+		$client->request('POST', '/unittest/extadm/do?_token='.$token->getValue(),
 			array(), array(), array('CONTENT_TYPE' => 'application/json'),
 			'[{"jsonrpc":"2.0","method":"Product_Type.searchItems","params":{"site":"unittest"},"id":2}]'
 		);
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertStringStartsWith( '[{', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertStringStartsWith('[{', $client->getResponse()->getContent());
 	}
 
 
@@ -45,11 +45,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/extadm/file' );
+		$client->request('GET', '/unittest/extadm/file');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Ext.', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Ext.', $client->getResponse()->getContent());
 	}
 }

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, $tmplPaths, $clientName );
-				$client->setView( clone $view );
+				$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
+				$client->setView(clone $view);
 				$client->process();
 
 				$result['aibody'][$clientName] = $client->getBody();

Tests/Command/AccountCommandTest.php

Spacing +12 added lines, -12 removed lines

@@ -16,14 +16,14 @@ 
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\AccountCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\AccountCommand());
 
-		$command = $application->find( 'aimeos:account' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test' ) );
+		$command = $application->find('aimeos:account');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test'));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 
 
@@ -32,13 +32,13 @@ 
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\AccountCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\AccountCommand());
 
-		$command = $application->find( 'aimeos:account' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test', '--admin' => true ) );
+		$command = $application->find('aimeos:account');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'email' => 'unitCustomer@example.com', '--password' => 'test', '--admin' => true));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 }

Command/AccountCommand.php

Braces +1 added lines, -2 removed lines

@@ -186,8 +186,7 @@
 		try
 		{
 			$item = $manager->findItem( $code );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$item = $manager->createItem();
 			$item->setLabel( $code );

Spacing +66 added lines, -66 removed lines

@@ -29,13 +29,13 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:account');
-		$this->setDescription( 'Creates new (admin) accounts' );
-		$this->addArgument( 'email', InputArgument::REQUIRED, 'E-mail address of the account that should be created' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)' );
-		$this->addOption( 'password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)' );
-		$this->addOption( 'admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges' );
-		$this->addOption( 'editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges' );
+		$this->setName('aimeos:account');
+		$this->setDescription('Creates new (admin) accounts');
+		$this->addArgument('email', InputArgument::REQUIRED, 'E-mail address of the account that should be created');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to create accounts for like "default unittest" (none for all)');
+		$this->addOption('password', null, InputOption::VALUE_REQUIRED, 'Optional password for the account (will ask for if not given)');
+		$this->addOption('admin', null, InputOption::VALUE_NONE, 'If account should have administrator privileges');
+		$this->addOption('editor', null, InputOption::VALUE_NONE, 'If account should have limited editor privileges');
 	}
 
 
@@ -45,32 +45,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)
 	{
-		$code = $input->getArgument( 'email' );
-		if( ( $password = $input->getOption( 'password' ) ) === null )
+		$code = $input->getArgument('email');
+		if (($password = $input->getOption('password')) === null)
 		{
-			$helper = $this->getHelper( 'question' );
-			$question = new Question( 'Password' );
-			$question->setHidden( true );
+			$helper = $this->getHelper('question');
+			$question = new Question('Password');
+			$question->setHidden(true);
 
-			$password = $helper->ask( $input, $output, $question );
+			$password = $helper->ask($input, $output, $question);
 		}
 
-		$context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' );
-		$context->setEditor( 'aimeos:account' );
+		$context = $this->getContainer()->get('aimeos_context')->get(false, 'command');
+		$context->setEditor('aimeos:account');
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
-		$context->setLocale( $localeManager->createItem() );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context);
+		$context->setLocale($localeManager->createItem());
 
-		$user = $this->createCustomerItem( $context, $code, $password );
+		$user = $this->createCustomerItem($context, $code, $password);
 
-		if( $input->getOption( 'admin' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'admin' );
+		if ($input->getOption('admin')) {
+			$this->addGroup($input, $output, $context, $user, 'admin');
 		}
 
-		if( $input->getOption( 'editor' ) ) {
-			$this->addGroup( $input, $output, $context, $user, 'editor' );
+		if ($input->getOption('editor')) {
+			$this->addGroup($input, $output, $context, $user, 'editor');
 		}
 	}
 
@@ -84,24 +84,24 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $user Aimeos customer object
 	 * @param string $group Unique customer group code
 	 */
-	protected function addGroup( InputInterface $input, OutputInterface $output,
-		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group )
+	protected function addGroup(InputInterface $input, OutputInterface $output,
+		\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Customer\Item\Iface $user, $group)
 	{
-		$output->writeln( sprintf( 'Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode() ) );
+		$output->writeln(sprintf('Add "%1$s" group to user "%2$s" for sites', $group, $user->getCode()));
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context );
+		$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 = $localeManager->bootstrap($siteItem->getCode(), '', '', false);
 
 			$lcontext = clone $context;
-			$lcontext->setLocale( $localeItem );
+			$lcontext->setLocale($localeItem);
 
-			$output->writeln( '- ' . $siteItem->getCode() );
+			$output->writeln('- '.$siteItem->getCode());
 
-			$groupItem = $this->getGroupItem( $lcontext, $group );
-			$this->addListItem( $lcontext, $user->getId(), $groupItem->getId() );
+			$groupItem = $this->getGroupItem($lcontext, $group);
+			$this->addListItem($lcontext, $user->getId(), $groupItem->getId());
 		}
 	}
 
@@ -113,31 +113,31 @@ 
 	 * @param string $userid Unique user ID
 	 * @param string $groupid Unique group ID
 	 */
-	protected function addListItem( \Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid )
+	protected function addListItem(\Aimeos\MShop\Context\Item\Iface $context, $userid, $groupid)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'lists' );
-		$typeid = $manager->getSubmanager( 'type' )->findItem( 'default', array(), 'customer/group' )->getId();
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('lists');
+		$typeid = $manager->getSubmanager('type')->findItem('default', array(), 'customer/group')->getId();
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $userid ),
-			$search->compare( '==', 'customer.lists.refid', $groupid ),
-			$search->compare( '==', 'customer.lists.domain', 'customer/group' ),
-			$search->compare( '==', 'customer.lists.typeid', $typeid ),
+			$search->compare('==', 'customer.lists.parentid', $userid),
+			$search->compare('==', 'customer.lists.refid', $groupid),
+			$search->compare('==', 'customer.lists.domain', 'customer/group'),
+			$search->compare('==', 'customer.lists.typeid', $typeid),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		if( count( $manager->searchItems( $search ) ) === 0 )
+		if (count($manager->searchItems($search)) === 0)
 		{
 			$item = $manager->createItem();
-			$item->setDomain( 'customer/group' );
-			$item->setParentId( $userid );
-			$item->setTypeId( $typeid );
-			$item->setRefId( $groupid );
-			$item->setStatus( 1 );
+			$item->setDomain('customer/group');
+			$item->setParentId($userid);
+			$item->setTypeId($typeid);
+			$item->setRefId($groupid);
+			$item->setStatus(1);
 
-			$manager->saveItem( $item, false );
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -152,23 +152,23 @@ 
 	 * @param string $password New user password
 	 * @return \Aimeos\MShop\Customer\Item\Iface Aimeos customer item object
 	 */
-	protected function createCustomerItem( \Aimeos\MShop\Context\Item\Iface $context, $email, $password )
+	protected function createCustomerItem(\Aimeos\MShop\Context\Item\Iface $context, $email, $password)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		try {
-			$item = $manager->findItem( $email );
-		} catch( \Aimeos\MShop\Exception $e ) {
+			$item = $manager->findItem($email);
+		} catch (\Aimeos\MShop\Exception $e) {
 			$item = $manager->createItem();
 		}
 
-		$item->setCode( $email );
-		$item->setLabel( $email );
-		$item->getPaymentAddress()->setEmail( $email );
-		$item->setPassword( $password );
-		$item->setStatus( 1 );
+		$item->setCode($email);
+		$item->setLabel($email);
+		$item->getPaymentAddress()->setEmail($email);
+		$item->setPassword($password);
+		$item->setStatus(1);
 
-		$manager->saveItem( $item );
+		$manager->saveItem($item);
 
 		return $item;
 	}
@@ -181,21 +181,21 @@ 
 	 * @param string $code Unique customer group code
 	 * @return \Aimeos\MShop\Customer\Item\Group\Iface Aimeos customer group item object
 	 */
-	protected function getGroupItem( \Aimeos\MShop\Context\Item\Iface $context, $code )
+	protected function getGroupItem(\Aimeos\MShop\Context\Item\Iface $context, $code)
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context )->getSubmanager( 'group' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context)->getSubmanager('group');
 
 		try
 		{
-			$item = $manager->findItem( $code );
+			$item = $manager->findItem($code);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
 			$item = $manager->createItem();
-			$item->setLabel( $code );
-			$item->setCode( $code );
+			$item->setLabel($code);
+			$item->setCode($code);
 
-			$manager->saveItem( $item );
+			$manager->saveItem($item);
 		}
 
 		return $item;

Tests/Controller/CheckoutControllerTest.php

Spacing +156 added lines, -156 removed lines

@@ -12,66 +12,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());
 	}
 
 
@@ -80,47 +80,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());
 	}
 
 
@@ -129,17 +129,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());
 	}
 
 
@@ -148,17 +148,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());
 	}
 
 
@@ -167,17 +167,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());
 	}
 
 
@@ -186,17 +186,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());
 	}
 
 
@@ -205,17 +205,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());
 	}
 
 
@@ -224,51 +224,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());
 	}
 
 
@@ -276,48 +276,48 @@ 
 	{
 		$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();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->confirmComponentAction() );
+		$this->assertEquals('test', $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();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->standardComponentAction() );
+		$this->assertEquals('test', $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();
 
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) );
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue('test'));
 
-		$this->assertEquals( 'test', $mock->updateComponentAction() );
+		$this->assertEquals('test', $mock->updateComponentAction());
 	}
 
 
@@ -327,30 +327,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;
 	}