aimeos / aimeos-symfony

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( 25, $json['meta']['total'] );
-		$this->assertEquals( 25, count( $json['data'] ) );
+		$this->assertNotNull($json);
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(25, $json['meta']['total']);
+		$this->assertEquals(25, 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,58 +86,58 @@ 
 		$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']);
 
-		$client->request( 'GET', '/unittest/de/EUR/jsonapi/product?id=' . $json['data'][0]['id'] );
+		$client->request('GET', '/unittest/de/EUR/jsonapi/product?id='.$json['data'][0]['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']));
 	}
 
 
@@ -145,24 +145,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']);
 	}
 
 
@@ -170,26 +170,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']);
 	}
 
 
@@ -197,14 +197,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']));
 	}
 
 
@@ -212,23 +212,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']));
 	}
 
 
@@ -236,31 +236,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']));
 	}
 
 
@@ -268,28 +268,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']));
 	}
 
 
@@ -297,14 +297,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'],
@@ -313,15 +313,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']));
 	}
 
 
@@ -330,17 +330,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']));
 	}
 
 
@@ -349,22 +349,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']));
 	}
 
 
@@ -373,17 +373,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']));
 	}
 
 
@@ -391,63 +391,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']);
 	}
 }

Controller/AdminController.php

Spacing +16 added lines, -16 removed lines

@@ -28,30 +28,30 @@ 
 	 * @param Request $request Symfony request object
 	 * @return Response Generated HTML page for the admin interface
 	 */
-	public function indexAction( Request $request )
+	public function indexAction(Request $request)
 	{
-		if( $this->hasRole( ['ROLE_ADMIN'] ) )
+		if ($this->hasRole(['ROLE_ADMIN']))
 		{
-			$context = $this->get( 'aimeos_context' )->get( false );
-			$siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
-			$siteItem = $siteManager->getItem( $this->getUser()->getSiteId() );
+			$context = $this->get('aimeos_context')->get(false);
+			$siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
+			$siteItem = $siteManager->getItem($this->getUser()->getSiteId());
 
-			$params = array( 'site' => $siteItem->getCode(), 'resource' => 'dashboard' );
-			return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) );
+			$params = array('site' => $siteItem->getCode(), 'resource' => 'dashboard');
+			return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params));
 		}
 
 
-		$param = array( 'error' => '', 'username' => '' );
+		$param = array('error' => '', 'username' => '');
 
-		if( $this->has( 'security.authentication_utils' ) )
+		if ($this->has('security.authentication_utils'))
 		{
-			$auth = $this->get( 'security.authentication_utils' );
+			$auth = $this->get('security.authentication_utils');
 
 			$param['error'] = $auth->getLastAuthenticationError();
 			$param['username'] = $auth->getLastUsername();
 		}
 
-		return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param );
+		return $this->render('AimeosShopBundle:Admin:index.html.twig', $param);
 	}
 
 
@@ -61,15 +61,15 @@ 
 	 * @param array $roles List of role names where at least one must match
 	 * @return boolean True if authenticated and is admin, false if not
 	 */
-	protected function hasRole( array $roles )
+	protected function hasRole(array $roles)
 	{
-		if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken() )
+		if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken())
 		{
-			$checker = $this->get( 'security.authorization_checker' );
+			$checker = $this->get('security.authorization_checker');
 
-			foreach( $roles as $role )
+			foreach ($roles as $role)
 			{
-				if( $checker->isGranted( $role ) ) {
+				if ($checker->isGranted($role)) {
 					return true;
 				}
 			}

Tests/Controller/AdminControllerTest.php

Spacing +3 added lines, -3 removed lines

@@ -11,10 +11,10 @@
 	{
 		$client = static::createClient();
 
-		$client->request( 'GET', '/admin' );
+		$client->request('GET', '/admin');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<form class="login"', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<form class="login"', $response->getContent());
 	}
 }

Composer/ScriptHandler.php

Spacing +61 added lines, -61 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,21 +228,21 @@ 
 	 * @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: /';
 		}
 
 		$fs = new Filesystem();
-		$fs->dumpFile( $filename, $content );
+		$fs->dumpFile($filename, $content);
 	}
 
 
@@ -252,14 +252,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;
 			}
 		}

Tests/Controller/AccountControllerTest.php

Spacing +25 added lines, -25 removed lines

@@ -11,72 +11,72 @@
 	public function testAccount()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/' );
+		$client->request('GET', '/unittest/de/EUR/myaccount/');
 
-		$this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
-		$this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() );
+		$this->assertContains('aimeos account-profile', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-history', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
+		$this->assertContains('aimeos account-watch', $client->getResponse()->getContent());
 	}
 
 
 	public function testDownload()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' );
+		$client->request('GET', '/unittest/de/EUR/myaccount/download/0');
 
-		$this->assertEquals( 401, $client->getResponse()->getStatusCode() );
+		$this->assertEquals(401, $client->getResponse()->getStatusCode());
 	}
 
 
 	public function testFavoriteComponent()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' );
+		$client->request('GET', '/unittest/de/EUR/test/favoritecomponent');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('aimeos account-favorite', $client->getResponse()->getContent());
 	}
 
 
 	public function testHistoryComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->historyComponentAction() );
+		$this->assertSame($response, $mock->historyComponentAction());
 	}
 
 
 	public function testProfileComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->profileComponentAction() );
+		$this->assertSame($response, $mock->profileComponentAction());
 	}
 
 
 	public function testWatchComponent()
 	{
-		$mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' )
-			->setMethods( array( 'getOutput' ) )
+		$mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController')
+			->setMethods(array('getOutput'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$response = Response::create( 'test' );
-		$mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) );
+		$response = Response::create('test');
+		$mock->expects($this->once())->method('getOutput')->will($this->returnValue($response));
 
-		$this->assertSame( $response, $mock->watchComponentAction() );
+		$this->assertSame($response, $mock->watchComponentAction());
 	}
 }

Service/View.php

Spacing +77 added lines, -77 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param RequestStack $requestStack Current request stack
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( RequestStack $requestStack, Container $container )
+	public function __construct(RequestStack $requestStack, Container $container)
 	{
 		$this->requestStack = $requestStack;
 		$this->container = $container;
@@ -47,27 +47,27 @@ 
 	 * @param string|null $locale Code of the current language or null for no translation
 	 * @return \Aimeos\MW\View\Iface View object
 	 */
-	public function create( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null )
+	public function create(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $locale = null)
 	{
-		$twig = $this->container->get( 'twig' );
-		$engine = new \Aimeos\MW\View\Engine\Twig( $twig );
-		$view = new \Aimeos\MW\View\Standard( $templatePaths, array( '.html.twig' => $engine ) );
+		$twig = $this->container->get('twig');
+		$engine = new \Aimeos\MW\View\Engine\Twig($twig);
+		$view = new \Aimeos\MW\View\Standard($templatePaths, array('.html.twig' => $engine));
 
 		$config = $context->getConfig();
 		$session = $context->getSession();
 
-		$this->addCsrf( $view );
-		$this->addAccess( $view, $context );
-		$this->addConfig( $view, $config );
-		$this->addNumber( $view, $config );
-		$this->addParam( $view );
-		$this->addRequest( $view );
-		$this->addResponse( $view );
-		$this->addSession( $view, $session );
-		$this->addTranslate( $view, $locale );
-		$this->addUrl( $view );
+		$this->addCsrf($view);
+		$this->addAccess($view, $context);
+		$this->addConfig($view, $config);
+		$this->addNumber($view, $config);
+		$this->addParam($view);
+		$this->addRequest($view);
+		$this->addResponse($view);
+		$this->addSession($view, $session);
+		$this->addTranslate($view, $locale);
+		$this->addUrl($view);
 
-		$this->initTwig( $view, $twig );
+		$this->initTwig($view, $twig);
 
 		return $view;
 	}
@@ -80,26 +80,26 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addAccess( \Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context )
+	protected function addAccess(\Aimeos\MW\View\Iface $view, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$container = $this->container;
-		$token = $this->container->get( 'security.token_storage' )->getToken();
+		$token = $this->container->get('security.token_storage')->getToken();
 
-		if( is_object( $token ) && is_object( $token->getUser() )
-			&& in_array( 'ROLE_ADMIN', (array) $token->getUser()->getRoles() ) )
+		if (is_object($token) && is_object($token->getUser())
+			&& in_array('ROLE_ADMIN', (array) $token->getUser()->getRoles()))
 		{
-			$helper = new \Aimeos\MW\View\Helper\Access\All( $view );
+			$helper = new \Aimeos\MW\View\Helper\Access\All($view);
 		}
 		else
 		{
-			$fcn = function() use ( $container, $context ) {
-				return $container->get( 'aimeos_support' )->getGroups( $context );
+			$fcn = function() use ($container, $context) {
+				return $container->get('aimeos_support')->getGroups($context);
 			};
 
-			$helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
+			$helper = new \Aimeos\MW\View\Helper\Access\Standard($view, $fcn);
 		}
 
-		$view->addHelper( 'access', $helper );
+		$view->addHelper('access', $helper);
 
 		return $view;
 	}
@@ -112,11 +112,11 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addConfig( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addConfig(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$config = new \Aimeos\MW\Config\Decorator\Protect( clone $config, array( 'admin', 'client' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect(clone $config, array('admin', 'client'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
 		return $view;
 	}
@@ -128,11 +128,11 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addCsrf( \Aimeos\MW\View\Iface $view )
+	protected function addCsrf(\Aimeos\MW\View\Iface $view)
 	{
-		$token = $this->container->get( 'security.csrf.token_manager' )->getToken( '_token' );
-		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', $token->getValue() );
-		$view->addHelper( 'csrf', $helper );
+		$token = $this->container->get('security.csrf.token_manager')->getToken('_token');
+		$helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', $token->getValue());
+		$view->addHelper('csrf', $helper);
 
 		return $view;
 	}
@@ -145,14 +145,14 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addNumber( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config )
+	protected function addNumber(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Config\Iface $config)
 	{
-		$sepDec = $config->get( 'client/html/common/format/separatorDecimal', '.' );
-		$sep1000 = $config->get( 'client/html/common/format/separator1000', ' ' );
-		$decimals = $config->get( 'client/html/common/format/decimals', 2 );
+		$sepDec = $config->get('client/html/common/format/separatorDecimal', '.');
+		$sep1000 = $config->get('client/html/common/format/separator1000', ' ');
+		$decimals = $config->get('client/html/common/format/decimals', 2);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000, $decimals );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000, $decimals);
+		$view->addHelper('number', $helper);
 
 		return $view;
 	}
@@ -164,17 +164,17 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addParam( \Aimeos\MW\View\Iface $view )
+	protected function addParam(\Aimeos\MW\View\Iface $view)
 	{
 		$params = array();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $request !== null ) {
-			$params = $request->request->all() + $request->query->all() + $request->attributes->get( '_route_params' );
+		if ($request !== null) {
+			$params = $request->request->all() + $request->query->all() + $request->attributes->get('_route_params');
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params );
-		$view->addHelper( 'param', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params);
+		$view->addHelper('param', $helper);
 
 		return $view;
 	}
@@ -186,14 +186,14 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addRequest( \Aimeos\MW\View\Iface $view )
+	protected function addRequest(\Aimeos\MW\View\Iface $view)
 	{
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $request !== null )
+		if ($request !== null)
 		{
-			$helper = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request );
-			$view->addHelper( 'request', $helper );
+			$helper = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request);
+			$view->addHelper('request', $helper);
 		}
 
 		return $view;
@@ -206,10 +206,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addResponse( \Aimeos\MW\View\Iface $view )
+	protected function addResponse(\Aimeos\MW\View\Iface $view)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2( $view );
-		$view->addHelper( 'response', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Response\Symfony2($view);
+		$view->addHelper('response', $helper);
 
 		return $view;
 	}
@@ -222,10 +222,10 @@ 
 	 * @param \Aimeos\MW\Session\Iface $session Session object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addSession( \Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session )
+	protected function addSession(\Aimeos\MW\View\Iface $view, \Aimeos\MW\Session\Iface $session)
 	{
-		$helper = new \Aimeos\MW\View\Helper\Session\Standard( $view, $session );
-		$view->addHelper( 'session', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Session\Standard($view, $session);
+		$view->addHelper('session', $helper);
 
 		return $view;
 	}
@@ -238,20 +238,20 @@ 
 	 * @param string|null $locale ISO language code, e.g. "de" or "de_CH"
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addTranslate( \Aimeos\MW\View\Iface $view, $locale )
+	protected function addTranslate(\Aimeos\MW\View\Iface $view, $locale)
 	{
-		if( $locale !== null )
+		if ($locale !== null)
 		{
-			$i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) );
+			$i18n = $this->container->get('aimeos_i18n')->get(array($locale));
 			$translation = $i18n[$locale];
 		}
 		else
 		{
-			$translation = new \Aimeos\MW\Translation\None( 'en' );
+			$translation = new \Aimeos\MW\Translation\None('en');
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation );
-		$view->addHelper( 'translate', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation);
+		$view->addHelper('translate', $helper);
 
 		return $view;
 	}
@@ -263,30 +263,30 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function addUrl( \Aimeos\MW\View\Iface $view )
+	protected function addUrl(\Aimeos\MW\View\Iface $view)
 	{
 		$fixed = array();
 		$request = $this->requestStack->getMasterRequest();
 
-		if( $request !== null )
+		if ($request !== null)
 		{
 			$attr = $request->attributes;
 
-			if( ( $site = $attr->get( 'site' ) ) !== null ) {
+			if (($site = $attr->get('site')) !== null) {
 				$fixed['site'] = $site;
 			}
 
-			if( ( $lang = $attr->get( 'locale' ) ) !== null ) {
+			if (($lang = $attr->get('locale')) !== null) {
 				$fixed['locale'] = $lang;
 			}
 
-			if( ( $currency = $attr->get( 'currency' ) ) !== null ) {
+			if (($currency = $attr->get('currency')) !== null) {
 				$fixed['currency'] = $currency;
 			}
 		}
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $this->container->get( 'router' ), $fixed );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $this->container->get('router'), $fixed);
+		$view->addHelper('url', $helper);
 
 		return $view;
 	}
@@ -298,21 +298,21 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param \Twig_Environment $twig Twig environment object
 	 */
-	protected function initTwig( \Aimeos\MW\View\Iface $view, \Twig_Environment $twig )
+	protected function initTwig(\Aimeos\MW\View\Iface $view, \Twig_Environment $twig)
 	{
-		$fcn = function( $key, $default = null ) use ( $view ) {
-			return $view->config( $key, $default );
+		$fcn = function($key, $default = null) use ($view) {
+			return $view->config($key, $default);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aiconfig', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aiconfig', $fcn));
 
-		$fcn = function( $singular, array $values = array(), $domain = 'client' ) use ( $view ) {
-			return vsprintf( $view->translate( $domain, $singular ), $values );
+		$fcn = function($singular, array $values = array(), $domain = 'client') use ($view) {
+			return vsprintf($view->translate($domain, $singular), $values);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitrans', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aitrans', $fcn));
 
-		$fcn = function( $singular, $plural, $number, array $values = array(), $domain = 'client' ) use ( $view ) {
-			return vsprintf( $view->translate( $domain, $singular, $plural, $number ), $values );
+		$fcn = function($singular, $plural, $number, array $values = array(), $domain = 'client') use ($view) {
+			return vsprintf($view->translate($domain, $singular, $plural, $number), $values);
 		};
-		$twig->addFunction( new \Twig_SimpleFunction( 'aitransplural', $fcn ) );
+		$twig->addFunction(new \Twig_SimpleFunction('aitransplural', $fcn));
 	}
 }

Command/AccountCommand.php

Spacing +70 added lines, -70 removed lines

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

Tests/Controller/JqadmControllerTest.php

Spacing +39 added lines, -39 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/css' );
+		$client->request('GET', '/unittest/jqadm/file/css');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( '.aimeos', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('.aimeos', $client->getResponse()->getContent());
 	}
 
 
@@ -26,12 +26,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/file/js' );
+		$client->request('GET', '/unittest/jqadm/file/js');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('Aimeos = {', $client->getResponse()->getContent());
 	}
 
 
@@ -40,13 +40,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/copy/product/0' );
+		$client->request('GET', '/unittest/jqadm/copy/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -55,13 +55,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/create/product' );
+		$client->request('GET', '/unittest/jqadm/create/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -70,13 +70,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/delete/product/0' );
+		$client->request('GET', '/unittest/jqadm/delete/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -85,13 +85,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/export/order' );
+		$client->request('GET', '/unittest/jqadm/export/order');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -100,13 +100,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/get/product/0' );
+		$client->request('GET', '/unittest/jqadm/get/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -115,13 +115,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product' );
+		$client->request('POST', '/unittest/jqadm/save/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'item-product', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('item-product', $response->getContent());
 	}
 
 
@@ -130,13 +130,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/jqadm/search/product' );
+		$client->request('GET', '/unittest/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( 'list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('list-items', $response->getContent());
 	}
 
 
@@ -145,11 +145,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/invalid/jqadm/search/product' );
+		$client->request('GET', '/invalid/jqadm/search/product');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 500, $response->getStatusCode() );
+		$this->assertEquals(500, $response->getStatusCode());
 	}
 }

Controller/JqadmController.php

Spacing +56 added lines, -56 removed lines

@@ -29,35 +29,35 @@ 
 	 * @param $type File type, i.e. "css" or "js"
 	 * @return Response Response object
 	 */
-	public function fileAction( $type )
+	public function fileAction($type)
 	{
 		$contents = '';
 		$files = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
-				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$files = array_merge( $files, $jsb2->getFiles( $type ) );
+				$jsbAbsPath = $base.'/'.$path;
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$files = array_merge($files, $jsb2->getFiles($type));
 			}
 		}
 
-		foreach( $files as $file )
+		foreach ($files as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
+		$response = new Response($contents);
 
-		if( $type === 'js' ) {
-			$response->headers->set( 'Content-Type', 'application/javascript' );
-		} elseif( $type === 'css' ) {
-			$response->headers->set( 'Content-Type', 'text/css' );
+		if ($type === 'js') {
+			$response->headers->set('Content-Type', 'application/javascript');
+		} elseif ($type === 'css') {
+			$response->headers->set('Content-Type', 'text/css');
 		}
 
 		return $response;
@@ -72,15 +72,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function copyAction( Request $request, $resource, $site = 'default' )
+	public function copyAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->copy() ) == '' ) {
+		if (($html = $cntl->copy()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -92,15 +92,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function createAction( Request $request, $resource, $site = 'default' )
+	public function createAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->create() ) == '' ) {
+		if (($html = $cntl->create()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -112,15 +112,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->delete() ) == '' ) {
+		if (($html = $cntl->delete()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -132,15 +132,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function exportAction( Request $request, $resource, $site = 'default' )
+	public function exportAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->export() ) == '' ) {
+		if (($html = $cntl->export()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -152,15 +152,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->get() ) == '' ) {
+		if (($html = $cntl->get()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -172,15 +172,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function saveAction( Request $request, $resource, $site = 'default' )
+	public function saveAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->save() ) == '' ) {
+		if (($html = $cntl->save()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -192,15 +192,15 @@ 
 	 * @param string $site Unique site code
 	 * @return Response Generated output
 	 */
-	public function searchAction( Request $request, $resource, $site = 'default' )
+	public function searchAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
+		$cntl = $this->createClient($request, $site, $resource);
 
-		if( ( $html = $cntl->search() ) == '' ) {
+		if (($html = $cntl->search()) == '') {
 			return $cntl->getView()->response();
 		}
 
-		return $this->getHtml( $html );
+		return $this->getHtml($html);
 	}
 
 
@@ -212,26 +212,26 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\Admin\JQAdm\Iface Context item
 	 */
-	protected function createClient( Request $request, $site, $resource )
+	protected function createClient(Request $request, $site, $resource)
 	{
-		$lang = $request->get( 'lang', 'en' );
+		$lang = $request->get('lang', 'en');
 
-		$aimeos = $this->get( 'aimeos' )->get();
-		$templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' );
+		$aimeos = $this->get('aimeos')->get();
+		$templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates');
 
-		$context = $this->get( 'aimeos_context' )->get( false, 'backend' );
-		$context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) );
-		$context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) );
+		$context = $this->get('aimeos_context')->get(false, 'backend');
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en')));
+		$context->setLocale($this->get('aimeos_locale')->getBackend($context, $site));
 
-		$view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang );
+		$view = $this->get('aimeos_view')->create($context, $templatePaths, $lang);
 
 		$view->aimeosType = 'Symfony';
-		$view->aimeosVersion = $this->get( 'aimeos' )->getVersion();
-		$view->aimeosExtensions = implode( ',', $aimeos->getExtensions() );
+		$view->aimeosVersion = $this->get('aimeos')->getVersion();
+		$view->aimeosExtensions = implode(',', $aimeos->getExtensions());
 
-		$context->setView( $view );
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource);
 	}
 
 
@@ -241,8 +241,8 @@ 
 	 * @param string $content Content from admin client
 	 * @return Response View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 }