aimeos / aimeos-symfony

DependencyInjection/Configuration.php

Spacing +15 added lines, -15 removed lines

@@ -29,26 +29,26 @@
 	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('backend')->defaultValue( array() )->end()
-				->variableNode('frontend')->defaultValue( array() )->end()
-				->variableNode('command')->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()
+				->variableNode('backend')->defaultValue(array())->end()
+				->variableNode('frontend')->defaultValue(array())->end()
+				->variableNode('command')->defaultValue(array())->end()
 			->end()
 		;
 

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":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}}}';
-		$client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/stock/type', 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( 'stock.type.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.label'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertArrayHasKey('stock.type.id', $json['data']['attributes']);
+		$this->assertEquals('symfony', $json['data']['attributes']['stock.type.code']);
+		$this->assertEquals('symfony', $json['data']['attributes']['stock.type.label']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 		$id = $json['data']['attributes']['stock.type.id'];
 
 
 		$content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony2"}}}';
-		$client->request( 'PATCH', '/unittest/jsonadm/stock/type/' . $id, array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/stock/type/'.$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( 'stock.type.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('stock.type.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']);
+		$this->assertEquals($id, $json['data']['attributes']['stock.type.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'GET', '/unittest/jsonadm/stock/type/' . $id );
+		$client->request('GET', '/unittest/jsonadm/stock/type/'.$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( 'stock.type.id', $json['data']['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] );
-		$this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] );
-		$this->assertEquals( 1, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertArrayHasKey('stock.type.id', $json['data']['attributes']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']);
+		$this->assertEquals($id, $json['data']['attributes']['stock.type.id']);
+		$this->assertEquals(1, $json['meta']['total']);
 
 
-		$client->request( 'DELETE', '/unittest/jsonadm/stock/type/' . $id );
+		$client->request('DELETE', '/unittest/jsonadm/stock/type/'.$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":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}},
 			{"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony"}}
 		]}';
-		$client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('POST', '/unittest/jsonadm/stock/type', 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( 'stock.type.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.label'] );
-		$this->assertEquals( 'symfony', $json['data'][1]['attributes']['stock.type.label'] );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(201, $response->getStatusCode());
+		$this->assertEquals(2, count($json['data']));
+		$this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.label']);
+		$this->assertEquals('symfony', $json['data'][1]['attributes']['stock.type.label']);
+		$this->assertEquals(2, $json['meta']['total']);
 
-		$ids = array( $json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id'] );
+		$ids = array($json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id']);
 
 
 		$content = '{"data":[
-			{"type":"stock/type","id":' . $ids[0] . ',"attributes":{"stock.type.label":"symfony2"}},
-			{"type":"stock/type","id":' . $ids[1] . ',"attributes":{"stock.type.label":"symfony2"}}
+			{"type":"stock/type","id":' . $ids[0].',"attributes":{"stock.type.label":"symfony2"}},
+			{"type":"stock/type","id":' . $ids[1].',"attributes":{"stock.type.label":"symfony2"}}
 		]}';
-		$client->request( 'PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('PATCH', '/unittest/jsonadm/stock/type', 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( 'stock.type.id', $json['data'][0]['attributes'] );
-		$this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) );
-		$this->assertEquals( 2, $json['meta']['total'] );
-
-
-		$getParams = array( 'filter' => array( '&&' => array(
-			array( '=~' => array( 'stock.type.code' => 'symfony' ) ),
-			array( '==' => array( 'stock.type.label' => 'symfony2' ) )
-			) ),
-			'sort' => 'stock.type.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('stock.type.id', $json['data'][0]['attributes']);
+		$this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
+
+
+		$getParams = array('filter' => array('&&' => array(
+			array('=~' => array('stock.type.code' => 'symfony')),
+			array('==' => array('stock.type.label' => 'symfony2'))
+			)),
+			'sort' => 'stock.type.code', 'page' => array('offset' => 0, 'limit' => 3)
 		);
-		$client->request( 'GET', '/unittest/jsonadm/stock/type', $getParams );
+		$client->request('GET', '/unittest/jsonadm/stock/type', $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']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.code'] );
-		$this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] );
-		$this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] );
-		$this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) );
-		$this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.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']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.code']);
+		$this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']);
+		$this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']);
+		$this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids));
+		$this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids));
+		$this->assertEquals(2, $json['meta']['total']);
 
 
 		$content = '{"data":[
-			{"type":"stock/type","id":' . $ids[0] . '},
-			{"type":"stock/type","id":' . $ids[1] . '}
+			{"type":"stock/type","id":' . $ids[0].'},
+			{"type":"stock/type","id":' . $ids[1].'}
 		]}';
-		$client->request( 'DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content );
+		$client->request('DELETE', '/unittest/jsonadm/stock/type', 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/AimeosShopExtension.php

Spacing +13 added lines, -13 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 ) {
-			$config = array_replace_recursive( $config, $list );
+		foreach ($configs as $list) {
+			$config = array_replace_recursive($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,12 +54,12 @@ 
 	 *
 	 * @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));
 	}
 }

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 = require $file;
 		break;
 	}
 }
 
-if( !$autoload )
+if (!$autoload)
 {
 	exit(
 	"Unable to find autoload.php file, please use composer to load dependencies:
@@ -30,4 +30,4 @@ 
 	);
 }
 
-AnnotationRegistry::registerLoader( array( $autoload, 'loadClass' ) );
+AnnotationRegistry::registerLoader(array($autoload, 'loadClass'));

Tests/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-symfony/cache';
+		return sys_get_temp_dir().'/aimeos-symfony/cache';
 	}
 
 
@@ -48,6 +48,6 @@ 
 	 */
 	public function getLogDir()
 	{
-		return sys_get_temp_dir() . '/aimeos-symfony/logs';
+		return sys_get_temp_dir().'/aimeos-symfony/logs';
 	}
 }

Service/I18n.php

Spacing +13 added lines, -13 removed lines

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

Service/Config.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -40,33 +40,33 @@ 
 	 * @param string $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MW\Config\Iface Config object
 	 */
-	public function get( $type = 'frontend' )
+	public function get($type = 'frontend')
 	{
 		$configPaths = $this->container->get('aimeos')->get()->getConfigPaths();
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths);
 
-		$apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' );
-		$prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' );
+		$apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable');
+		$prefix = $this->container->getParameter('aimeos_shop.apc_prefix');
 
-		if( function_exists( 'apcu_store' ) === true && $apc === true ) {
-			$conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix );
+		if (function_exists('apcu_store') === true && $apc === true) {
+			$conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix);
 		}
 
 		$local = array(
-			'admin' => $this->container->getParameter( 'aimeos_shop.admin' ),
-			'client' => $this->container->getParameter( 'aimeos_shop.client' ),
-			'controller' => $this->container->getParameter( 'aimeos_shop.controller' ),
-			'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ),
-			'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ),
-			'resource' => $this->container->getParameter( 'aimeos_shop.resource' ),
+			'admin' => $this->container->getParameter('aimeos_shop.admin'),
+			'client' => $this->container->getParameter('aimeos_shop.client'),
+			'controller' => $this->container->getParameter('aimeos_shop.controller'),
+			'madmin' => $this->container->getParameter('aimeos_shop.madmin'),
+			'mshop' => $this->container->getParameter('aimeos_shop.mshop'),
+			'resource' => $this->container->getParameter('aimeos_shop.resource'),
 		);
 
-		$config = new \Aimeos\MW\Config\Decorator\Memory( $conf, $local );
-		$settings = $this->container->getParameter( 'aimeos_shop.' . $type );
+		$config = new \Aimeos\MW\Config\Decorator\Memory($conf, $local);
+		$settings = $this->container->getParameter('aimeos_shop.'.$type);
 
-		if( $settings !== array() ) {
-			$config = new \Aimeos\MW\Config\Decorator\Memory( $config, $settings );
+		if ($settings !== array()) {
+			$config = new \Aimeos\MW\Config\Decorator\Memory($config, $settings);
 		}
 
 		return $config;

Tests/Entity/FosUserTest.php

Spacing +44 added lines, -44 removed lines

@@ -19,138 +19,138 @@ 
 
 	public function testGetId()
 	{
-		$this->assertEquals( null, $this->object->getId() );
+		$this->assertEquals(null, $this->object->getId());
 	}
 
 
 	public function testGetSetCompany()
 	{
-		$this->object->setCompany( 'ABC' );
-		$this->assertEquals( 'ABC', $this->object->getCompany() );
+		$this->object->setCompany('ABC');
+		$this->assertEquals('ABC', $this->object->getCompany());
 	}
 
 
 	public function testGetSetVatID()
 	{
-		$this->object->setVatID( 'AT0000' );
-		$this->assertEquals( 'AT0000', $this->object->getVatID() );
+		$this->object->setVatID('AT0000');
+		$this->assertEquals('AT0000', $this->object->getVatID());
 	}
 
 
 	public function testGetSetSalutation()
 	{
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation());
 
-		$this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR );
-		$this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation() );
+		$this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR);
+		$this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation());
 	}
 
 
 	public function testGetSetTitle()
 	{
-		$this->object->setTitle( 'Prof. Dr.' );
-		$this->assertEquals( 'Prof. Dr.', $this->object->getTitle() );
+		$this->object->setTitle('Prof. Dr.');
+		$this->assertEquals('Prof. Dr.', $this->object->getTitle());
 	}
 
 
 	public function testGetSetFirstname()
 	{
-		$this->object->setFirstname( 'first' );
-		$this->assertEquals( 'first', $this->object->getFirstname() );
+		$this->object->setFirstname('first');
+		$this->assertEquals('first', $this->object->getFirstname());
 	}
 
 
 	public function testGetSetLastname()
 	{
-		$this->object->setLastname( 'last' );
-		$this->assertEquals( 'last', $this->object->getLastname() );
+		$this->object->setLastname('last');
+		$this->assertEquals('last', $this->object->getLastname());
 	}
 
 
 	public function testGetSetAddress1()
 	{
-		$this->object->setAddress1( 'test street' );
-		$this->assertEquals( 'test street', $this->object->getAddress1() );
+		$this->object->setAddress1('test street');
+		$this->assertEquals('test street', $this->object->getAddress1());
 	}
 
 
 	public function testGetSetAddress2()
 	{
-		$this->object->setAddress2( '1' );
-		$this->assertEquals( '1', $this->object->getAddress2() );
+		$this->object->setAddress2('1');
+		$this->assertEquals('1', $this->object->getAddress2());
 	}
 
 
 	public function testGetSetAddress3()
 	{
-		$this->object->setAddress3( 'EG' );
-		$this->assertEquals( 'EG', $this->object->getAddress3() );
+		$this->object->setAddress3('EG');
+		$this->assertEquals('EG', $this->object->getAddress3());
 	}
 
 
 	public function testGetSetPostal()
 	{
-		$this->object->setPostal( '12345' );
-		$this->assertEquals( '12345', $this->object->getPostal() );
+		$this->object->setPostal('12345');
+		$this->assertEquals('12345', $this->object->getPostal());
 	}
 
 
 	public function testGetSetCity()
 	{
-		$this->object->setCity( 'Munich' );
-		$this->assertEquals( 'Munich', $this->object->getCity() );
+		$this->object->setCity('Munich');
+		$this->assertEquals('Munich', $this->object->getCity());
 	}
 
 
 	public function testGetSetState()
 	{
-		$this->object->setState( 'Bayern' );
-		$this->assertEquals( 'Bayern', $this->object->getState() );
+		$this->object->setState('Bayern');
+		$this->assertEquals('Bayern', $this->object->getState());
 	}
 
 
 	public function testGetSetCountryId()
 	{
-		$this->object->setCountryId( 'DE' );
-		$this->assertEquals( 'DE', $this->object->getCountryId() );
+		$this->object->setCountryId('DE');
+		$this->assertEquals('DE', $this->object->getCountryId());
 	}
 
 
 	public function testGetSetLanguageId()
 	{
-		$this->object->setLanguageId( 'de' );
-		$this->assertEquals( 'de', $this->object->getLanguageId() );
+		$this->object->setLanguageId('de');
+		$this->assertEquals('de', $this->object->getLanguageId());
 	}
 
 
 	public function testGetSetTelephone()
 	{
-		$this->object->setTelephone( '089123456789' );
-		$this->assertEquals( '089123456789', $this->object->getTelephone() );
+		$this->object->setTelephone('089123456789');
+		$this->assertEquals('089123456789', $this->object->getTelephone());
 	}
 
 
 	public function testGetSetTelefax()
 	{
-		$this->object->setTelefax( '089987654321' );
-		$this->assertEquals( '089987654321', $this->object->getTelefax() );
+		$this->object->setTelefax('089987654321');
+		$this->assertEquals('089987654321', $this->object->getTelefax());
 	}
 
 
 	public function testGetSetWebsite()
 	{
-		$this->object->setWebsite( 'http://aimeos.org' );
-		$this->assertEquals( 'http://aimeos.org', $this->object->getWebsite() );
+		$this->object->setWebsite('http://aimeos.org');
+		$this->assertEquals('http://aimeos.org', $this->object->getWebsite());
 	}
 
 
@@ -159,6 +159,6 @@ 
 	 */
 	public function testSetWebsiteInvalid()
 	{
-		$this->object->setWebsite( 'aimeos+org' );
+		$this->object->setWebsite('aimeos+org');
 	}
 }

Tests/Entity/UserTest.php

Spacing +9 added lines, -9 removed lines

@@ -19,50 +19,50 @@
 
 	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());
 	}
 
 
 	public function testEraseCredentials()
 	{
 		$this->object->eraseCredentials();
-		$this->assertNull( $this->object->getPassword() );
+		$this->assertNull($this->object->getPassword());
 	}
 
 
 	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->assertNull( $this->object->getId() );
+		$this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}');
+		$this->assertNull($this->object->getId());
 	}
 }