aimeos / aimeos-symfony

Tests/Controller/JsonadmControllerTest.php

Spacing +94 added lines, -94 removed lines

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

Tests/Controller/ExtadmControllerTest.php

Spacing +14 added lines, -14 removed lines

@@ -12,12 +12,12 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
-		$crawler = $client->request( 'GET', '/unittest/extadm/de/0' );
+		));
+		$crawler = $client->request('GET', '/unittest/extadm/de/0');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertEquals( 1, $crawler->filter( 'head:contains("/{site}/extadm/{lang}/{tab}")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( 'body:contains("You need to enable javascript!")' )->count() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertEquals(1, $crawler->filter('head:contains("/{site}/extadm/{lang}/{tab}")')->count());
+		$this->assertEquals(1, $crawler->filter('body:contains("You need to enable javascript!")')->count());
 	}
 
 
@@ -26,17 +26,17 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$token = $client->getContainer()->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' );
+		$token = $client->getContainer()->get('security.csrf.token_manager')->getToken('aimeos_admin_token');
 
-		$client->request( 'POST', '/unittest/extadm/do?_token=' . $token->getValue(),
+		$client->request('POST', '/unittest/extadm/do?_token=' . $token->getValue(),
 			array(), array(), array('CONTENT_TYPE' => 'application/json'),
 			'[{"jsonrpc":"2.0","method":"Product_Type.searchItems","params":{"site":"unittest"},"id":2}]'
 		);
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertStringStartsWith( '{', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertStringStartsWith('{', $client->getResponse()->getContent());
 	}
 
 
@@ -45,11 +45,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/unittest/extadm/file' );
+		$client->request('GET', '/unittest/extadm/file');
 
-		$this->assertEquals( 200, $client->getResponse()->getStatusCode() );
-		$this->assertContains( 'EXTUTIL', $client->getResponse()->getContent() );
+		$this->assertEquals(200, $client->getResponse()->getStatusCode());
+		$this->assertContains('EXTUTIL', $client->getResponse()->getContent());
 	}
 }

Tests/Controller/JqadmControllerTest.php

Spacing +28 added lines, -28 removed lines

@@ -12,13 +12,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( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -27,13 +27,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( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -42,13 +42,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( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 
 
@@ -57,13 +57,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( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -72,13 +72,13 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'POST', '/unittest/jqadm/save/product/0' );
+		$client->request('POST', '/unittest/jqadm/save/product/0');
 		$response = $client->getResponse();
 
-		$this->assertEquals( 200, $response->getStatusCode() );
-		$this->assertContains( '<div class="product-item', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<div class="product-item', $response->getContent());
 	}
 
 
@@ -87,13 +87,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( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 
 
@@ -102,12 +102,12 @@ 
 		$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( 200, $response->getStatusCode() );
-		$this->assertContains( '<table class="list-items', $response->getContent() );
+		$this->assertEquals(200, $response->getStatusCode());
+		$this->assertContains('<table class="list-items', $response->getContent());
 	}
 }

Controller/JqadmController.php

Braces +1 added lines, -2 removed lines

@@ -210,8 +210,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

Spacing +39 added lines, -39 removed lines

@@ -31,10 +31,10 @@ 
 	 * @param string $site Unique site code
 	 * @return string Generated output
 	 */
-	public function copyAction( Request $request, $resource, $site = 'default' )
+	public function copyAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->copy() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->copy());
 	}
 
 
@@ -46,10 +46,10 @@ 
 	 * @param string $site Unique site code
 	 * @return string Generated output
 	 */
-	public function createAction( Request $request, $resource, $site = 'default' )
+	public function createAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->create() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->create());
 	}
 
 
@@ -61,10 +61,10 @@ 
 	 * @param string $site Unique site code
 	 * @return string Generated output
 	 */
-	public function deleteAction( Request $request, $resource, $site = 'default' )
+	public function deleteAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->delete() . $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->delete() . $cntl->search());
 	}
 
 
@@ -76,10 +76,10 @@ 
 	 * @param string $site Unique site code
 	 * @return string Generated output
 	 */
-	public function getAction( Request $request, $resource, $site = 'default' )
+	public function getAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->get() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->get());
 	}
 
 
@@ -91,10 +91,10 @@ 
 	 * @param string $site Unique site code
 	 * @return string Generated output
 	 */
-	public function saveAction( Request $request, $resource, $site = 'default' )
+	public function saveAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml(($cntl->save() ?: $cntl->search()));
 	}
 
 
@@ -106,10 +106,10 @@ 
 	 * @param string $site Unique site code
 	 * @return string Generated output
 	 */
-	public function searchAction( Request $request, $resource, $site = 'default' )
+	public function searchAction(Request $request, $resource, $site = 'default')
 	{
-		$cntl = $this->createClient( $request, $site, $resource );
-		return $this->getHtml( $cntl->search() );
+		$cntl = $this->createClient($request, $site, $resource);
+		return $this->getHtml($cntl->search());
 	}
 
 
@@ -121,20 +121,20 @@ 
 	 * @param string $resource Resource location, e.g. "product"
 	 * @return \Aimeos\MShop\Context\Item\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 );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$view = $this->get( 'aimeos_view' )->create( $context->getConfig(), $templatePaths, $lang );
-		$context->setView( $view );
+		$view = $this->get('aimeos_view')->create($context->getConfig(), $templatePaths, $lang);
+		$context->setView($view);
 
-		return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource );
+		return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource);
 	}
 
 
@@ -144,12 +144,12 @@ 
 	 * @param string $content Content from admin client
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
 	 */
-	protected function getHtml( $content )
+	protected function getHtml($content)
 	{
-		$version = $this->get( 'aimeos' )->getVersion();
-		$content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content );
+		$version = $this->get('aimeos')->getVersion();
+		$content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content);
 
-		return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) );
+		return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content));
 	}
 
 
@@ -161,23 +161,23 @@ 
 	 * @param string $lang ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $site = 'default', $lang = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $site = 'default', $lang = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try
 		{
-			$localeItem = $localeManager->bootstrap( $site, '', '', false );
-			$localeItem->setLanguageId( null );
-			$localeItem->setCurrencyId( null );
+			$localeItem = $localeManager->bootstrap($site, '', '', false);
+			$localeItem->setLanguageId(null);
+			$localeItem->setCurrencyId(null);
 		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		catch (\Aimeos\MShop\Locale\Exception $e)
 		{
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
-		$context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang ) ) );
+		$context->setLocale($localeItem);
+		$context->setI18n($this->get('aimeos_i18n')->get(array($lang)));
 
 		return $context;
 	}

Service/Aimeos.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param Container $container Container object to access parameters
 	 */
-	public function __construct( Container $container )
+	public function __construct(Container $container)
 	{
 		$this->container = $container;
 	}
@@ -42,10 +42,10 @@ 
 	 */
 	public function get()
 	{
-		if( $this->object === null )
+		if ($this->object === null)
 		{
-			$extDirs = (array) $this->container->getParameter( 'aimeos_shop.extdir' );
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
+			$extDirs = (array) $this->container->getParameter('aimeos_shop.extdir');
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
 		}
 
 		return $this->object;
@@ -59,14 +59,14 @@ 
 	 */
 	public function getVersion()
 	{
-		$filename = dirname( $this->container->get( 'kernel' )->getRootDir() ) . DIRECTORY_SEPARATOR . 'composer.lock';
+		$filename = dirname($this->container->get('kernel')->getRootDir()) . DIRECTORY_SEPARATOR . 'composer.lock';
 
-		if( file_exists( $filename ) === true && ( $content = file_get_contents( $filename ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (file_exists($filename) === true && ($content = file_get_contents($filename)) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-symfony2' ) {
+				if ($item['name'] === 'aimeos/aimeos-symfony2') {
 					return $item['version'];
 				}
 			}

DependencyInjection/Configuration.php

Spacing +12 added lines, -12 removed lines

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

Tests/Controller/AdminControllerTest.php

Spacing +7 added lines, -7 removed lines

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

Controller/ExtadmController.php

Spacing +64 added lines, -64 removed lines

@@ -32,56 +32,56 @@ 
 	 * @param integer $tab Number of the currently active tab
 	 * @return \Symfony\Component\HttpFoundation\Response HTML page for the admin interface
 	 */
-	public function indexAction( $site = 'default', $lang, $tab )
+	public function indexAction($site = 'default', $lang, $tab)
 	{
-		$context = $this->get( 'aimeos_context' )->get( false );
-		$context = $this->setLocale( $context, $site, $lang );
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context, $site, $lang);
 
-		$aimeos = $this->get( 'aimeos' );
+		$aimeos = $this->get('aimeos');
 		$bootstrap = $aimeos->get();
 
-		$cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' );
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$cntlPaths = $bootstrap->getCustomPaths('controller/extjs');
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 		$cssFiles = array();
 
-		foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
 
-				if( !is_file( $jsbAbsPath ) ) {
-					throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );
+				if (!is_file($jsbAbsPath)) {
+					throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath));
 				}
 
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) );
-				$cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path));
+				$cssFiles = array_merge($cssFiles, $jsb2->getUrls('css'));
 			}
 		}
 
-		$params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' );
-		$adminUrl = $this->generateUrl( 'aimeos_shop_extadm', $params );
+		$params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}');
+		$adminUrl = $this->generateUrl('aimeos_shop_extadm', $params);
 
-		$token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue();
-		$jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) );
+		$token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue();
+		$jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site));
 
 		$vars = array(
 			'lang' => $lang,
 			'cssFiles' => $cssFiles,
 			'languages' => $this->getJsonLanguages(),
-			'config' => $this->getJsonClientConfig( $context ),
-			'site' => $this->getJsonSiteItem( $context, $site ),
-			'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ),
+			'config' => $this->getJsonClientConfig($context),
+			'site' => $this->getJsonSiteItem($context, $site),
+			'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang),
 			'searchSchemas' => $controller->getJsonSearchSchemas(),
 			'itemSchemas' => $controller->getJsonItemSchemas(),
-			'smd' => $controller->getJsonSmd( $jsonUrl ),
-			'urlTemplate' => urldecode( $adminUrl ),
-			'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ),
+			'smd' => $controller->getJsonSmd($jsonUrl),
+			'urlTemplate' => urldecode($adminUrl),
+			'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'),
 			'version' => $aimeos->getVersion(),
 			'activeTab' => $tab,
 		);
 
-		return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars );
+		return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars);
 	}
 
 
@@ -91,22 +91,22 @@ 
 	 * @param Symfony\Component\HttpFoundation\Request $request Symfony request object
 	 * @return \Symfony\Component\HttpFoundation\Response 2.0 RPC message response
 	 */
-	public function doAction( Request $request )
+	public function doAction(Request $request)
 	{
 		$csrfProvider = $this->get('security.csrf.token_manager');
 
-		if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token',  $request->query->get( '_token' ) ) ) !== true ) {
-			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' );
+		if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) {
+			throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid');
 		}
 
-		$cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' );
-		$context = $this->get( 'aimeos_context' )->get( false );
-		$context = $this->setLocale( $context );
+		$cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs');
+		$context = $this->get('aimeos_context')->get(false);
+		$context = $this->setLocale($context);
 
-		$controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths );
+		$controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths);
 
-		$response = $controller->process( $request->request->all(), 'php://input' );
-		return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) );
+		$response = $controller->process($request->request->all(), 'php://input');
+		return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response));
 	}
 
 
@@ -119,27 +119,27 @@ 
 	{
 		$contents = '';
 		$jsFiles = array();
-		$aimeos = $this->get( 'aimeos' )->get();
+		$aimeos = $this->get('aimeos')->get();
 
-		foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths )
+		foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths)
 		{
-			foreach( $paths as $path )
+			foreach ($paths as $path)
 			{
 				$jsbAbsPath = $base . '/' . $path;
-				$jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) );
-				$jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) );
+				$jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath));
+				$jsFiles = array_merge($jsFiles, $jsb2->getFiles('js'));
 			}
 		}
 
-		foreach( $jsFiles as $file )
+		foreach ($jsFiles as $file)
 		{
-			if( ( $content = file_get_contents( $file ) ) !== false ) {
+			if (($content = file_get_contents($file)) !== false) {
 				$contents .= $content;
 			}
 		}
 
-		$response = new Response( $contents );
-		$response->headers->set( 'Content-Type', 'application/javascript' );
+		$response = new Response($contents);
+		$response->headers->set('Content-Type', 'application/javascript');
 
 		return $response;
 	}
@@ -154,11 +154,11 @@ 
 	{
 		$result = array();
 
-		foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) {
-			$result[] = array( 'id' => $id, 'label' => $id );
+		foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) {
+			$result[] = array('id' => $id, 'label' => $id);
 		}
 
-		return json_encode( $result );
+		return json_encode($result);
 	}
 
 
@@ -168,10 +168,10 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
 	 * @return string JSON encoded configuration object
 	 */
-	protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		$config = $context->getConfig()->get( 'admin/extjs', array() );
-		return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT );
+		$config = $context->getConfig()->get('admin/extjs', array());
+		return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT);
 	}
 
 
@@ -182,16 +182,16 @@ 
 	 * @param string $lang ISO language code like "en" or "en_GB"
 	 * @return string JSON encoded translation object
 	 */
-	protected function getJsonClientI18n( array $i18nPaths, $lang )
+	protected function getJsonClientI18n(array $i18nPaths, $lang)
 	{
-		$i18n = new \Aimeos\MW\Translation\Zend2( $i18nPaths, 'gettext', $lang, array( 'disableNotices' => true ) );
+		$i18n = new \Aimeos\MW\Translation\Zend2($i18nPaths, 'gettext', $lang, array('disableNotices' => true));
 
 		$content = array(
-			'admin' => $i18n->getAll( 'admin' ),
-			'admin/ext' => $i18n->getAll( 'admin/ext' ),
+			'admin' => $i18n->getAll('admin'),
+			'admin/ext' => $i18n->getAll('admin/ext'),
 		);
 
-		return json_encode( $content, JSON_FORCE_OBJECT );
+		return json_encode($content, JSON_FORCE_OBJECT);
 	}
 
 
@@ -203,19 +203,19 @@ 
 	 * @return string JSON encoded site item object
 	 * @throws Exception If no site item was found for the code
 	 */
-	protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site )
+	protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site');
 
 		$criteria = $manager->createSearch();
-		$criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) );
-		$items = $manager->searchItems( $criteria );
+		$criteria->setConditions($criteria->compare('==', 'locale.site.code', $site));
+		$items = $manager->searchItems($criteria);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No site found for code "%1$s"', $site));
 		}
 
-		return json_encode( $item->toArray() );
+		return json_encode($item->toArray());
 	}
 
 
@@ -227,17 +227,17 @@ 
 	 * @param string $locale ISO language code, e.g. "en" or "en_GB"
 	 * @return \Aimeos\MShop\Context\Item\Iface Modified context object
 	 */
-	protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null )
+	protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode = 'default', $locale = null)
 	{
-		$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+		$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
 		try {
-			$localeItem = $localeManager->bootstrap( $sitecode, $locale, '', false );
-		} catch( \Aimeos\MShop\Locale\Exception $e ) {
+			$localeItem = $localeManager->bootstrap($sitecode, $locale, '', false);
+		} catch (\Aimeos\MShop\Locale\Exception $e) {
 			$localeItem = $localeManager->createItem();
 		}
 
-		$context->setLocale( $localeItem );
+		$context->setLocale($localeItem);
 
 		return $context;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	 * Creates a list of all available translations.
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
 	{

Tests/Entity/UserTest.php

Spacing +7 added lines, -7 removed lines

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