aimeos / aimeos-symfony

Entity/FosUser.php

Spacing +7 added lines, -7 removed lines

@@ -209,7 +209,7 @@ 
 	 */
 	public function getSalutation()
 	{
-		return ( isset( $this->salutation ) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
+		return (isset($this->salutation) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public function setSalutation($salutation)
 	{
-		switch( $salutation )
+		switch ($salutation)
 		{
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN:
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY:
@@ -229,7 +229,7 @@ 
 			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR:
 				break;
 			default:
-				throw new \Exception( sprintf( 'Address salutation "%1$s" is unknown', $value ) );
+				throw new \Exception(sprintf('Address salutation "%1$s" is unknown', $value));
 		}
 
 		$this->salutation = (string) $salutation;
@@ -441,7 +441,7 @@ 
 	 */
 	public function setCountryId($countryid)
 	{
-		$this->countryid = strtoupper( (string) $countryid );
+		$this->countryid = strtoupper((string) $countryid);
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 */
 	public function setLanguageId($langid)
 	{
-		$this->langid = strtolower( (string) $langid );
+		$this->langid = strtolower((string) $langid);
 	}
 
 
@@ -542,8 +542,8 @@ 
 	{
 		$pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#';
 
-		if( $website !== '' && preg_match( $pattern, $website ) !== 1 ) {
-			throw new \Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
+		if ($website !== '' && preg_match($pattern, $website) !== 1) {
+			throw new \Exception(sprintf('Invalid web site URL "%1$s"', $website));
 		}
 
 		$this->website = (string) $website;

Command/SetupCommand.php

Spacing +35 added lines, -35 removed lines

@@ -25,18 +25,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;
 
-				if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
+				if (file_exists($file) === true && (include_once $file) !== false) {
 					return true;
 				}
 			}
@@ -51,11 +51,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());
 	}
 
 
@@ -65,35 +65,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');
 	}
 
 
@@ -103,14 +103,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]);
 			}
 		}
 
@@ -126,12 +126,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/JsonadmControllerTest.php

Spacing +94 added lines, -94 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"}}
 		]}';
-		$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] . '}
 		]}';
-		$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']);
 	}
 }

DependencyInjection/Configuration.php

Spacing +12 added lines, -12 removed lines

@@ -29,23 +29,23 @@
 	public function getConfigTreeBuilder()
 	{
 		$treeBuilder = new TreeBuilder();
-		$rootNode = $treeBuilder->root( 'aimeos_shop' );
+		$rootNode = $treeBuilder->root('aimeos_shop');
 
 		$rootNode
 			->children()
-				->booleanNode('disable_sites')->defaultValue( true )->end()
-				->booleanNode('apc_enable')->defaultValue( false )->end()
-				->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end()
+				->booleanNode('disable_sites')->defaultValue(true)->end()
+				->booleanNode('apc_enable')->defaultValue(false)->end()
+				->scalarNode('apc_prefix')->defaultValue('sf2:')->end()
 				->scalarNode('extdir')->end()
 				->scalarNode('uploaddir')->end()
-				->variableNode('admin')->defaultValue( array() )->end()
-				->variableNode('client')->defaultValue( array() )->end()
-				->variableNode('controller')->defaultValue( array() )->end()
-				->variableNode('i18n')->defaultValue( array() )->end()
-				->variableNode('madmin')->defaultValue( array() )->end()
-				->variableNode('mshop')->defaultValue( array() )->end()
-				->variableNode('resource')->defaultValue( array() )->end()
-				->variableNode('page')->defaultValue( array() )->end()
+				->variableNode('admin')->defaultValue(array())->end()
+				->variableNode('client')->defaultValue(array())->end()
+				->variableNode('controller')->defaultValue(array())->end()
+				->variableNode('i18n')->defaultValue(array())->end()
+				->variableNode('madmin')->defaultValue(array())->end()
+				->variableNode('mshop')->defaultValue(array())->end()
+				->variableNode('resource')->defaultValue(array())->end()
+				->variableNode('page')->defaultValue(array())->end()
 			->end()
 		;
 

Tests/Controller/AdminControllerTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,11 +11,11 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'GET', '/admin' );
+		$client->request('GET', '/admin');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<form class="login"', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<form class="login"', $response->getContent());
 	}
 
 
@@ -24,12 +24,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/admin' );
+		$client->request('GET', '/admin');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 302, $response->getStatusCode() );
-		$this->assertContains( '/default/jqadm/search/product?lang=en', $response->getContent() );
+		$this->assertEquals(302, $response->getStatusCode());
+		$this->assertContains('/default/jqadm/search/product?lang=en', $response->getContent());
 	}
 }

Tests/Entity/UserTest.php

Spacing +7 added lines, -7 removed lines

@@ -19,31 +19,31 @@ 
 
 	public function testGetId()
 	{
-		$this->assertEquals( null, $this->object->getId() );
+		$this->assertEquals(null, $this->object->getId());
 	}
 
 
 	public function testGetUsername()
 	{
-		$this->assertEquals( null, $this->object->getUsername() );
+		$this->assertEquals(null, $this->object->getUsername());
 	}
 
 
 	public function testGetPassword()
 	{
-		$this->assertEquals( null, $this->object->getPassword() );
+		$this->assertEquals(null, $this->object->getPassword());
 	}
 
 
 	public function testGetSalt()
 	{
-		$this->assertEquals( 'mshop', $this->object->getSalt() );
+		$this->assertEquals('mshop', $this->object->getSalt());
 	}
 
 
 	public function testGetRoles()
 	{
-		$this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() );
+		$this->assertEquals(array('ROLE_USER'), $this->object->getRoles());
 	}
 
 
@@ -55,12 +55,12 @@ 
 
 	public function testSerialize()
 	{
-		$this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() );
+		$this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize());
 	}
 
 
 	public function testUnserialize()
 	{
-		$this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' );
+		$this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}');
 	}
 }

Controller/AdminController.php

Spacing +11 added lines, -11 removed lines

@@ -29,23 +29,23 @@ 
 	 */
 	public function indexAction()
 	{
-		if( $this->isAdmin() )
+		if ($this->isAdmin())
 		{
-			$params = array( 'site' => 'default', 'resource' => 'product', 'lang' => 'en' );
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
+			$params = array('site' => 'default', 'resource' => 'product', 'lang' => 'en');
+			return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params));
 		}
 
-		$param = array( 'error' => '', 'username' => '' );
+		$param = array('error' => '', 'username' => '');
 
-		if( $this->has( 'security.authentication_utils' ) )
+		if ($this->has('security.authentication_utils'))
 		{
-			$auth = $this->get( 'security.authentication_utils' );
+			$auth = $this->get('security.authentication_utils');
 
 			$param['error'] = $auth->getLastAuthenticationError();
 			$param['username'] = $auth->getLastUsername();
 		}
 
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param );
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $param);
 	}
 
 
@@ -56,10 +56,10 @@ 
 	 */
 	protected function isAdmin()
 	{
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken()
-			&& $this->get( 'security.authorization_checker' )->isGranted( 'ROLE_ADMIN' )
-			|| $this->has( 'security.context' ) && $this->get( 'security.context' )->getToken()
-			&& $this->get( 'security.context' )->isGranted( 'ROLE_ADMIN' )
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken()
+			&& $this->get('security.authorization_checker')->isGranted('ROLE_ADMIN')
+			|| $this->has('security.context') && $this->get('security.context')->getToken()
+			&& $this->get('security.context')->isGranted('ROLE_ADMIN')
 		) {
 			return true;
 		}

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