aimeos / aimeos-symfony

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;

Controller/JsonapiController.php

Spacing +18 added lines, -18 removed lines

@@ -31,9 +31,9 @@ 
 	 * @param string Related resource location, e.g. "address"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function deleteAction( ServerRequestInterface $request, $resource, $related = '' )
+	public function deleteAction(ServerRequestInterface $request, $resource, $related = '')
 	{
-		return $this->createClient( $resource, $related )->delete( $request, new Response() );
+		return $this->createClient($resource, $related)->delete($request, new Response());
 	}
 
 
@@ -45,9 +45,9 @@ 
 	 * @param string Related resource location, e.g. "address"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function getAction( ServerRequestInterface $request, $resource, $related = '' )
+	public function getAction(ServerRequestInterface $request, $resource, $related = '')
 	{
-		return $this->createClient( $resource, $related )->get( $request, new Response() );
+		return $this->createClient($resource, $related)->get($request, new Response());
 	}
 
 
@@ -59,9 +59,9 @@ 
 	 * @param string Related resource location, e.g. "address"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function patchAction( ServerRequestInterface $request, $resource, $related = '' )
+	public function patchAction(ServerRequestInterface $request, $resource, $related = '')
 	{
-		return $this->createClient( $resource, $related )->patch( $request, new Response() );
+		return $this->createClient($resource, $related)->patch($request, new Response());
 	}
 
 
@@ -73,9 +73,9 @@ 
 	 * @param string Related resource location, e.g. "address"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function postAction( ServerRequestInterface $request, $resource, $related = '' )
+	public function postAction(ServerRequestInterface $request, $resource, $related = '')
 	{
-		return $this->createClient( $resource, $related )->post( $request, new Response() );
+		return $this->createClient($resource, $related)->post($request, new Response());
 	}
 
 
@@ -87,9 +87,9 @@ 
 	 * @param string Related resource location, e.g. "address"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function putAction( ServerRequestInterface $request, $resource, $related = '' )
+	public function putAction(ServerRequestInterface $request, $resource, $related = '')
 	{
-		return $this->createClient( $resource, $related )->put( $request, new Response() );
+		return $this->createClient($resource, $related)->put($request, new Response());
 	}
 
 
@@ -100,9 +100,9 @@ 
 	 * @param string Resource location, e.g. "customer"
 	 * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output
 	 */
-	public function optionsAction( ServerRequestInterface $request, $resource = '' )
+	public function optionsAction(ServerRequestInterface $request, $resource = '')
 	{
-		return $this->createClient( $resource )->options( $request, new Response() );
+		return $this->createClient($resource)->options($request, new Response());
 	}
 
 
@@ -113,15 +113,15 @@ 
 	 * @param string Related resource location, e.g. "address"
 	 * @return \Aimeos\Client\JsonApi\Iface JSON API client
 	 */
-	protected function createClient( $resource, $related = '' )
+	protected function createClient($resource, $related = '')
 	{
-		$tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' );
-		$context = $this->container->get( 'aimeos_context' )->get();
+		$tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates');
+		$context = $this->container->get('aimeos_context')->get();
 		$langid = $context->getLocale()->getLanguageId();
 
-		$view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid );
-		$context->setView( $view );
+		$view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid);
+		$context->setView($view);
 
-		return \Aimeos\Client\JsonApi\Factory::createClient( $context, $tmplPaths, $resource . '/' . $related );
+		return \Aimeos\Client\JsonApi\Factory::createClient($context, $tmplPaths, $resource.'/'.$related);
 	}
 }

Tests/Controller/JsonapiControllerTest.php

Spacing +202 added lines, -202 removed lines

@@ -10,74 +10,74 @@ 
 	public function testOptionsAction()
 	{
 		$client = static::createClient();
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
 		$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']));
 	}
 
 
 	public function testPutAction()
 	{
 		$client = static::createClient();
-		$client->request( 'PUT', '/unittest/de/EUR/jsonapi/basket' );
+		$client->request('PUT', '/unittest/de/EUR/jsonapi/basket');
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$this->assertNotNull( $json );
-		$this->assertEquals( 403, $response->getStatusCode() );
-		$this->assertArrayHasKey( 'errors', $json );
+		$this->assertNotNull($json);
+		$this->assertEquals(403, $response->getStatusCode());
+		$this->assertArrayHasKey('errors', $json);
 	}
 
 
 	public function testGetAttributeAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/attribute', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/attribute', []);
 		$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( 24, $json['meta']['total'] );
-		$this->assertEquals( 24, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(24, $json['meta']['total']);
+		$this->assertEquals(24, count($json['data']));
 	}
 
 
 	public function testGetCatalogAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/catalog', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/catalog', []);
 		$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->assertEquals( 4, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(4, count($json['data']));
 	}
 
 
 	public function testGetLocaleAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/locale', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/locale', []);
 		$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->assertEquals( 1, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(1, count($json['data']));
 	}
 
 
@@ -86,60 +86,60 @@ 
 		$client = static::createClient();
 
 		$params = ['filter' => ['f_search' => 'Cafe Noire Cap', 'f_listtype' => 'unittype19']];
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/product', $params );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/product', $params);
 		$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->assertEquals( 1, count( $json['data'] ) );
-		$this->assertArrayHasKey( 'id', $json['data'][0] );
-		$this->assertEquals( 'CNC', $json['data'][0]['attributes']['product.code'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(1, count($json['data']));
+		$this->assertArrayHasKey('id', $json['data'][0]);
+		$this->assertEquals('CNC', $json['data'][0]['attributes']['product.code']);
 
 		$id = $json['data'][0]['id'];
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/product/' . $id );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/product/'.$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->assertArrayHasKey( 'id', $json['data'] );
-		$this->assertEquals( 'CNC', $json['data']['attributes']['product.code'] );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertArrayHasKey('id', $json['data']);
+		$this->assertEquals('CNC', $json['data']['attributes']['product.code']);
 	}
 
 
 	public function testGetServiceAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/service', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/service', []);
 		$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( 4, $json['meta']['total'] );
-		$this->assertEquals( 4, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(4, $json['meta']['total']);
+		$this->assertEquals(4, count($json['data']));
 	}
 
 
 	public function testGetStockAction()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/stock', ['filter' => ['s_prodcode' => ['CNC', 'CNE']]] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/stock', ['filter' => ['s_prodcode' => ['CNC', 'CNE']]]);
 		$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->assertEquals( 2, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(2, $json['meta']['total']);
+		$this->assertEquals(2, count($json['data']));
 	}
 
 
@@ -147,24 +147,24 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$optJson = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $optJson['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$optJson = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($optJson['meta']['resources']));
 
 		// catalog root
-		$client->request( 'GET', $optJson['meta']['resources']['catalog'], ['include' => 'catalog'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'categories', $json['included'][0]['attributes']['catalog.code'] );
+		$client->request('GET', $optJson['meta']['resources']['catalog'], ['include' => 'catalog']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('categories', $json['included'][0]['attributes']['catalog.code']);
 
 		// "categories" category
-		$client->request( 'GET', $json['included'][0]['links']['self']['href'], ['include' => 'catalog'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'cafe', $json['included'][0]['attributes']['catalog.code'] );
+		$client->request('GET', $json['included'][0]['links']['self']['href'], ['include' => 'catalog']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('cafe', $json['included'][0]['attributes']['catalog.code']);
 
 		// product list for "cafe" category
-		$client->request( 'GET', $optJson['meta']['resources']['product'], ['f_catid' => $json['included'][0]['id']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'CNE', $json['data'][0]['attributes']['product.code'] );
+		$client->request('GET', $optJson['meta']['resources']['product'], ['f_catid' => $json['included'][0]['id']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('CNE', $json['data'][0]['attributes']['product.code']);
 	}
 
 
@@ -172,26 +172,26 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$options = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $options['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$options = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($options['meta']['resources']));
 
 		// all available attrbutes
-		$client->request( 'GET', $options['meta']['resources']['attribute'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
+		$client->request('GET', $options['meta']['resources']['attribute']);
+		$json = json_decode($client->getResponse()->getContent(), true);
 
-		foreach( $json['data'] as $entry )
+		foreach ($json['data'] as $entry)
 		{
-			if( $entry['attributes']['attribute.code'] === 'xl' )
+			if ($entry['attributes']['attribute.code'] === 'xl')
 			{
 				// products with attrbute "xl"
-				$client->request( 'GET', $options['meta']['resources']['product'], ['filter' => ['f_attrid' => $entry['id']]] );
+				$client->request('GET', $options['meta']['resources']['product'], ['filter' => ['f_attrid' => $entry['id']]]);
 				break;
 			}
 		}
 
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 2, $json['meta']['total'] );
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(2, $json['meta']['total']);
 	}
 
 
@@ -199,14 +199,14 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// product list for full text search
-		$client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'selection']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 3, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'selection']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(3, count($json['data']));
 	}
 
 
@@ -214,23 +214,23 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// get empty basket
-		$client->request( 'GET', $json['meta']['resources']['basket'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket', $json['data']['type'] );
+		$client->request('GET', $json['meta']['resources']['basket']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket', $json['data']['type']);
 
 		$content = '{"data": {"id": "delivery", "attributes": {"order.base.address.firstname": "test"}}}';
-		$client->request( 'POST', $json['links']['basket/address']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/address', $json['included'][0]['type'] );
+		$client->request('POST', $json['links']['basket/address']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/address', $json['included'][0]['type']);
 
-		$client->request( 'DELETE', $json['included'][0]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 0, count( $json['included'] ) );
+		$client->request('DELETE', $json['included'][0]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(0, count($json['included']));
 	}
 
 
@@ -238,31 +238,31 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// product for code "CNC"
-		$client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
 		// add product "CNC" as prerequisite
-		$content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/product', $json['included'][0]['type'] );
+		$content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/product', $json['included'][0]['type']);
 
 		// add coupon "GHIJ"
 		$content = '{"data": {"id": "GHIJ"}}';
-		$client->request( 'POST', $json['links']['basket/coupon']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/coupon', $json['included'][2]['type'] );
+		$client->request('POST', $json['links']['basket/coupon']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/coupon', $json['included'][2]['type']);
 
 		// remove coupon "GHIJ" again
-		$client->request( 'DELETE', $json['included'][2]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['included'] ) );
+		$client->request('DELETE', $json['included'][2]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['included']));
 	}
 
 
@@ -270,28 +270,28 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// product for code "CNC"
-		$client->request( 'GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'ABCD']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['product'], ['filter' => ['f_search' => 'ABCD']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
-		$content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/product', $json['included'][0]['type'] );
+		$content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/product', $json['included'][0]['type']);
 
 		$content = '{"data": {"attributes": {"quantity": 2}}}';
-		$client->request( 'PATCH', $json['included'][0]['links']['self']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 2, $json['included'][0]['attributes']['order.base.product.quantity'] );
+		$client->request('PATCH', $json['included'][0]['links']['self']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(2, $json['included'][0]['attributes']['order.base.product.quantity']);
 
-		$client->request( 'DELETE', $json['included'][0]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 0, count( $json['included'] ) );
+		$client->request('DELETE', $json['included'][0]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(0, count($json['included']));
 	}
 
 
@@ -299,14 +299,14 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $json['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($json['meta']['resources']));
 
 		// payment services
-		$client->request( 'GET', $json['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 3, count( $json['data'] ) );
+		$client->request('GET', $json['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(3, count($json['data']));
 
 		$content = ['data' => ['id' => 'payment', 'attributes' => [
 			'service.id' => $json['data'][1]['id'],
@@ -315,15 +315,15 @@ 
 			'directdebit.bankcode' => 'ABCDEFGH',
 			'directdebit.bankname' => 'test bank',
 		]]];
-		$client->request( 'POST', $json['data'][1]['links']['basket/service']['href'], [], [], [], json_encode( $content ) );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/service', $json['included'][0]['type'] );
-		$this->assertEquals( 'directdebit-test', $json['included'][0]['attributes']['order.base.service.code'] );
-		$this->assertEquals( 5, count( $json['included'][0]['attributes']['attribute'] ) );
-
-		$client->request( 'DELETE', $json['included'][0]['links']['self']['href'] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 0, count( $json['included'] ) );
+		$client->request('POST', $json['data'][1]['links']['basket/service']['href'], [], [], [], json_encode($content));
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/service', $json['included'][0]['type']);
+		$this->assertEquals('directdebit-test', $json['included'][0]['attributes']['order.base.service.code']);
+		$this->assertEquals(5, count($json['included'][0]['attributes']['attribute']));
+
+		$client->request('DELETE', $json['included'][0]['links']['self']['href']);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(0, count($json['included']));
 	}
 
 
@@ -332,17 +332,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/customer', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/customer', []);
 		$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->assertEquals( 4, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(4, count($json['data']));
 	}
 
 
@@ -351,22 +351,22 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/customer', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/customer', []);
 		$response = $client->getResponse();
 
-		$json = json_decode( $response->getContent(), true );
+		$json = json_decode($response->getContent(), true);
 
-		$client->request( 'GET', $json['links']['customer/address']['href'], [] );
+		$client->request('GET', $json['links']['customer/address']['href'], []);
 		$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->assertEquals( 1, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(1, $json['meta']['total']);
+		$this->assertEquals(1, count($json['data']));
 	}
 
 
@@ -375,17 +375,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'UTC001',
 			'PHP_AUTH_PW'   => 'unittest',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/order', [] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/order', []);
 		$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( 5, $json['meta']['total'] );
-		$this->assertEquals( 5, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(5, $json['meta']['total']);
+		$this->assertEquals(5, count($json['data']));
 	}
 
 
@@ -393,63 +393,63 @@ 
 	{
 		$client = static::createClient();
 
-		$client->request( 'OPTIONS', '/unittest/de/EUR/jsonapi' );
-		$optJson = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertGreaterThan( 8, count( $optJson['meta']['resources'] ) );
+		$client->request('OPTIONS', '/unittest/de/EUR/jsonapi');
+		$optJson = json_decode($client->getResponse()->getContent(), true);
+		$this->assertGreaterThan(8, count($optJson['meta']['resources']));
 
 		// product for code "CNC"
-		$client->request( 'GET', $optJson['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $optJson['meta']['resources']['product'], ['filter' => ['==' => ['product.code' => 'CNC']]]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
 		// add product "CNC"
-		$content = '{"data": {"attributes": {"product.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/product', $json['included'][0]['type'] );
+		$content = '{"data": {"attributes": {"product.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/product']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/product', $json['included'][0]['type']);
 
 		// delivery services
-		$client->request( 'GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'delivery']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 1, count( $json['data'] ) );
+		$client->request('GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'delivery']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(1, count($json['data']));
 
 		// add delivery service
-		$content = '{"data": {"id": "delivery", "attributes": {"service.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/service', $json['included'][1]['type'] );
+		$content = '{"data": {"id": "delivery", "attributes": {"service.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/service', $json['included'][1]['type']);
 
 		// payment services
-		$client->request( 'GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']] );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 3, count( $json['data'] ) );
+		$client->request('GET', $optJson['meta']['resources']['service'], ['filter' => ['cs_type' => 'payment']]);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(3, count($json['data']));
 
 		// add payment service
-		$content = '{"data": {"id": "payment", "attributes": {"service.id": ' . $json['data'][0]['id'] . '}}}';
-		$client->request( 'POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/service', $json['included'][2]['type'] );
+		$content = '{"data": {"id": "payment", "attributes": {"service.id": '.$json['data'][0]['id'].'}}}';
+		$client->request('POST', $json['data'][0]['links']['basket/service']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/service', $json['included'][2]['type']);
 
 		// add address
 		$content = '{"data": {"id": "payment", "attributes": {"order.base.address.firstname": "test"}}}';
-		$client->request( 'POST', $json['links']['basket/address']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( 'basket/address', $json['included'][3]['type'] );
+		$client->request('POST', $json['links']['basket/address']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals('basket/address', $json['included'][3]['type']);
 
 		// store basket
-		$client->request( 'POST', $json['data']['links']['self']['href'] );
-		$basketJson = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( true, ctype_digit( $basketJson['data']['id'] ) );
+		$client->request('POST', $json['data']['links']['self']['href']);
+		$basketJson = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(true, ctype_digit($basketJson['data']['id']));
 
 		// add order
-		$content = '{"data": {"attributes": {"order.baseid": ' . $basketJson['data']['id'] . '}}}';
-		$client->request( 'POST', $basketJson['links']['order']['href'], [], [], [], $content );
-		$json = json_decode( $client->getResponse()->getContent(), true );
-		$this->assertEquals( true, ctype_digit( $json['data']['id'] ) );
+		$content = '{"data": {"attributes": {"order.baseid": '.$basketJson['data']['id'].'}}}';
+		$client->request('POST', $basketJson['links']['order']['href'], [], [], [], $content);
+		$json = json_decode($client->getResponse()->getContent(), true);
+		$this->assertEquals(true, ctype_digit($json['data']['id']));
 
 
 		// delete created order
-		$context = static::$kernel->getContainer()->get( 'aimeos_context' )->get();
-		\Aimeos\MShop\Factory::createManager( $context, 'order/base' )->deleteItem( $basketJson['data']['id'] );
+		$context = static::$kernel->getContainer()->get('aimeos_context')->get();
+		\Aimeos\MShop\Factory::createManager($context, 'order/base')->deleteItem($basketJson['data']['id']);
 	}
 }

Composer/ScriptHandler.php

Spacing +71 added lines, -71 removed lines

@@ -28,18 +28,18 @@ 
 	 * @param Event $event Event instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function setupDatabase( Event $event )
+	public static function setupDatabase(Event $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,20 +49,20 @@ 
 	 * @param Event $event Event instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function updateConfig( Event $event )
+	public static function updateConfig(Event $event)
 	{
-		$event->getIO()->write( 'Ensure existing config and routing for the shop bundle' );
+		$event->getIO()->write('Ensure existing config and routing for the 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']));
 		}
 
-		self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' );
-		self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' );
+		self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml');
+		self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml');
 	}
 
 
@@ -72,28 +72,28 @@ 
 	 * @param Event $event Event instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function installBundle( Event $event )
+	public static function installBundle(Event $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::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::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');
 	}
 
 
@@ -103,14 +103,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));
 		}
 	}
 
@@ -123,28 +123,28 @@ 
 	 * @param array List of configuration options for the given command
 	 * @throws \RuntimeException If the command couldn't be executed
 	 */
-	protected static function executeCommand( Event $event, $cmd, array $options = array() )
+	protected static function executeCommand(Event $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)));
 		}
 	}
 
@@ -157,19 +157,19 @@ 
 	 * @return string The path to the console directory
 	 * @throws \RuntimeException If console directory couldn't be found
 	 */
-	protected static function getConsoleDir( Event $event )
+	protected static function getConsoleDir(Event $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'));
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 * @param Event $event Command event object
 	 * @return array Associative list of option keys and values
 	 */
-	protected static function getOptions( Event $event )
+	protected static function getOptions(Event $event)
 	{
 		return $event->getComposer()->getPackage()->getExtra();
 	}
@@ -195,8 +195,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;
@@ -209,15 +209,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);
 		}
 	}
 
@@ -228,56 +228,56 @@ 
 	 * @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)
 	{
-		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: /';
 		}
 
-		if( strpos( $content, 'aimeos_shop_adm:' ) === false )
+		if (strpos($content, 'aimeos_shop_adm:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop_adm:
+			$content .= "\n".'aimeos_shop_adm:
     resource: "@AimeosShopBundle/Resources/config/routing_adm.yml"
     prefix: /';
 		}
 
-		if( strpos( $content, 'aimeos_shop_extadm:' ) === false )
+		if (strpos($content, 'aimeos_shop_extadm:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop_extadm:
+			$content .= "\n".'aimeos_shop_extadm:
     resource: "@AimeosShopBundle/Resources/config/routing_extadm.yml"
     prefix: /admin/{site}/extadm';
 		}
 
-		if( strpos( $content, 'aimeos_shop_jqadm:' ) === false )
+		if (strpos($content, 'aimeos_shop_jqadm:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop_jqadm:
+			$content .= "\n".'aimeos_shop_jqadm:
     resource: "@AimeosShopBundle/Resources/config/routing_jqadm.yml"
     prefix: /admin/{site}/jqadm';
 		}
 
-		if( strpos( $content, 'aimeos_shop_jsonadm:' ) === false )
+		if (strpos($content, 'aimeos_shop_jsonadm:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop_jsonadm:
+			$content .= "\n".'aimeos_shop_jsonadm:
     resource: "@AimeosShopBundle/Resources/config/routing_jsonadm.yml"
     prefix: /admin/{site}/jsonadm';
 		}
 
-		if( strpos( $content, 'aimeos_shop_jsonapi:' ) === false )
+		if (strpos($content, 'aimeos_shop_jsonapi:') === false)
 		{
-			$content .= "\n" . 'aimeos_shop_jsonapi:
+			$content .= "\n".'aimeos_shop_jsonapi:
     resource: "@AimeosShopBundle/Resources/config/routing_jsonapi.yml"
     prefix: /jsonapi';
 		}
 
 		$fs = new Filesystem();
-		$fs->dumpFile( $filename, $content );
+		$fs->dumpFile($filename, $content);
 	}
 
 
@@ -287,14 +287,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;
 			}
 		}

Service/Context.php

Spacing +52 added lines, -52 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -44,37 +44,37 @@ 
 	 * @param string $type Configuration type ("frontend" or "backend")
 	 * @return \Aimeos\MShop\Context\Item\Iface Context object
 	 */
-	public function get( $locale = true, $type = 'frontend' )
+	public function get($locale = true, $type = 'frontend')
 	{
-		$config = $this->container->get( 'aimeos_config' )->get( $type );
+		$config = $this->container->get('aimeos_config')->get($type);
 
-		if( self::$context === null )
+		if (self::$context === null)
 		{
 			$context = new \Aimeos\MShop\Context\Item\Standard();
-			$context->setConfig( $config );
+			$context->setConfig($config);
 
-			$this->addDataBaseManager( $context );
-			$this->addFilesystemManager( $context );
-			$this->addMessageQueueManager( $context );
-			$this->addLogger( $context );
-			$this->addCache( $context );
-			$this->addMailer( $context);
+			$this->addDataBaseManager($context);
+			$this->addFilesystemManager($context);
+			$this->addMessageQueueManager($context);
+			$this->addLogger($context);
+			$this->addCache($context);
+			$this->addMailer($context);
 
 			self::$context = $context;
 		}
 
 		$context = self::$context;
-		$context->setConfig( $config );
+		$context->setConfig($config);
 
-		if( $locale === true )
+		if ($locale === true)
 		{
-			$localeItem = $this->container->get('aimeos_locale')->get( $context );
-			$context->setI18n( $this->container->get('aimeos_i18n')->get( array( $localeItem->getLanguageId() ) ) );
-			$context->setLocale( $localeItem );
+			$localeItem = $this->container->get('aimeos_locale')->get($context);
+			$context->setI18n($this->container->get('aimeos_i18n')->get(array($localeItem->getLanguageId())));
+			$context->setLocale($localeItem);
 		}
 
-		$this->addSession( $context );
-		$this->addUserGroups( $context);
+		$this->addSession($context);
+		$this->addUserGroups($context);
 
 		return $context;
 	}
@@ -86,10 +86,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addCache( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addCache(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context );
-		$context->setCache( $cache );
+		$cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context);
+		$context->setCache($cache);
 
 		return $context;
 	}
@@ -101,10 +101,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() );
-		$context->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig());
+		$context->setDatabaseManager($dbm);
 
 		return $context;
 	}
@@ -116,10 +116,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() );
-		$context->setFilesystemManager( $fs );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig());
+		$context->setFilesystemManager($fs);
 
 		return $context;
 	}
@@ -131,10 +131,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context );
-		$context->setLogger( $logger );
+		$logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context);
+		$context->setLogger($logger);
 
 		return $context;
 	}
@@ -147,11 +147,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$container = $this->container;
-		$mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } );
-		$context->setMail( $mail );
+		$mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } );
+		$context->setMail($mail);
 
 		return $context;
 	}
@@ -163,10 +163,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() );
-		$context->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig());
+		$context->setMessageQueueManager($mq);
 
 		return $context;
 	}
@@ -178,10 +178,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function addSession( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addSession(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) );
-		$context->setSession( $session );
+		$session = new \Aimeos\MW\Session\Symfony2($this->container->get('session'));
+		$context->setSession($session);
 
 		return $context;
 	}
@@ -192,36 +192,36 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	protected function addUserGroups( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addUserGroups(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$username = '';
-		$token = $this->container->get( 'security.token_storage' )->getToken();
+		$token = $this->container->get('security.token_storage')->getToken();
 
-		if( is_object( $token ) )
+		if (is_object($token))
 		{
-			if( method_exists( $token->getUser(), 'getId' ) )
+			if (method_exists($token->getUser(), 'getId'))
 			{
 				$userid = $token->getUser()->getId();
-				$context->setUserId( $userid );
-				$context->setGroupIds( function() use ( $context, $userid )
+				$context->setUserId($userid);
+				$context->setGroupIds(function() use ($context, $userid)
 				{
-					$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-					return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups();
+					$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+					return $manager->getItem($userid, array('customer/group'))->getGroups();
 				} );
 			}
 
-			if( is_object( $token->getUser() ) ) {
-				$username =  $token->getUser()->getUsername();
+			if (is_object($token->getUser())) {
+				$username = $token->getUser()->getUsername();
 			} else {
 				$username = $token->getUser();
 			}
 		}
-		elseif( $this->container->has( 'request_stack' )
-			&& ( $request = $this->container->get('request_stack')->getMasterRequest() ) !== null
+		elseif ($this->container->has('request_stack')
+			&& ($request = $this->container->get('request_stack')->getMasterRequest()) !== null
 		) {
 			$username = $request->getClientIp();
 		}
 
-		$context->setEditor( $username );
+		$context->setEditor($username);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -215,8 +215,7 @@
 			} else {
 				$username = $token->getUser();
 			}
-		}
-		elseif( $this->container->has( 'request_stack' )
+		} elseif( $this->container->has( 'request_stack' )
 			&& ( $request = $this->container->get('request_stack')->getMasterRequest() ) !== null
 		) {
 			$username = $request->getClientIp();

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