aimeos / aimeos-symfony

Composer/ScriptHandler.php

Spacing +57 added lines, -57 removed lines

@@ -28,18 +28,18 @@ 
 	 * @param CommandEvent $event CommandEvent instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function setupDatabase( CommandEvent $event )
+	public static function setupDatabase(CommandEvent $event)
 	{
 		$options = $env = array();
 
-		if( $event->isDevMode() ) {
+		if ($event->isDevMode()) {
 			$options[] = '--option=setup/default/demo:1';
 		} else {
 			$env[] = '--env=prod';
 		}
 
-		self::executeCommand( $event, 'aimeos:setup', $options + $env );
-		self::executeCommand( $event, 'aimeos:cache', $env );
+		self::executeCommand($event, 'aimeos:setup', $options + $env);
+		self::executeCommand($event, 'aimeos:cache', $env);
 	}
 
 
@@ -49,30 +49,30 @@ 
 	 * @param CommandEvent $event CommandEvent instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function installBundle( CommandEvent $event )
+	public static function installBundle(CommandEvent $event)
 	{
-		$event->getIO()->write( 'Installing the Aimeos shop bundle' );
+		$event->getIO()->write('Installing the Aimeos shop bundle');
 
-		$options = self::getOptions( $event );
+		$options = self::getOptions($event);
 
-		if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) )
+		if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir']))
 		{
 			$msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available';
-			throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) );
+			throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir']));
 		}
 
-		if( !isset( $options['symfony-web-dir'] ) || !is_dir( $options['symfony-web-dir'] ) )
+		if (!isset($options['symfony-web-dir']) || !is_dir($options['symfony-web-dir']))
 		{
 			$msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available';
-			throw new \RuntimeException( sprintf( $msg, 'symfony-web-dir', $options['symfony-web-dir'] ) );
+			throw new \RuntimeException(sprintf($msg, 'symfony-web-dir', $options['symfony-web-dir']));
 		}
 
-		self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' );
-		self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' );
-		self::createDirectory( $options['symfony-app-dir'] . '/secure' );
-		self::createDirectory( $options['symfony-web-dir'] . '/uploads' );
-		self::createDirectory( $options['symfony-web-dir'] . '/preview' );
-		self::createDirectory( $options['symfony-web-dir'] . '/files' );
+		self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml');
+		self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml');
+		self::createDirectory($options['symfony-app-dir'].'/secure');
+		self::createDirectory($options['symfony-web-dir'].'/uploads');
+		self::createDirectory($options['symfony-web-dir'].'/preview');
+		self::createDirectory($options['symfony-web-dir'].'/files');
 	}
 
 
@@ -82,14 +82,14 @@ 
 	 * @param string $dir Absolute path of the new directory
 	 * @throws \RuntimeException If directory couldn't be created
 	 */
-	protected static function createDirectory( $dir )
+	protected static function createDirectory($dir)
 	{
 		$perm = 0755;
 
-		if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) )
+		if (!is_dir($dir) && !mkdir($dir, $perm, true))
 		{
 			$msg = 'Unable to create directory "%1$s" with permission "%2$s"';
-			throw new \RuntimeException( sprintf( $msg, $dir, $perm ) );
+			throw new \RuntimeException(sprintf($msg, $dir, $perm));
 		}
 	}
 
@@ -102,28 +102,28 @@ 
 	 * @param array List of configuration options for the given command
 	 * @throws \RuntimeException If the command couldn't be executed
 	 */
-	protected static function executeCommand( CommandEvent $event, $cmd, array $options = array() )
+	protected static function executeCommand(CommandEvent $event, $cmd, array $options = array())
 	{
-		$php = escapeshellarg( self::getPhp() );
-		$console = escapeshellarg( self::getConsoleDir( $event ) . '/console' );
-		$cmd = escapeshellarg( $cmd );
+		$php = escapeshellarg(self::getPhp());
+		$console = escapeshellarg(self::getConsoleDir($event).'/console');
+		$cmd = escapeshellarg($cmd);
 
-		foreach( $options as $key => $option ) {
-			$options[$key] = escapeshellarg( $option );
+		foreach ($options as $key => $option) {
+			$options[$key] = escapeshellarg($option);
 		}
 
-		if( $event->getIO()->isDecorated() ) {
+		if ($event->getIO()->isDecorated()) {
 			$console .= ' --ansi';
 		}
 
-		$process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 );
+		$process = new Process($php.' '.$console.' '.$cmd.' '.implode(' ', $options), null, null, null, 3600);
 
-		$process->run( function( $type, $buffer ) use ( $event ) {
-			$event->getIO()->write( $buffer, false );
+		$process->run(function($type, $buffer) use ($event) {
+			$event->getIO()->write($buffer, false);
 		} );
 
-		if( !$process->isSuccessful() ) {
-			throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) );
+		if (!$process->isSuccessful()) {
+			throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd)));
 		}
 	}
 
@@ -136,19 +136,19 @@ 
 	 * @return string The path to the console directory
 	 * @throws \RuntimeException If console directory couldn't be found
 	 */
-	protected static function getConsoleDir( CommandEvent $event )
+	protected static function getConsoleDir(CommandEvent $event)
 	{
-		$options = self::getOptions( $event );
+		$options = self::getOptions($event);
 
-		if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) {
+		if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) {
 			return $options['symfony-bin-dir'];
 		}
 
-		if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) {
+		if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) {
 			return $options['symfony-app-dir'];
 		}
 
-		throw new \RuntimeException( sprintf( 'Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir' ) );
+		throw new \RuntimeException(sprintf('Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir'));
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @param CommandEvent $event Command event object
 	 * @return array Associative list of option keys and values
 	 */
-	protected static function getOptions( CommandEvent $event )
+	protected static function getOptions(CommandEvent $event)
 	{
 		return $event->getComposer()->getPackage()->getExtra();
 	}
@@ -174,8 +174,8 @@ 
 	{
 		$phpFinder = new PhpExecutableFinder;
 
-		if( !( $phpPath = $phpFinder->find() ) ) {
-			throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' );
+		if (!($phpPath = $phpFinder->find())) {
+			throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again');
 		}
 
 		return $phpPath;
@@ -188,15 +188,15 @@ 
 	 * @param string $filename Name of the YAML config file
 	 * @throws \RuntimeException If file is not found
 	 */
-	protected static function updateConfigFile( $filename )
+	protected static function updateConfigFile($filename)
 	{
-		if( ( $content = file_get_contents( $filename ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) );
+		if (($content = file_get_contents($filename)) === false) {
+			throw new \RuntimeException(sprintf('File "%1$s" not found', $filename));
 		}
 
-		if( self::addAsseticBundle( $content ) === true ) {
+		if (self::addAsseticBundle($content) === true) {
 			$fs = new Filesystem();
-			$fs->dumpFile( $filename, $content );
+			$fs->dumpFile($filename, $content);
 		}
 	}
 
@@ -207,27 +207,27 @@ 
 	 * @param string $filename Name of the YAML config file
 	 * @throws \RuntimeException If file is not found
 	 */
-	protected static function updateRoutingFile( $filename )
+	protected static function updateRoutingFile($filename)
 	{
 		$update = false;
 
-		if( ( $content = file_get_contents( $filename ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) );
+		if (($content = file_get_contents($filename)) === false) {
+			throw new \RuntimeException(sprintf('File "%1$s" not found', $filename));
 		}
 
-		if( strpos( $content, 'aimeos_shop:' ) === false )
+		if (strpos($content, 'aimeos_shop:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop:
+			$content .= "\n".'aimeos_shop:
     resource: "@AimeosShopBundle/Resources/config/routing.yml"
     prefix: /';
 
 			$update = true;
 		}
 
-		if( $update === true )
+		if ($update === true)
 		{
 			$fs = new Filesystem();
-			$fs->dumpFile( $filename, $content );
+			$fs->dumpFile($filename, $content);
 		}
 	}
 
@@ -238,14 +238,14 @@ 
 	 * @param string &$content Content of the config.yml file
 	 * @return boolean True if modified, false if not
 	 */
-	protected static function addAsseticBundle( &$content )
+	protected static function addAsseticBundle(&$content)
 	{
-		if( preg_match( "/    bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 )
+		if (preg_match("/    bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1)
 		{
-			$search = array( "/    bundles:[ ]*\[([^\]]+)\]/", "/    bundles:[ ]*\[([ ]*)\]/" );
-			$replace = array( "    bundles: [$1,'AimeosShopBundle']", "    bundles: ['AimeosShopBundle']" );
+			$search = array("/    bundles:[ ]*\[([^\]]+)\]/", "/    bundles:[ ]*\[([ ]*)\]/");
+			$replace = array("    bundles: [$1,'AimeosShopBundle']", "    bundles: ['AimeosShopBundle']");
 
-			if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) {
+			if (($content = preg_replace($search, $replace, $content)) !== null) {
 				return true;
 			}
 		}

DependencyInjection/AimeosShopExtension.php

Spacing +19 added lines, -19 removed lines

@@ -31,21 +31,21 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function load( array $configs, ContainerBuilder $container )
+	public function load(array $configs, ContainerBuilder $container)
 	{
 		$configuration = new Configuration();
-		$config = $this->processConfiguration( $configuration, $configs );
+		$config = $this->processConfiguration($configuration, $configs);
 
-		foreach( $configs as $list ) {
-			$this->merge( $config, $list );
+		foreach ($configs as $list) {
+			$this->merge($config, $list);
 		}
 
-		foreach( $config as $key => $value ) {
-			$container->setParameter( 'aimeos_shop.' . $key, $value );
+		foreach ($config as $key => $value) {
+			$container->setParameter('aimeos_shop.'.$key, $value);
 		}
 
-		$loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) );
-		$loader->load( 'services.yml' );
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__).'/Resources/config'));
+		$loader->load('services.yml');
 	}
 
 
@@ -54,13 +54,13 @@ 
 	 *
 	 * @param ContainerBuilder $container ContainerBuilder object
 	 */
-	public function prepend( ContainerBuilder $container )
+	public function prepend(ContainerBuilder $container)
 	{
-		$configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml';
-		$config = Yaml::parse( file_get_contents( $configFile ) );
+		$configFile = dirname(__DIR__).'/Resources/config/aimeos_shop.yml';
+		$config = Yaml::parse(file_get_contents($configFile));
 
-		$container->prependExtensionConfig( 'aimeos_shop', $config );
-		$container->addResource( new FileResource( $configFile ) );
+		$container->prependExtensionConfig('aimeos_shop', $config);
+		$container->addResource(new FileResource($configFile));
 	}
 
 
@@ -70,15 +70,15 @@ 
 	 * @param array &$original Associative list of original values
 	 * @param array $overrule Associative list of new values
 	 */
-	protected function merge( array &$original, array $overrule )
+	protected function merge(array &$original, array $overrule)
 	{
-		foreach( array_keys( $overrule ) as $key )
+		foreach (array_keys($overrule) as $key)
 		{
-			if( isset( $original[$key] ) && is_array( $original[$key] ) ) {
-				if( is_array( $overrule[$key] ) ) {
-					$this->merge( $original[$key], $overrule[$key] );
+			if (isset($original[$key]) && is_array($original[$key])) {
+				if (is_array($overrule[$key])) {
+					$this->merge($original[$key], $overrule[$key]);
 				}
-			} elseif( isset( $overrule[$key] ) ) {
+			} elseif (isset($overrule[$key])) {
 				$original[$key] = $overrule[$key];
 			}
 		}

Tests/Controller/CheckoutControllerTest.php

Spacing +144 added lines, -144 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,9 +276,9 @@ 
 	{
 		$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());
 	}
 
 
@@ -288,30 +288,30 @@ 
 	 * @param \Symfony\Bundle\FrameworkBundle\Client $client HTTP test client
 	 * @return \Symfony\Component\DomCrawler\Crawler Crawler HTTP crawler
 	 */
-	protected function _goToSummary( $client )
+	protected function _goToSummary($client)
 	{
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.catalog-detail .addbasket .btn-action' )->form();
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-detail .addbasket .btn-action')->form();
+		$crawler = $client->submit($form);
 
-		$link = $crawler->filter( '.basket-standard .btn-action' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.basket-standard .btn-action')->link();
+		$crawler = $client->click($link);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['ca_billingoption']->select( $crawler->filter( '.checkout-standard-address .item-address input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['ca_billingoption']->select($crawler->filter('.checkout-standard-address .item-address input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_deliveryoption']->select( $crawler->filter( '.checkout-standard-delivery .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_deliveryoption']->select($crawler->filter('.checkout-standard-delivery .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
-		$form = $crawler->filter( '.checkout-standard form' )->form();
-		$form['c_paymentoption']->select( $crawler->filter( '.checkout-standard-payment .item-service input' )->attr( 'value' ) );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.checkout-standard form')->form();
+		$form['c_paymentoption']->select($crawler->filter('.checkout-standard-payment .item-service input')->attr('value'));
+		$crawler = $client->submit($form);
 
 		return $crawler;
 	}

Tests/Controller/JsonadmControllerTest.php

Spacing +98 added lines, -98 removed lines

@@ -12,29 +12,29 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
-		$client->request( 'OPTIONS', '/unittest/jsonadm/product' );
+		$client->request('OPTIONS', '/unittest/jsonadm/product');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 
 
-		$client->request( 'OPTIONS', '/unittest/jsonadm' );
+		$client->request('OPTIONS', '/unittest/jsonadm');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'resources', $json['meta'] );
-		$this->assertGreaterThan( 1, count( $json['meta']['resources'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('resources', $json['meta']);
+		$this->assertGreaterThan(1, count($json['meta']['resources']));
 	}
 
 
@@ -43,62 +43,62 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
 		$content = '{"data":{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony","product.stock.warehouse.label":"symfony"}}}';
-		$client->request( 'POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data']['attributes']);
+		$this->assertEquals('symfony', $json['data']['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony', $json['data']['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 		$id = $json['data']['attributes']['product.stock.warehouse.id'];
 
 
 		$content = '{"data":{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony2","product.stock.warehouse.label":"symfony2"}}}';
-		$client->request( 'PATCH', '/unittest/jsonadm/product/stock/warehouse/' . $id, array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/product/stock/warehouse/'.$id, array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['product.stock.warehouse.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals($id, $json['data']['attributes']['product.stock.warehouse.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'GET', '/unittest/jsonadm/product/stock/warehouse/' . $id );
+		$client->request('GET', '/unittest/jsonadm/product/stock/warehouse/'.$id);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['product.stock.warehouse.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals($id, $json['data']['attributes']['product.stock.warehouse.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'DELETE', '/unittest/jsonadm/product/stock/warehouse/' . $id );
+		$client->request('DELETE', '/unittest/jsonadm/product/stock/warehouse/'.$id);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
 	}
 
 
@@ -107,85 +107,85 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
 
 		$content = '{"data":[
 			{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony","product.stock.warehouse.label":"symfony"}},
 			{"type":"product/stock/warehouse","attributes":{"product.stock.warehouse.code":"symfony2","product.stock.warehouse.label":"symfony"}}
 		]}';
-		$client->request( 'POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 201, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 'symfony', $json['data'][1]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals('symfony', $json['data'][1]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals(2, $json['meta']['total']);
 
-		$ids = array( $json['data'][0]['attributes']['product.stock.warehouse.id'], $json['data'][1]['attributes']['product.stock.warehouse.id'] );
+		$ids = array($json['data'][0]['attributes']['product.stock.warehouse.id'], $json['data'][1]['attributes']['product.stock.warehouse.id']);
 
 
 		$content = '{"data":[
-			{"type":"product/stock/warehouse","id":' . $ids[0] . ',"attributes":{"product.stock.warehouse.label":"symfony2"}},
-			{"type":"product/stock/warehouse","id":' . $ids[1] . ',"attributes":{"product.stock.warehouse.label":"symfony2"}}
+			{"type":"product/stock/warehouse","id":' . $ids[0].',"attributes":{"product.stock.warehouse.label":"symfony2"}},
+			{"type":"product/stock/warehouse","id":' . $ids[1].',"attributes":{"product.stock.warehouse.label":"symfony2"}}
 		]}';
-		$client->request( 'PATCH', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
-
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'product.stock.warehouse.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
-
-
-		$getParams = array( 'filter' => array( '&&' => array(
-			array( '=~' => array( 'product.stock.warehouse.code' => 'symfony' ) ),
-			array( '==' => array( 'product.stock.warehouse.label' => 'symfony2' ) )
-			) ),
-			'sort' => 'product.stock.warehouse.code', 'page' => array( 'offset' => 0, 'limit' => 3 )
+		$json = json_decode($response->getContent(), true);
+
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('product.stock.warehouse.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
+
+
+		$getParams = array('filter' => array('&&' => array(
+			array('=~' => array('product.stock.warehouse.code' => 'symfony')),
+			array('==' => array('product.stock.warehouse.label' => 'symfony2'))
+			)),
+			'sort' => 'product.stock.warehouse.code', 'page' => array('offset' => 0, 'limit' => 3)
 		);
-		$client->request( 'GET', '/unittest/jsonadm/product/stock/warehouse', $getParams );
+		$client->request('GET', '/unittest/jsonadm/product/stock/warehouse', $getParams);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, count( $json['data'] ) );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['product.stock.warehouse.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['product.stock.warehouse.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['product.stock.warehouse.code']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['product.stock.warehouse.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['product.stock.warehouse.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['product.stock.warehouse.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
 
 
 		$content = '{"data":[
-			{"type":"product/stock/warehouse","id":' . $ids[0] . '},
-			{"type":"product/stock/warehouse","id":' . $ids[1] . '}
+			{"type":"product/stock/warehouse","id":' . $ids[0].'},
+			{"type":"product/stock/warehouse","id":' . $ids[1].'}
 		]}';
-		$client->request( 'DELETE', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content );
+		$client->request('DELETE', '/unittest/jsonadm/product/stock/warehouse', array(), array(), array(), $content);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, $json['meta']['total']);
 	}
 }

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'));

Command/JobsCommand.php

Spacing +37 added lines, -37 removed lines

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

Command/SetupCommand.php

Spacing +36 added lines, -36 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param string $classname Name of the setup task class
 	 * @return boolean True if class is found, false if not
 	 */
-	public static function autoload( $classname )
+	public static function autoload($classname)
 	{
-		if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 )
+		if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0)
 		{
-			$fileName = substr( $classname, 21 ) . '.php';
-			$paths = explode( PATH_SEPARATOR, get_include_path() );
+			$fileName = substr($classname, 21).'.php';
+			$paths = explode(PATH_SEPARATOR, get_include_path());
 
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$file = $path . DIRECTORY_SEPARATOR . $fileName;
+				$file = $path.DIRECTORY_SEPARATOR.$fileName;
 
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
+				if (file_exists($file) === true && (include_once $file) !== false) {
 					return true;
 				}
 			}
@@ -56,11 +56,11 @@ 
 	 */
 	protected function configure()
 	{
-		$this->setName( 'aimeos:setup');
-		$this->setDescription( 'Initialize or update the Aimeos database tables' );
-		$this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' );
-		$this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' );
-		$this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() );
+		$this->setName('aimeos:setup');
+		$this->setDescription('Initialize or update the Aimeos database tables');
+		$this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default');
+		$this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default');
+		$this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array());
 	}
 
 
@@ -70,35 +70,35 @@ 
 	 * @param InputInterface $input Input object
 	 * @param OutputInterface $output Output object
 	 */
-	protected function execute( InputInterface $input, OutputInterface $output )
+	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		$ctx = $this->getContainer()->get( 'aimeos_context' )->get( false );
-		$ctx->setEditor( 'aimeos:setup' );
+		$ctx = $this->getContainer()->get('aimeos_context')->get(false);
+		$ctx->setEditor('aimeos:setup');
 
 		$config = $ctx->getConfig();
-		$site = $input->getArgument( 'site' );
-		$tplsite = $input->getArgument( 'tplsite' );
+		$site = $input->getArgument('site');
+		$tplsite = $input->getArgument('tplsite');
 
-		$config->set( 'setup/site', $site );
-		$dbconfig = $this->getDbConfig( $config );
-		$this->setOptions( $config, $input );
+		$config->set('setup/site', $site);
+		$dbconfig = $this->getDbConfig($config);
+		$this->setOptions($config, $input);
 
-		$taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite );
+		$taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite);
 
 		$includePaths = $taskPaths;
 		$includePaths[] = get_include_path();
 
-		if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) {
-			throw new \Exception( 'Unable to extend include path' );
+		if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) {
+			throw new \Exception('Unable to extend include path');
 		}
 
-		spl_autoload_register( '\Aimeos\ShopBundle\Command\SetupCommand::autoload', true );
+		spl_autoload_register('\Aimeos\ShopBundle\Command\SetupCommand::autoload', true);
 
-		$manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx );
+		$manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx);
 
-		$output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) );
+		$output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site));
 
-		$manager->run( 'mysql' );
+		$manager->run('mysql');
 	}
 
 
@@ -108,14 +108,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $conf Config object
 	 * @return array Multi-dimensional associative list of database configuration parameters
 	 */
-	protected function getDbConfig( \Aimeos\MW\Config\Iface $conf )
+	protected function getDbConfig(\Aimeos\MW\Config\Iface $conf)
 	{
-		$dbconfig = $conf->get( 'resource', array() );
+		$dbconfig = $conf->get('resource', array());
 
-		foreach( $dbconfig as $rname => $dbconf )
+		foreach ($dbconfig as $rname => $dbconf)
 		{
-			if( strncmp( $rname, 'db', 2 ) !== 0 ) {
-				unset( $dbconfig[$rname] );
+			if (strncmp($rname, 'db', 2) !== 0) {
+				unset($dbconfig[$rname]);
 			}
 		}
 
@@ -131,12 +131,12 @@ 
 	 * @param array Associative list of database configurations
 	 * @throws \RuntimeException If the format of the options is invalid
 	 */
-	protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input )
+	protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input)
 	{
-		foreach( (array) $input->getOption( 'option' ) as $option )
+		foreach ((array) $input->getOption('option') as $option)
 		{
-			list( $name, $value ) = explode( ':', $option );
-			$conf->set( $name, $value );
+			list($name, $value) = explode(':', $option);
+			$conf->set($name, $value);
 		}
 	}
 }

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