aimeos / aimeos-symfony

Tests/Controller/JsonadmControllerTest.php

Spacing +91 added lines, -91 removed lines

@@ -12,26 +12,26 @@ 
 		$client = static::createClient();
 
 
-		$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']));
 	}
 
 
@@ -41,58 +41,58 @@ 
 
 
 		$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']);
 	}
 
 
@@ -105,78 +105,78 @@ 
 			{"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/CatalogControllerTest.php

Spacing +92 added lines, -92 removed lines

@@ -10,210 +10,210 @@
 	public function testCount()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/count' );
+		$client->request('GET', '/unittest/de/EUR/count');
 		$content = $client->getResponse()->getContent();
 
-		$this->assertContains( '".catalog-filter-count li.cat-item"', $content );
-		$this->assertContains( '".catalog-filter-attribute .attribute-lists li.attr-item"', $content );
+		$this->assertContains('".catalog-filter-count li.cat-item"', $content);
+		$this->assertContains('".catalog-filter-attribute .attribute-lists li.attr-item"', $content);
 	}
 
 
 	public function testFilterSearch()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-filter-search' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-filter-search')->count());
 
-		$form = $crawler->filter( '.catalog-filter-search button' )->form();
+		$form = $crawler->filter('.catalog-filter-search button')->form();
 		$form['f_search'] = 'Unit';
-		$crawler = $client->submit( $form );
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Test Selection")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Empty Selection")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Test Selection")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Empty Selection")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->count());
 	}
 
 
  	public function testFilterTree()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-filter-tree' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-filter-tree')->count());
 
-		$link = $crawler->filter( '.catalog-filter-tree a.cat-item' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-filter-tree a.cat-item')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-filter-tree .categories a.cat-item' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-filter-tree .categories a.cat-item')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-filter-tree .coffee a.cat-item' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-filter-tree .coffee a.cat-item')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 3, $crawler->filter( '.catalog-stage-breadcrumb li' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-promo .product a:contains("Cafe Noire Expresso")' )->count() );
+		$this->assertEquals(3, $crawler->filter('.catalog-stage-breadcrumb li')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-promo .product a:contains("Cafe Noire Expresso")')->count());
 	}
 
 
 	public function testFilterAttribute()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-filter-attribute' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-filter-attribute')->count());
 
-		$nodes = $crawler->filter( '.catalog-filter-attribute .attr-size span:contains("XS")' );
-		$id = $nodes->parents()->filter( '.attr-item' )->attr( 'data-id');
+		$nodes = $crawler->filter('.catalog-filter-attribute .attr-size span:contains("XS")');
+		$id = $nodes->parents()->filter('.attr-item')->attr('data-id');
 
-		$form = $crawler->filter( '.catalog-filter .btn-action' )->form();
-		$form['f_attrid'] = array( $id => 'xs' );
-		$crawler = $client->submit( $form );
+		$form = $crawler->filter('.catalog-filter .btn-action')->form();
+		$form['f_attrid'] = array($id => 'xs');
+		$crawler = $client->submit($form);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Cappuccino")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Cappuccino")')->count());
 	}
 
 
 	public function testStageBreadcrumb()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-stage-breadcrumb li' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-stage-breadcrumb li')->count());
 
-		$link = $crawler->filter( '.catalog-stage-breadcrumb a' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-stage-breadcrumb a')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Cappuccino")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-list')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Cappuccino")')->count());
 	}
 
 
 	public function testStageNavigator()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-name' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-name')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Unittest: Bundle")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Unittest: Bundle")')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Bundle")')->count());
 
-		$link = $crawler->filter( '.catalog-stage-navigator a.next' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-stage-navigator a.next')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Empty Selection")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Empty Selection")')->count());
 
-		$link = $crawler->filter( '.catalog-stage-navigator a.prev' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-stage-navigator a.prev')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail' )->count() );
-		$this->assertEquals( 1, $crawler->filter( '.catalog-detail:contains("Unittest: Bundle")' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-detail')->count());
+		$this->assertEquals(1, $crawler->filter('.catalog-detail:contains("Unittest: Bundle")')->count());
 	}
 
 
 	public function testListSortationName()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-name' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-name')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
-		$this->assertEquals( 1, $products->eq( 1 )->filter( 'h2:contains("Unittest: Bundle")' )->count() );
-		$this->assertEquals( 1, $products->eq( 2 )->filter( 'h2:contains("Unittest: Empty Selection")' )->count() );
+		$products = $crawler->filter('.catalog-list-items .product');
+		$this->assertEquals(1, $products->eq(1)->filter('h2:contains("Unittest: Bundle")')->count());
+		$this->assertEquals(1, $products->eq(2)->filter('h2:contains("Unittest: Empty Selection")')->count());
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-name' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-name')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
+		$products = $crawler->filter('.catalog-list-items .product');
 		$count = $products->count();
 
-		$this->assertGreaterThan( 2, $count );
-		$this->assertEquals( 1, $products->eq( $count - 3 )->filter( 'h2:contains("Unittest: Empty Selection")' )->count() );
-		$this->assertEquals( 1, $products->eq( $count - 2 )->filter( 'h2:contains("Unittest: Bundle")' )->count() );
+		$this->assertGreaterThan(2, $count);
+		$this->assertEquals(1, $products->eq($count - 3)->filter('h2:contains("Unittest: Empty Selection")')->count());
+		$this->assertEquals(1, $products->eq($count - 2)->filter('h2:contains("Unittest: Bundle")')->count());
 	}
 
 
 	public function testListSortationPrice()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-price' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-price')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
+		$products = $crawler->filter('.catalog-list-items .product');
 		$count = $products->count();
 
-		$this->assertGreaterThan( 2, $count );
-		$this->assertEquals( 1, $products->eq( $count - 2 )->filter( '.value:contains("600.00 €")' )->count() );
-		$this->assertEquals( 1, $products->eq( $count - 1 )->filter( '.value:contains("600.00 €")' )->count() );
+		$this->assertGreaterThan(2, $count);
+		$this->assertEquals(1, $products->eq($count - 2)->filter('.value:contains("600.00 €")')->count());
+		$this->assertEquals(1, $products->eq($count - 1)->filter('.value:contains("600.00 €")')->count());
 
-		$link = $crawler->filter( '.catalog-list-pagination .option-price' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-pagination .option-price')->link();
+		$crawler = $client->click($link);
 
-		$products = $crawler->filter( '.catalog-list-items .product' );
-		$this->assertEquals( 1, $products->eq( 0 )->filter( '.value:contains("600.00 €")' )->count() );
-		$this->assertEquals( 1, $products->eq( 1 )->filter( '.value:contains("600.00 €")' )->count() );
+		$products = $crawler->filter('.catalog-list-items .product');
+		$this->assertEquals(1, $products->eq(0)->filter('.value:contains("600.00 €")')->count());
+		$this->assertEquals(1, $products->eq(1)->filter('.value:contains("600.00 €")')->count());
 	}
 
 
 	public function testDetailPinned()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$link = $crawler->filter( '.catalog-detail a.actions-button-pin' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-detail a.actions-button-pin')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-session-pinned .pinned-item' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-session-pinned .pinned-item')->count());
 	}
 
 
 	public function testDetailLastSeen()
 	{
 		$client = static::createClient();
-		$crawler = $client->request( 'GET', '/unittest/de/EUR/list' );
+		$crawler = $client->request('GET', '/unittest/de/EUR/list');
 
-		$link = $crawler->filter( '.catalog-list-items .product a:contains("Cafe Noire Expresso")' )->link();
-		$crawler = $client->click( $link );
+		$link = $crawler->filter('.catalog-list-items .product a:contains("Cafe Noire Expresso")')->link();
+		$crawler = $client->click($link);
 
-		$this->assertEquals( 1, $crawler->filter( '.catalog-session-seen .seen-item' )->count() );
+		$this->assertEquals(1, $crawler->filter('.catalog-session-seen .seen-item')->count());
 	}
 
 
 	public function testSuggest()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/suggest', array( 'f_search' => 'unit' ) );
+		$client->request('GET', '/unittest/de/EUR/suggest', array('f_search' => 'unit'));
 		$content = $client->getResponse()->getContent();
 
-		$this->assertStringStartsWith( '[{', $content );
+		$this->assertStringStartsWith('[{', $content);
 	}
 
 
 	public function testStock()
 	{
 		$client = static::createClient();
-		$client->request( 'GET', '/unittest/de/EUR/stock' );
+		$client->request('GET', '/unittest/de/EUR/stock');
 		$content = $client->getResponse()->getContent();
 
-		$this->assertContains( '.aimeos .product .stock', $content );
-		$this->assertContains( '.aimeos .catalog-detail-basket', $content );
+		$this->assertContains('.aimeos .product .stock', $content);
+		$this->assertContains('.aimeos .catalog-detail-basket', $content);
 	}
 }

Tests/Controller/AdminControllerTest.php

Spacing +11 added lines, -11 removed lines

@@ -12,11 +12,11 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
-		$crawler = $client->request( 'GET', '/admin/unittest/de/0' );
+		));
+		$crawler = $client->request('GET', '/admin/unittest/de/0');
 
-		$this->assertEquals( 1, $crawler->filter( 'head:contains("/admin/{site}/{lang}/{tab}")' )->count() );
-		$this->assertEquals( 1, $crawler->filter( 'body:contains("You need to enable javascript!")' )->count() );
+		$this->assertEquals(1, $crawler->filter('head:contains("/admin/{site}/{lang}/{tab}")')->count());
+		$this->assertEquals(1, $crawler->filter('body:contains("You need to enable javascript!")')->count());
 	}
 
 
@@ -25,16 +25,16 @@ 
 		$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', '/admin/do?_token=' . $token->getValue(),
+		$client->request('POST', '/admin/do?_token=' . $token->getValue(),
 			array(), array(), array('CONTENT_TYPE' => 'application/json'),
 			'[{"jsonrpc":"2.0","method":"Product_Type.searchItems","params":{"site":"unittest"},"id":2}]'
 		);
 
-		$this->assertStringStartsWith( '{', $client->getResponse()->getContent() );
+		$this->assertStringStartsWith('{', $client->getResponse()->getContent());
 	}
 
 
@@ -43,10 +43,10 @@ 
 		$client = static::createClient(array(), array(
 			'PHP_AUTH_USER' => 'admin',
 			'PHP_AUTH_PW'   => 'adminpass',
-		) );
+		));
 
-		$client->request( 'GET', '/admin/file' );
+		$client->request('GET', '/admin/file');
 
-		$this->assertContains( 'EXTUTIL', $client->getResponse()->getContent() );
+		$this->assertContains('EXTUTIL', $client->getResponse()->getContent());
 	}
 }

Tests/Command/JobsCommandTest.php

Indentation +11 added lines, -11 removed lines

@@ -9,18 +9,18 @@
 
 class JobsCommandTest extends WebTestCase
 {
-    public function testJobsCommand()
-    {
-        $kernel = $this->createKernel();
-        $kernel->boot();
+	public function testJobsCommand()
+	{
+		$kernel = $this->createKernel();
+		$kernel->boot();
 
-        $application = new Application( $kernel );
-        $application->add( new Command\JobsCommand() );
+		$application = new Application( $kernel );
+		$application->add( new Command\JobsCommand() );
 
-        $command = $application->find( 'aimeos:jobs' );
-        $commandTester = new CommandTester( $command );
-        $commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild' ) );
+		$command = $application->find( 'aimeos:jobs' );
+		$commandTester = new CommandTester( $command );
+		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild' ) );
 
-        $this->assertEquals( 0, $commandTester->getStatusCode() );
-    }
+		$this->assertEquals( 0, $commandTester->getStatusCode() );
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@
         $kernel = $this->createKernel();
         $kernel->boot();
 
-        $application = new Application( $kernel );
-        $application->add( new Command\JobsCommand() );
+        $application = new Application($kernel);
+        $application->add(new Command\JobsCommand());
 
-        $command = $application->find( 'aimeos:jobs' );
-        $commandTester = new CommandTester( $command );
-        $commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild' ) );
+        $command = $application->find('aimeos:jobs');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'jobs' => 'index/rebuild'));
 
-        $this->assertEquals( 0, $commandTester->getStatusCode() );
+        $this->assertEquals(0, $commandTester->getStatusCode());
     }
 }

Tests/Command/CacheCommandTest.php

Indentation +11 added lines, -11 removed lines

@@ -9,18 +9,18 @@
 
 class CacheCommandTest extends WebTestCase
 {
-    public function testCacheCommand()
-    {
-        $kernel = $this->createKernel();
-        $kernel->boot();
+	public function testCacheCommand()
+	{
+		$kernel = $this->createKernel();
+		$kernel->boot();
 
-        $application = new Application( $kernel );
-        $application->add( new Command\CacheCommand() );
+		$application = new Application( $kernel );
+		$application->add( new Command\CacheCommand() );
 
-        $command = $application->find( 'aimeos:cache' );
-        $commandTester = new CommandTester( $command );
-        $commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest' ) );
+		$command = $application->find( 'aimeos:cache' );
+		$commandTester = new CommandTester( $command );
+		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest' ) );
 
-        $this->assertEquals( 0, $commandTester->getStatusCode() );
-    }
+		$this->assertEquals( 0, $commandTester->getStatusCode() );
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@
         $kernel = $this->createKernel();
         $kernel->boot();
 
-        $application = new Application( $kernel );
-        $application->add( new Command\CacheCommand() );
+        $application = new Application($kernel);
+        $application->add(new Command\CacheCommand());
 
-        $command = $application->find( 'aimeos:cache' );
-        $commandTester = new CommandTester( $command );
-        $commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest' ) );
+        $command = $application->find('aimeos:cache');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest'));
 
-        $this->assertEquals( 0, $commandTester->getStatusCode() );
+        $this->assertEquals(0, $commandTester->getStatusCode());
     }
 }

Tests/Command/SetupCommandTest.php

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@
 		$kernel = $this->createKernel();
 		$kernel->boot();
 
-		$application = new Application( $kernel );
-		$application->add( new Command\SetupCommand() );
+		$application = new Application($kernel);
+		$application->add(new Command\SetupCommand());
 
-		$command = $application->find( 'aimeos:setup' );
-		$commandTester = new CommandTester( $command );
-		$commandTester->execute( array( 'command' => $command->getName(), 'site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0' ) );
+		$command = $application->find('aimeos:setup');
+		$commandTester = new CommandTester($command);
+		$commandTester->execute(array('command' => $command->getName(), 'site' => 'unittest', 'tplsite' => 'unittest', '--option' => 'setup/default/demo:0'));
 
-		$this->assertEquals( 0, $commandTester->getStatusCode() );
+		$this->assertEquals(0, $commandTester->getStatusCode());
 	}
 }

Composer/ScriptHandler.php

Spacing +53 added lines, -53 removed lines

@@ -25,18 +25,18 @@ 
 	 * @param CommandEvent $event CommandEvent instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function setupDatabase( CommandEvent $event )
+	public static function setupDatabase(CommandEvent $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);
 	}
 
 
@@ -46,27 +46,27 @@ 
 	 * @param CommandEvent $event CommandEvent instance
 	 * @throws \RuntimeException If an error occured
 	 */
-	public static function installBundle( CommandEvent $event )
+	public static function installBundle(CommandEvent $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::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' );
-		self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' );
-		self::createDirectory( $options['symfony-web-dir'] . '/uploads' );
+		self::updateConfigFile($options['symfony-app-dir'] . '/config/config.yml');
+		self::updateRoutingFile($options['symfony-app-dir'] . '/config/routing.yml');
+		self::createDirectory($options['symfony-web-dir'] . '/uploads');
 	}
 
 
@@ -76,14 +76,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));
 		}
 	}
 
@@ -96,28 +96,28 @@ 
 	 * @param array List of configuration options for the given command
 	 * @throws \RuntimeException If the command couldn't be executed
 	 */
-	protected static function executeCommand( CommandEvent $event, $cmd, array $options = array() )
+	protected static function executeCommand(CommandEvent $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)));
 		}
 	}
 
@@ -130,19 +130,19 @@ 
 	 * @return string The path to the console directory
 	 * @throws \RuntimeException If console directory couldn't be found
 	 */
-	protected static function getConsoleDir( CommandEvent $event )
+	protected static function getConsoleDir(CommandEvent $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'));
 	}
 
 
@@ -152,7 +152,7 @@ 
 	 * @param CommandEvent $event Command event object
 	 * @return array Associative list of option keys and values
 	 */
-	protected static function getOptions( CommandEvent $event )
+	protected static function getOptions(CommandEvent $event)
 	{
 		return $event->getComposer()->getPackage()->getExtra();
 	}
@@ -168,8 +168,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;
@@ -182,15 +182,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);
 		}
 	}
 
@@ -201,15 +201,15 @@ 
 	 * @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)
 	{
 		$update = false;
 
-		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:
     resource: "@AimeosShopBundle/Resources/config/routing.yml"
@@ -218,10 +218,10 @@ 
 			$update = true;
 		}
 
-		if( $update === true )
+		if ($update === true)
 		{
 			$fs = new Filesystem();
-			$fs->dumpFile( $filename, $content );
+			$fs->dumpFile($filename, $content);
 		}
 	}
 
@@ -232,14 +232,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;
 			}
 		}

Entity/User.php

Indentation +225 added lines, -225 removed lines

@@ -20,229 +20,229 @@
  */
 class User implements UserInterface, \Serializable
 {
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @ORM\Column(name="siteid", type="integer")
-     */
-    protected $siteid;
-
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    protected $label;
-
-    /**
-     * @ORM\Column(name="code", type="string", length=32)
-     */
-    protected $username;
-
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    protected $password;
-
-    /**
-     * @ORM\Column(name="status", type="smallint")
-     */
-    protected $isActive;
-
-    /**
-     * @ORM\Column(name="salutation", type="string", length=8)
-     */
-    protected $salutation = '';
-
-    /**
-     * @ORM\Column(name="company", type="string", length=100)
-     */
-    protected $company = '';
-
-    /**
-     * @ORM\Column(name="vatid", type="string", length=32)
-     */
-    protected $vatid = '';
-
-    /**
-     * @ORM\Column(name="title", type="string", length=64)
-     */
-    protected $title = '';
-
-    /**
-     * @ORM\Column(name="firstname", type="string", length=64)
-     */
-    protected $firstname = '';
-
-    /**
-     * @ORM\Column(name="lastname", type="string", length=64)
-     */
-    protected $lastname = '';
-
-    /**
-     * @ORM\Column(name="address1", type="string", length=255)
-     */
-    protected $address1 = '';
-
-    /**
-     * @ORM\Column(name="address2", type="string", length=255)
-     */
-    protected $address2 = '';
-
-    /**
-     * @ORM\Column(name="address3", type="string", length=255)
-     */
-    protected $address3 = '';
-
-    /**
-     * @ORM\Column(name="postal", type="string", length=16)
-     */
-    protected $postal = '';
-
-    /**
-     * @ORM\Column(name="city", type="string", length=255)
-     */
-    protected $city = '';
-
-    /**
-     * @ORM\Column(name="state", type="string", length=255)
-     */
-    protected $state = '';
-
-    /**
-     * @ORM\Column(name="langid", type="string", length=5, nullable=true)
-     */
-    protected $langid = '';
-
-    /**
-     * @ORM\Column(name="countryid", type="string", length=2, nullable=true)
-     */
-    protected $countryid = '';
-
-    /**
-     * @ORM\Column(name="telephone", type="string", length=32)
-     */
-    protected $telephone = '';
-
-    /**
-     * @ORM\Column(name="telefax", type="string", length=255)
-     */
-    protected $telefax = '';
-
-    /**
-     * @ORM\Column(name="email", type="string", length=255)
-     */
-    protected $email = '';
-
-    /**
-     * @ORM\Column(name="website", type="string", length=255)
-     */
-    protected $website = '';
-
-    /**
-     * @ORM\Column(name="birthday", type="date", nullable=true)
-     */
-    protected $birthday;
-
-    /**
-     * @ORM\Column(name="vdate", type="date", nullable=true)
-     */
-    protected $vdate;
-
-    /**
-     * @ORM\Column(name="ctime", type="datetime")
-     */
-    protected $ctime;
-
-    /**
-     * @ORM\Column(name="mtime", type="datetime")
-     */
-    protected $mtime;
-
-    /**
-     * @ORM\Column(name="editor", type="string", length=255)
-     */
-    protected $editor = '';
-
-
-    /**
-     * @inheritDoc
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function getUsername()
-    {
-    	return $this->username;
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function getSalt()
-    {
-        return 'mshop';
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function getRoles()
-    {
-        return array( 'ROLE_USER' );
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function eraseCredentials()
-    {
-    }
-
-
-    /**
-     * @see \Serializable::serialize()
-     */
-    public function serialize()
-    {
-        return serialize( array(
-            $this->id,
-            $this->username,
-            $this->password,
-        ) );
-    }
-
-
-    /**
-     * @see \Serializable::unserialize()
-     */
-    public function unserialize( $serialized )
-    {
-        list (
-            $this->id,
-            $this->username,
-            $this->password,
-        ) = unserialize( $serialized );
-    }
+	/**
+	 * @ORM\Column(type="integer")
+	 * @ORM\Id
+	 * @ORM\GeneratedValue(strategy="AUTO")
+	 */
+	protected $id;
+
+	/**
+	 * @ORM\Column(name="siteid", type="integer")
+	 */
+	protected $siteid;
+
+	/**
+	 * @ORM\Column(type="string", length=255)
+	 */
+	protected $label;
+
+	/**
+	 * @ORM\Column(name="code", type="string", length=32)
+	 */
+	protected $username;
+
+	/**
+	 * @ORM\Column(type="string", length=255)
+	 */
+	protected $password;
+
+	/**
+	 * @ORM\Column(name="status", type="smallint")
+	 */
+	protected $isActive;
+
+	/**
+	 * @ORM\Column(name="salutation", type="string", length=8)
+	 */
+	protected $salutation = '';
+
+	/**
+	 * @ORM\Column(name="company", type="string", length=100)
+	 */
+	protected $company = '';
+
+	/**
+	 * @ORM\Column(name="vatid", type="string", length=32)
+	 */
+	protected $vatid = '';
+
+	/**
+	 * @ORM\Column(name="title", type="string", length=64)
+	 */
+	protected $title = '';
+
+	/**
+	 * @ORM\Column(name="firstname", type="string", length=64)
+	 */
+	protected $firstname = '';
+
+	/**
+	 * @ORM\Column(name="lastname", type="string", length=64)
+	 */
+	protected $lastname = '';
+
+	/**
+	 * @ORM\Column(name="address1", type="string", length=255)
+	 */
+	protected $address1 = '';
+
+	/**
+	 * @ORM\Column(name="address2", type="string", length=255)
+	 */
+	protected $address2 = '';
+
+	/**
+	 * @ORM\Column(name="address3", type="string", length=255)
+	 */
+	protected $address3 = '';
+
+	/**
+	 * @ORM\Column(name="postal", type="string", length=16)
+	 */
+	protected $postal = '';
+
+	/**
+	 * @ORM\Column(name="city", type="string", length=255)
+	 */
+	protected $city = '';
+
+	/**
+	 * @ORM\Column(name="state", type="string", length=255)
+	 */
+	protected $state = '';
+
+	/**
+	 * @ORM\Column(name="langid", type="string", length=5, nullable=true)
+	 */
+	protected $langid = '';
+
+	/**
+	 * @ORM\Column(name="countryid", type="string", length=2, nullable=true)
+	 */
+	protected $countryid = '';
+
+	/**
+	 * @ORM\Column(name="telephone", type="string", length=32)
+	 */
+	protected $telephone = '';
+
+	/**
+	 * @ORM\Column(name="telefax", type="string", length=255)
+	 */
+	protected $telefax = '';
+
+	/**
+	 * @ORM\Column(name="email", type="string", length=255)
+	 */
+	protected $email = '';
+
+	/**
+	 * @ORM\Column(name="website", type="string", length=255)
+	 */
+	protected $website = '';
+
+	/**
+	 * @ORM\Column(name="birthday", type="date", nullable=true)
+	 */
+	protected $birthday;
+
+	/**
+	 * @ORM\Column(name="vdate", type="date", nullable=true)
+	 */
+	protected $vdate;
+
+	/**
+	 * @ORM\Column(name="ctime", type="datetime")
+	 */
+	protected $ctime;
+
+	/**
+	 * @ORM\Column(name="mtime", type="datetime")
+	 */
+	protected $mtime;
+
+	/**
+	 * @ORM\Column(name="editor", type="string", length=255)
+	 */
+	protected $editor = '';
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getId()
+	{
+		return $this->id;
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getUsername()
+	{
+		return $this->username;
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getSalt()
+	{
+		return 'mshop';
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getPassword()
+	{
+		return $this->password;
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getRoles()
+	{
+		return array( 'ROLE_USER' );
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function eraseCredentials()
+	{
+	}
+
+
+	/**
+	 * @see \Serializable::serialize()
+	 */
+	public function serialize()
+	{
+		return serialize( array(
+			$this->id,
+			$this->username,
+			$this->password,
+		) );
+	}
+
+
+	/**
+	 * @see \Serializable::unserialize()
+	 */
+	public function unserialize( $serialized )
+	{
+		list (
+			$this->id,
+			$this->username,
+			$this->password,
+		) = unserialize( $serialized );
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -209,7 +209,7 @@ 
      */
     public function getRoles()
     {
-        return array( 'ROLE_USER' );
+        return array('ROLE_USER');
     }
 
 
@@ -226,23 +226,23 @@ 
      */
     public function serialize()
     {
-        return serialize( array(
+        return serialize(array(
             $this->id,
             $this->username,
             $this->password,
-        ) );
+        ));
     }
 
 
     /**
      * @see \Serializable::unserialize()
      */
-    public function unserialize( $serialized )
+    public function unserialize($serialized)
     {
         list (
             $this->id,
             $this->username,
             $this->password,
-        ) = unserialize( $serialized );
+        ) = unserialize($serialized);
     }
 }

Entity/FosUser.php

Indentation +528 added lines, -528 removed lines

@@ -20,532 +20,532 @@
  */
 class FosUser extends BaseUser
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @ORM\Column(name="salutation", type="string", length=8)
-     */
-    protected $salutation = '';
-
-    /**
-     * @ORM\Column(name="company", type="string", length=100)
-     */
-    protected $company = '';
-
-    /**
-     * @ORM\Column(name="vatid", type="string", length=32)
-     */
-    protected $vatid = '';
-
-    /**
-     * @ORM\Column(name="title", type="string", length=64)
-     */
-    protected $title = '';
-
-    /**
-     * @ORM\Column(name="firstname", type="string", length=64)
-     */
-    protected $firstname = '';
-
-    /**
-     * @ORM\Column(name="lastname", type="string", length=64)
-     */
-    protected $lastname = '';
-
-    /**
-     * @ORM\Column(name="address1", type="string", length=255)
-     */
-    protected $address1 = '';
-
-    /**
-     * @ORM\Column(name="address2", type="string", length=255)
-     */
-    protected $address2 = '';
-
-    /**
-     * @ORM\Column(name="address3", type="string", length=255)
-     */
-    protected $address3 = '';
-
-    /**
-     * @ORM\Column(name="postal", type="string", length=16)
-     */
-    protected $postal = '';
-
-    /**
-     * @ORM\Column(name="city", type="string", length=255)
-     */
-    protected $city = '';
-
-    /**
-     * @ORM\Column(name="state", type="string", length=255)
-     */
-    protected $state = '';
-
-    /**
-     * @ORM\Column(name="langid", type="string", length=5, nullable=true)
-     */
-    protected $langid = '';
-
-    /**
-     * @ORM\Column(name="countryid", type="string", length=2, nullable=true)
-     */
-    protected $countryid = '';
-
-    /**
-     * @ORM\Column(name="telephone", type="string", length=32)
-     */
-    protected $telephone = '';
-
-    /**
-     * @ORM\Column(name="telefax", type="string", length=255)
-     */
-    protected $telefax = '';
-
-    /**
-     * @ORM\Column(name="website", type="string", length=255)
-     */
-    protected $website = '';
-
-    /**
-     * @ORM\Column(name="birthday", type="date", nullable=true)
-     */
-    protected $birthday;
-
-    /**
-     * @ORM\Column(name="vdate", type="date", nullable=true)
-     */
-    protected $vdate;
-
-    /**
-     * @ORM\Column(name="ctime", type="datetime")
-     */
-    protected $ctime;
-
-    /**
-     * @ORM\Column(name="mtime", type="datetime")
-     */
-    protected $mtime;
-
-    /**
-     * @ORM\Column(name="editor", type="string", length=255)
-     */
-    protected $editor = '';
-
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->ctime = new \DateTime();
-        $this->mtime = new \DateTime();
-    }
-
-
-    /**
-     * Returns the user unique id.
-     *
-     * @return mixed
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-
-    /**
-     * Returns the company name.
-     *
-     * @return string Company name
-     */
-    public function getCompany()
-    {
-        return $this->company;
-    }
-
-
-    /**
-     * Sets a new company name.
-     *
-     * @param string $company New company name
-     */
-    public function setCompany($company)
-    {
-        $this->company = (string) $company;
-    }
-
-
-    /**
-     * Returns the vatid.
-     *
-     * @return string vatid
-     */
-    public function getVatID()
-    {
-        return $this->vatid;
-    }
-
-
-    /**
-     * Sets a new vatid.
-     *
-     * @param string $vatid New vatid
-     */
-    public function setVatID($vatid)
-    {
-        $this->vatid = (string) $vatid;
-    }
-
-
-    /**
-     * Returns the salutation constant for the person described by the address.
-     *
-     * @return string Saluatation constant defined in \Aimeos\MShop\Common\Item\Address\Base
-     */
-    public function getSalutation()
-    {
-        return ( isset( $this->salutation ) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
-    }
-
-
-    /**
-     * Sets the new salutation for the person described by the address.
-     *
-     * @param string $salutation Salutation constant defined in \Aimeos\MShop\Common\Item\Address\Base
-     */
-    public function setSalutation($salutation)
-    {
-        switch( $salutation )
-        {
-            case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN:
-            case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY:
-            case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS:
-            case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS:
-            case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR:
-                break;
-            default:
-                throw new \Exception( sprintf( 'Address salutation "%1$s" is unknown', $value ) );
-        }
-
-        $this->salutation = (string) $salutation;
-    }
-
-
-    /**
-     * Returns the title of the person.
-     *
-     * @return string Title of the person
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-
-    /**
-     * Sets a new title of the person.
-     *
-     * @param string $title New title of the person
-     */
-    public function setTitle($title)
-    {
-        $this->title = (string) $title;
-    }
-
-
-    /**
-     * Returns the first name of the person.
-     *
-     * @return string First name of the person
-     */
-    public function getFirstname()
-    {
-        return $this->firstname;
-    }
-
-
-    /**
-     * Sets a new first name of the person.
-     *
-     * @param string $firstname New first name of the person
-     */
-    public function setFirstname($firstname)
-    {
-        $this->firstname = (string) $firstname;
-    }
-
-
-    /**
-     * Returns the last name of the person.
-     *
-     * @return string Last name of the person
-     */
-    public function getLastname()
-    {
-        return $this->lastname;
-    }
-
-
-    /**
-     * Sets a new last name of the person.
-     *
-     * @param string $lastname New last name of the person
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = (string) $lastname;
-    }
-
-
-    /**
-     * Returns the first address part, e.g. the street name.
-     *
-     * @return string First address part
-     */
-    public function getAddress1()
-    {
-        return $this->address1;
-    }
-
-
-    /**
-     * Sets a new first address part, e.g. the street name.
-     *
-     * @param string $address1 New first address part
-     */
-    public function setAddress1($address1)
-    {
-        $this->address1 = (string) $address1;
-    }
-
-
-    /**
-     * Returns the second address part, e.g. the house number.
-     *
-     * @return string Second address part
-     */
-    public function getAddress2()
-    {
-        return $this->address2;
-    }
-
-
-    /**
-     * Sets a new second address part, e.g. the house number.
-     *
-     * @param string $address2 New second address part
-     */
-    public function setAddress2($address2)
-    {
-        $this->address2 = (string) $address2;
-    }
-
-
-    /**
-     * Returns the third address part, e.g. the house name or floor number.
-     *
-     * @return string third address part
-     */
-    public function getAddress3()
-    {
-        return $this->address3;
-    }
-
-
-    /**
-     * Sets a new third address part, e.g. the house name or floor number.
-     *
-     * @param string $address3 New third address part
-     */
-    public function setAddress3($address3)
-    {
-        $this->address3 = (string) $address3;
-    }
-
-
-    /**
-     * Returns the postal code.
-     *
-     * @return string Postal code
-     */
-    public function getPostal()
-    {
-        return $this->postal;
-    }
-
-
-    /**
-     * Sets a new postal code.
-     *
-     * @param string $postal New postal code
-     */
-    public function setPostal($postal)
-    {
-        $this->postal = (string) $postal;
-    }
-
-
-    /**
-     * Returns the city name.
-     *
-     * @return string City name
-     */
-    public function getCity()
-    {
-        return $this->city;
-    }
-
-
-    /**
-     * Sets a new city name.
-     *
-     * @param string $city New city name
-     */
-    public function setCity($city)
-    {
-        $this->city = (string) $city;
-    }
-
-
-    /**
-     * Returns the state name.
-     *
-     * @return string State name
-     */
-    public function getState()
-    {
-        return $this->state;
-    }
-
-
-    /**
-     * Sets a new state name.
-     *
-     * @param string $state New state name
-     */
-    public function setState($state)
-    {
-        $this->state = (string) $state;
-    }
-
-
-    /**
-     * Sets the ID of the country the address is in.
-     *
-     * @param string $countryid Unique ID of the country
-     */
-    public function setCountryId($countryid)
-    {
-        $this->countryid = strtoupper( (string) $countryid );
-    }
-
-
-    /**
-     * Returns the unique ID of the country the address belongs to.
-     *
-     * @return string Unique ID of the country
-     */
-    public function getCountryId()
-    {
-        return $this->countryid;
-    }
-
-
-    /**
-     * Sets the ID of the language.
-     *
-     * @param string $langid Unique ID of the language
-     */
-    public function setLanguageId($langid)
-    {
-        $this->langid = strtolower( (string) $langid );
-    }
-
-
-    /**
-     * Returns the unique ID of the language.
-     *
-     * @return string Unique ID of the language
-     */
-    public function getLanguageId()
-    {
-        return $this->langid;
-    }
-
-
-    /**
-     * Returns the telephone number.
-     *
-     * @return string Telephone number
-     */
-    public function getTelephone()
-    {
-        return $this->telephone;
-    }
-
-
-    /**
-     * Sets a new telephone number.
-     *
-     * @param string $telephone New telephone number
-     */
-    public function setTelephone($telephone)
-    {
-        $this->telephone = (string) $telephone;
-    }
-
-
-    /**
-     * Returns the telefax number.
-     *
-     * @return string Telefax number
-     */
-    public function getTelefax()
-    {
-        return $this->telefax;
-    }
-
-
-    /**
-     * Sets a new telefax number.
-     *
-     * @param string $telefax New telefax number
-     */
-    public function setTelefax($telefax)
-    {
-        $this->telefax = (string) $telefax;
-    }
-
-
-    /**
-     * Returns the website URL.
-     *
-     * @return string Website URL
-     */
-    public function getWebsite()
-    {
-        return $this->website;
-    }
-
-
-    /**
-     * Sets a new website URL.
-     *
-     * @param string $website New website URL
-     */
-    public function setWebsite($website)
-    {
-        $pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#';
-
-        if( $website !== '' && preg_match( $pattern, $website ) !== 1 ) {
-            throw new \Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
-        }
-
-        $this->website = (string) $website;
-    }
+	/**
+	 * @ORM\Id
+	 * @ORM\Column(type="integer")
+	 * @ORM\GeneratedValue(strategy="AUTO")
+	 */
+	protected $id;
+
+	/**
+	 * @ORM\Column(name="salutation", type="string", length=8)
+	 */
+	protected $salutation = '';
+
+	/**
+	 * @ORM\Column(name="company", type="string", length=100)
+	 */
+	protected $company = '';
+
+	/**
+	 * @ORM\Column(name="vatid", type="string", length=32)
+	 */
+	protected $vatid = '';
+
+	/**
+	 * @ORM\Column(name="title", type="string", length=64)
+	 */
+	protected $title = '';
+
+	/**
+	 * @ORM\Column(name="firstname", type="string", length=64)
+	 */
+	protected $firstname = '';
+
+	/**
+	 * @ORM\Column(name="lastname", type="string", length=64)
+	 */
+	protected $lastname = '';
+
+	/**
+	 * @ORM\Column(name="address1", type="string", length=255)
+	 */
+	protected $address1 = '';
+
+	/**
+	 * @ORM\Column(name="address2", type="string", length=255)
+	 */
+	protected $address2 = '';
+
+	/**
+	 * @ORM\Column(name="address3", type="string", length=255)
+	 */
+	protected $address3 = '';
+
+	/**
+	 * @ORM\Column(name="postal", type="string", length=16)
+	 */
+	protected $postal = '';
+
+	/**
+	 * @ORM\Column(name="city", type="string", length=255)
+	 */
+	protected $city = '';
+
+	/**
+	 * @ORM\Column(name="state", type="string", length=255)
+	 */
+	protected $state = '';
+
+	/**
+	 * @ORM\Column(name="langid", type="string", length=5, nullable=true)
+	 */
+	protected $langid = '';
+
+	/**
+	 * @ORM\Column(name="countryid", type="string", length=2, nullable=true)
+	 */
+	protected $countryid = '';
+
+	/**
+	 * @ORM\Column(name="telephone", type="string", length=32)
+	 */
+	protected $telephone = '';
+
+	/**
+	 * @ORM\Column(name="telefax", type="string", length=255)
+	 */
+	protected $telefax = '';
+
+	/**
+	 * @ORM\Column(name="website", type="string", length=255)
+	 */
+	protected $website = '';
+
+	/**
+	 * @ORM\Column(name="birthday", type="date", nullable=true)
+	 */
+	protected $birthday;
+
+	/**
+	 * @ORM\Column(name="vdate", type="date", nullable=true)
+	 */
+	protected $vdate;
+
+	/**
+	 * @ORM\Column(name="ctime", type="datetime")
+	 */
+	protected $ctime;
+
+	/**
+	 * @ORM\Column(name="mtime", type="datetime")
+	 */
+	protected $mtime;
+
+	/**
+	 * @ORM\Column(name="editor", type="string", length=255)
+	 */
+	protected $editor = '';
+
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->ctime = new \DateTime();
+		$this->mtime = new \DateTime();
+	}
+
+
+	/**
+	 * Returns the user unique id.
+	 *
+	 * @return mixed
+	 */
+	public function getId()
+	{
+		return $this->id;
+	}
+
+
+	/**
+	 * Returns the company name.
+	 *
+	 * @return string Company name
+	 */
+	public function getCompany()
+	{
+		return $this->company;
+	}
+
+
+	/**
+	 * Sets a new company name.
+	 *
+	 * @param string $company New company name
+	 */
+	public function setCompany($company)
+	{
+		$this->company = (string) $company;
+	}
+
+
+	/**
+	 * Returns the vatid.
+	 *
+	 * @return string vatid
+	 */
+	public function getVatID()
+	{
+		return $this->vatid;
+	}
+
+
+	/**
+	 * Sets a new vatid.
+	 *
+	 * @param string $vatid New vatid
+	 */
+	public function setVatID($vatid)
+	{
+		$this->vatid = (string) $vatid;
+	}
+
+
+	/**
+	 * Returns the salutation constant for the person described by the address.
+	 *
+	 * @return string Saluatation constant defined in \Aimeos\MShop\Common\Item\Address\Base
+	 */
+	public function getSalutation()
+	{
+		return ( isset( $this->salutation ) ? (string) $this->salutation : \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN );
+	}
+
+
+	/**
+	 * Sets the new salutation for the person described by the address.
+	 *
+	 * @param string $salutation Salutation constant defined in \Aimeos\MShop\Common\Item\Address\Base
+	 */
+	public function setSalutation($salutation)
+	{
+		switch( $salutation )
+		{
+			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN:
+			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY:
+			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS:
+			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS:
+			case \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR:
+				break;
+			default:
+				throw new \Exception( sprintf( 'Address salutation "%1$s" is unknown', $value ) );
+		}
+
+		$this->salutation = (string) $salutation;
+	}
+
+
+	/**
+	 * Returns the title of the person.
+	 *
+	 * @return string Title of the person
+	 */
+	public function getTitle()
+	{
+		return $this->title;
+	}
+
+
+	/**
+	 * Sets a new title of the person.
+	 *
+	 * @param string $title New title of the person
+	 */
+	public function setTitle($title)
+	{
+		$this->title = (string) $title;
+	}
+
+
+	/**
+	 * Returns the first name of the person.
+	 *
+	 * @return string First name of the person
+	 */
+	public function getFirstname()
+	{
+		return $this->firstname;
+	}
+
+
+	/**
+	 * Sets a new first name of the person.
+	 *
+	 * @param string $firstname New first name of the person
+	 */
+	public function setFirstname($firstname)
+	{
+		$this->firstname = (string) $firstname;
+	}
+
+
+	/**
+	 * Returns the last name of the person.
+	 *
+	 * @return string Last name of the person
+	 */
+	public function getLastname()
+	{
+		return $this->lastname;
+	}
+
+
+	/**
+	 * Sets a new last name of the person.
+	 *
+	 * @param string $lastname New last name of the person
+	 */
+	public function setLastname($lastname)
+	{
+		$this->lastname = (string) $lastname;
+	}
+
+
+	/**
+	 * Returns the first address part, e.g. the street name.
+	 *
+	 * @return string First address part
+	 */
+	public function getAddress1()
+	{
+		return $this->address1;
+	}
+
+
+	/**
+	 * Sets a new first address part, e.g. the street name.
+	 *
+	 * @param string $address1 New first address part
+	 */
+	public function setAddress1($address1)
+	{
+		$this->address1 = (string) $address1;
+	}
+
+
+	/**
+	 * Returns the second address part, e.g. the house number.
+	 *
+	 * @return string Second address part
+	 */
+	public function getAddress2()
+	{
+		return $this->address2;
+	}
+
+
+	/**
+	 * Sets a new second address part, e.g. the house number.
+	 *
+	 * @param string $address2 New second address part
+	 */
+	public function setAddress2($address2)
+	{
+		$this->address2 = (string) $address2;
+	}
+
+
+	/**
+	 * Returns the third address part, e.g. the house name or floor number.
+	 *
+	 * @return string third address part
+	 */
+	public function getAddress3()
+	{
+		return $this->address3;
+	}
+
+
+	/**
+	 * Sets a new third address part, e.g. the house name or floor number.
+	 *
+	 * @param string $address3 New third address part
+	 */
+	public function setAddress3($address3)
+	{
+		$this->address3 = (string) $address3;
+	}
+
+
+	/**
+	 * Returns the postal code.
+	 *
+	 * @return string Postal code
+	 */
+	public function getPostal()
+	{
+		return $this->postal;
+	}
+
+
+	/**
+	 * Sets a new postal code.
+	 *
+	 * @param string $postal New postal code
+	 */
+	public function setPostal($postal)
+	{
+		$this->postal = (string) $postal;
+	}
+
+
+	/**
+	 * Returns the city name.
+	 *
+	 * @return string City name
+	 */
+	public function getCity()
+	{
+		return $this->city;
+	}
+
+
+	/**
+	 * Sets a new city name.
+	 *
+	 * @param string $city New city name
+	 */
+	public function setCity($city)
+	{
+		$this->city = (string) $city;
+	}
+
+
+	/**
+	 * Returns the state name.
+	 *
+	 * @return string State name
+	 */
+	public function getState()
+	{
+		return $this->state;
+	}
+
+
+	/**
+	 * Sets a new state name.
+	 *
+	 * @param string $state New state name
+	 */
+	public function setState($state)
+	{
+		$this->state = (string) $state;
+	}
+
+
+	/**
+	 * Sets the ID of the country the address is in.
+	 *
+	 * @param string $countryid Unique ID of the country
+	 */
+	public function setCountryId($countryid)
+	{
+		$this->countryid = strtoupper( (string) $countryid );
+	}
+
+
+	/**
+	 * Returns the unique ID of the country the address belongs to.
+	 *
+	 * @return string Unique ID of the country
+	 */
+	public function getCountryId()
+	{
+		return $this->countryid;
+	}
+
+
+	/**
+	 * Sets the ID of the language.
+	 *
+	 * @param string $langid Unique ID of the language
+	 */
+	public function setLanguageId($langid)
+	{
+		$this->langid = strtolower( (string) $langid );
+	}
+
+
+	/**
+	 * Returns the unique ID of the language.
+	 *
+	 * @return string Unique ID of the language
+	 */
+	public function getLanguageId()
+	{
+		return $this->langid;
+	}
+
+
+	/**
+	 * Returns the telephone number.
+	 *
+	 * @return string Telephone number
+	 */
+	public function getTelephone()
+	{
+		return $this->telephone;
+	}
+
+
+	/**
+	 * Sets a new telephone number.
+	 *
+	 * @param string $telephone New telephone number
+	 */
+	public function setTelephone($telephone)
+	{
+		$this->telephone = (string) $telephone;
+	}
+
+
+	/**
+	 * Returns the telefax number.
+	 *
+	 * @return string Telefax number
+	 */
+	public function getTelefax()
+	{
+		return $this->telefax;
+	}
+
+
+	/**
+	 * Sets a new telefax number.
+	 *
+	 * @param string $telefax New telefax number
+	 */
+	public function setTelefax($telefax)
+	{
+		$this->telefax = (string) $telefax;
+	}
+
+
+	/**
+	 * Returns the website URL.
+	 *
+	 * @return string Website URL
+	 */
+	public function getWebsite()
+	{
+		return $this->website;
+	}
+
+
+	/**
+	 * Sets a new website URL.
+	 *
+	 * @param string $website New website URL
+	 */
+	public function setWebsite($website)
+	{
+		$pattern = '#^([a-z]+://)?[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+(:[0-9]+)?(/.*)?$#';
+
+		if( $website !== '' && preg_match( $pattern, $website ) !== 1 ) {
+			throw new \Exception( sprintf( 'Invalid web site URL "%1$s"', $website ) );
+		}
+
+		$this->website = (string) $website;
+	}
 }

Spacing +7 added lines, -7 removed lines

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