aimeos / ai-fosuser

lib/custom/src/MShop/Customer/Manager/Property/FosUser.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 		'customer.property.id' => array(
 			'code' => 'customer.property.id',
 			'internalcode' => 'fospr."id"',
-			'internaldeps'=>array( 'LEFT JOIN "fos_user_property" AS fospr ON ( fospr."parentid" = fos."id" )' ),
+			'internaldeps'=>array('LEFT JOIN "fos_user_property" AS fospr ON ( fospr."parentid" = fos."id" )'),
 			'label' => 'Property ID',
 			'type' => 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -100,14 +100,14 @@ 
 	 *
 	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/property/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/property/fosuser/delete' );
+		$this->cleanupBase($siteids, 'mshop/customer/manager/property/fosuser/delete');
 	}
 
 
@@ -117,11 +117,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array Returns a list of attribtes implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/property/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, ['type'], $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, ['type'], $withsub);
 	}
 
 
@@ -133,9 +133,9 @@ 
 	 * configuration (or Default) if null
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g property types, property lists etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'property/' . $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', 'property/' . $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 

lib/custom/src/MShop/Customer/Manager/Address/FosUser.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 			'label' => 'Customer address ID',
 			'code' => 'customer.address.id',
 			'internalcode' => 'fosad."id"',
-			'internaldeps' => array( 'LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )' ),
+			'internaldeps' => array('LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )'),
 			'type' => 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
 			'public' => false,
@@ -222,14 +222,14 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/address/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' );
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete');
 	}
 
 
@@ -239,11 +239,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/address/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
 	}
 
 
@@ -254,9 +254,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', 'address/' . $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 

lib/custom/setup/unittest/CustomerAddFosUserTestData.php

Spacing +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateFosUser' );
+		return array('TablesCreateFosUser');
 	}
 
 
@@ -30,36 +30,36 @@ 
 	 */
 	public function migrate()
 	{
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional);
 
-		$this->msg( 'Adding Fos user bundle customer test data', 0 );
+		$this->msg('Adding Fos user bundle customer test data', 0);
 
 		$parentIds = [];
 		$ds = DIRECTORY_SEPARATOR;
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
+		$this->additional->setEditor('ai-fosuser:unittest');
 		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+		if (($testdata = include($path)) === false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
 		}
 
 
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'FosUser' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'FosUser' );
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'FosUser');
+		$customerAddressManager = $customerManager->getSubManager('address', 'FosUser');
 
 		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
-		$items = $customerManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.code', array('UTC001', 'UTC002', 'UTC003')));
+		$items = $customerManager->searchItems($search);
 
 		$this->conn->begin();
 
-		$customerManager->deleteItems( array_keys( $items ) );
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+		$customerManager->deleteItems(array_keys($items));
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
 
 		$this->conn->commit();
 
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }

lib/custom/setup/unittest/CustomerListAddFosUserTestData.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData' );
+		return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData');
 	}
 
 
@@ -31,27 +31,27 @@ 
 	 */
 	public function migrate()
 	{
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional);
 
-		$this->msg( 'Adding customer-list Fos user bundle test data', 0 );
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
+		$this->msg('Adding customer-list Fos user bundle test data', 0);
+		$this->additional->setEditor('ai-fosuser:unittest');
 
 		$ds = DIRECTORY_SEPARATOR;
-		$path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php';
+		$path = dirname(__FILE__) . $ds . 'data' . $ds . 'customer-list.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) );
+		if (($testdata = include($path)) === false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path));
 		}
 
 		$refKeys = [];
-		foreach( $testdata['customer/lists'] as $dataset ) {
-			$refKeys[ $dataset['domain'] ][] = $dataset['refid'];
+		foreach ($testdata['customer/lists'] as $dataset) {
+			$refKeys[$dataset['domain']][] = $dataset['refid'];
 		}
 
 		$refIds = [];
-		$refIds['text'] = $this->getTextData( $refKeys['text'] );
-		$this->addCustomerListData( $testdata, $refIds, 'FosUser' );
+		$refIds['text'] = $this->getTextData($refKeys['text']);
+		$this->addCustomerListData($testdata, $refIds, 'FosUser');
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }

lib/custom/setup/unittest/CustomerPropertyAddFosUserTestData.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData' );
+		return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData');
 	}
 
 
@@ -32,20 +32,20 @@ 
 	 */
 	public function migrate()
 	{
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional);
 
-		$this->msg( 'Adding customer property Fos user bundle test data', 0 );
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
+		$this->msg('Adding customer property Fos user bundle test data', 0);
+		$this->additional->setEditor('ai-fosuser:unittest');
 
 		$ds = DIRECTORY_SEPARATOR;
 		$path = __DIR__ . $ds . 'data' . $ds . 'customer-property.php';
 
-		if( ( $testdata = include( $path ) ) == false ) {
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+		if (($testdata = include($path)) == false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
 		}
 
-		$this->addCustomerPropertyData( $testdata, 'FosUser' );
+		$this->addCustomerPropertyData($testdata, 'FosUser');
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }
\ No newline at end of file

lib/custom/setup/unittest/data/customer-list.php

Spacing +12 added lines, -12 removed lines

@@ -5,19 +5,19 @@
  * @copyright Aimeos (aimeos.org), 2014-2018
  */
 
-return array (
-	'customer/lists/type' => array (
-		'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
-		'order/download' => array( 'domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1 ),
-		'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ),
-		'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ),
-		'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
+return array(
+	'customer/lists/type' => array(
+		'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
+		'order/download' => array('domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1),
+		'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1),
+		'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1),
+		'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
 	),
 
-	'customer/lists' => array (
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1 ),
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1 ),
-		array( 'parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
+	'customer/lists' => array(
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1),
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1),
+		array('parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
 	),
 );

lib/custom/setup/unittest/data/customer.php

Spacing +8 added lines, -8 removed lines

@@ -5,17 +5,17 @@
  * @copyright Aimeos (aimeos.org), 2014-2018
  */
 
-return array (
+return array(
 	'customer' => array(
-		'customer/UTC001' => array( 'code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
-		'customer/UTC002' => array( 'code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
-		'customer/UTC003' => array( 'code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
+		'customer/UTC001' => array('code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
+		'customer/UTC002' => array('code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0', 'password' =>  'test'),
+		'customer/UTC003' => array('code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
 	),
 
 	'customer/address' => array(
-		array( 'parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'pos' => '0' ),
-		array( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'pos' => '1' ),
-		array( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'pos' => '1' ),
-		array( 'parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'pos' => '2' ),
+		array('parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'pos' => '0'),
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'pos' => '1'),
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'pos' => '1'),
+		array('parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'pos' => '2'),
 	),
 );

lib/custom/src/MShop/Customer/Manager/FosUser.php

Spacing +85 added lines, -85 removed lines

@@ -241,13 +241,13 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/submanagers';
 		$default = ['address', 'group', 'lists', 'property'];
 
-		foreach( $this->getContext()->getConfig()->get( $path, $default ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, $default) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -257,10 +257,10 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
 		$path = 'mshop/customer/manager/fosuser/delete';
-		$this->deleteItemsBase( $ids, $path, false );
+		$this->deleteItemsBase($ids, $path, false);
 	}
 
 
@@ -270,12 +270,12 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/submanagers';
 		$default = ['address', 'group', 'lists', 'property'];
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, $default, $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, $default, $withsub);
 	}
 
 
@@ -286,29 +286,29 @@ 
 	 * @param boolean $fetch True if the new ID should be returned in the item
 	 * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID
 	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
 	{
-		self::checkClass( '\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item );
+		self::checkClass('\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item);
 
-		if( !$item->isModified() )
+		if (!$item->isModified())
 		{
-			$item = $this->savePropertyItems( $item, 'customer' );
-			$item = $this->saveAddressItems( $item, 'customer' );
-			return $this->saveListItems( $item, 'customer' );
+			$item = $this->savePropertyItems($item, 'customer');
+			$item = $this->saveAddressItems($item, 'customer');
+			return $this->saveListItems($item, 'customer');
 		}
 
 		$context = $this->getContext();
 		$dbm = $context->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 
 		try
 		{
 			$id = $item->getId();
-			$date = date( 'Y-m-d H:i:s' );
+			$date = date('Y-m-d H:i:s');
 			$billingAddress = $item->getPaymentAddress();
 
-			if( $id === null )
+			if ($id === null)
 			{
 				/** mshop/customer/manager/fosuser/insert
 				 * Inserts a new customer record into the database table
@@ -372,51 +372,51 @@ 
 				$path = 'mshop/customer/manager/fosuser/update';
 			}
 
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 2, $item->getCode() ); // canonical username
-			$stmt->bind( 3, $item->getCode() ); // username
-			$stmt->bind( 4, $billingAddress->getCompany() );
-			$stmt->bind( 5, $billingAddress->getVatID() );
-			$stmt->bind( 6, $billingAddress->getSalutation() );
-			$stmt->bind( 7, $billingAddress->getTitle() );
-			$stmt->bind( 8, $billingAddress->getFirstname() );
-			$stmt->bind( 9, $billingAddress->getLastname() );
-			$stmt->bind( 10, $billingAddress->getAddress1() );
-			$stmt->bind( 11, $billingAddress->getAddress2() );
-			$stmt->bind( 12, $billingAddress->getAddress3() );
-			$stmt->bind( 13, $billingAddress->getPostal() );
-			$stmt->bind( 14, $billingAddress->getCity() );
-			$stmt->bind( 15, $billingAddress->getState() );
-			$stmt->bind( 16, $billingAddress->getCountryId() );
-			$stmt->bind( 17, $billingAddress->getLanguageId() );
-			$stmt->bind( 18, $billingAddress->getTelephone() );
-			$stmt->bind( 19, $billingAddress->getEmail() );
-			$stmt->bind( 20, $billingAddress->getEmail() );
-			$stmt->bind( 21, $billingAddress->getTelefax() );
-			$stmt->bind( 22, $billingAddress->getWebsite() );
-			$stmt->bind( 23, $billingAddress->getLongitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT );
-			$stmt->bind( 24, $billingAddress->getLatitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT );
-			$stmt->bind( 25, $item->getBirthday() );
-			$stmt->bind( 26, ( $item->getStatus() > 0 ? true : false ), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL );
-			$stmt->bind( 27, $item->getDateVerified() );
-			$stmt->bind( 28, $item->getPassword() );
-			$stmt->bind( 29, $date ); // Modification time
-			$stmt->bind( 30, $context->getEditor() );
-			$stmt->bind( 31, serialize( $item->getRoles() ) );
-			$stmt->bind( 32, $item->getSalt() );
-
-			if( $id !== null ) {
-				$stmt->bind( 33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$item->setId( $id );
+			$stmt = $this->getCachedStatement($conn, $path);
+
+			$stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(2, $item->getCode()); // canonical username
+			$stmt->bind(3, $item->getCode()); // username
+			$stmt->bind(4, $billingAddress->getCompany());
+			$stmt->bind(5, $billingAddress->getVatID());
+			$stmt->bind(6, $billingAddress->getSalutation());
+			$stmt->bind(7, $billingAddress->getTitle());
+			$stmt->bind(8, $billingAddress->getFirstname());
+			$stmt->bind(9, $billingAddress->getLastname());
+			$stmt->bind(10, $billingAddress->getAddress1());
+			$stmt->bind(11, $billingAddress->getAddress2());
+			$stmt->bind(12, $billingAddress->getAddress3());
+			$stmt->bind(13, $billingAddress->getPostal());
+			$stmt->bind(14, $billingAddress->getCity());
+			$stmt->bind(15, $billingAddress->getState());
+			$stmt->bind(16, $billingAddress->getCountryId());
+			$stmt->bind(17, $billingAddress->getLanguageId());
+			$stmt->bind(18, $billingAddress->getTelephone());
+			$stmt->bind(19, $billingAddress->getEmail());
+			$stmt->bind(20, $billingAddress->getEmail());
+			$stmt->bind(21, $billingAddress->getTelefax());
+			$stmt->bind(22, $billingAddress->getWebsite());
+			$stmt->bind(23, $billingAddress->getLongitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT);
+			$stmt->bind(24, $billingAddress->getLatitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT);
+			$stmt->bind(25, $item->getBirthday());
+			$stmt->bind(26, ($item->getStatus() > 0 ? true : false), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL);
+			$stmt->bind(27, $item->getDateVerified());
+			$stmt->bind(28, $item->getPassword());
+			$stmt->bind(29, $date); // Modification time
+			$stmt->bind(30, $context->getEditor());
+			$stmt->bind(31, serialize($item->getRoles()));
+			$stmt->bind(32, $item->getSalt());
+
+			if ($id !== null) {
+				$stmt->bind(33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$item->setId($id);
 			} else {
-				$stmt->bind( 33, $date ); // Creation time
+				$stmt->bind(33, $date); // Creation time
 			}
 
 			$stmt->execute()->finish();
 
-			if( $id === null && $fetch === true )
+			if ($id === null && $fetch === true)
 			{
 				/** mshop/customer/manager/fosuser/newid
 				 * Retrieves the ID generated by the database when inserting a new record
@@ -449,22 +449,22 @@ 
 				 * @see mshop/customer/manager/fosuser/count
 				 */
 				$path = 'mshop/customer/manager/fosuser/newid';
-				$item->setId( $this->newId( $conn, $path ) );
+				$item->setId($this->newId($conn, $path));
 			}
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 
-		$this->addGroups( $item );
+		$this->addGroups($item);
 
-		$item = $this->savePropertyItems( $item, 'customer' );
-		$item = $this->saveAddressItems( $item, 'customer' );
-		return $this->saveListItems( $item, 'customer' );
+		$item = $this->savePropertyItems($item, 'customer');
+		$item = $this->saveAddressItems($item, 'customer');
+		return $this->saveListItems($item, 'customer');
 	}
 
 
@@ -476,11 +476,11 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
 	 * @throws \Aimeos\MShop\Customer\Exception If creating items failed
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null)
 	{
 		$dbm = $this->getContext()->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 		$map = [];
 
 		try
@@ -488,32 +488,32 @@ 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 			$cfgPathSearch = 'mshop/customer/manager/fosuser/search';
 			$cfgPathCount = 'mshop/customer/manager/fosuser/count';
-			$required = array( 'customer' );
+			$required = array('customer');
 
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[ $row['customer.id'] ] = $row;
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
+			while (($row = $results->fetch()) !== false) {
+				$map[$row['customer.id']] = $row;
 			}
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname  );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 
 		$addrItems = [];
-		if( in_array( 'customer/address', $ref, true ) ) {
-			$addrItems = $this->getAddressItems( array_keys( $map ), 'customer' );
+		if (in_array('customer/address', $ref, true)) {
+			$addrItems = $this->getAddressItems(array_keys($map), 'customer');
 		}
 
 		$propItems = [];
-		if( in_array( 'customer/property', $ref, true ) ) {
-			$propItems = $this->getPropertyItems( array_keys( $map ), 'customer' );
+		if (in_array('customer/property', $ref, true)) {
+			$propItems = $this->getPropertyItems(array_keys($map), 'customer');
 		}
 
-		return $this->buildItems( $map, $ref, 'customer', $addrItems, $propItems );
+		return $this->buildItems($map, $ref, 'customer', $addrItems, $propItems);
 	}
 
 
@@ -524,9 +524,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 
@@ -540,15 +540,15 @@ 
 	 * @param array $propItems List of property items of the customer item
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
 	 */
-	protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [],
-		array $addresses = [], array $propItems = [] )
+	protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [],
+		array $addresses = [], array $propItems = [])
 	{
-		if( isset( $values['roles'] ) ) {
-			$values['roles'] = unserialize( $values['roles'] );
+		if (isset($values['roles'])) {
+			$values['roles'] = unserialize($values['roles']);
 		}
 
 		$helper = $this->getPasswordHelper();
-		$address = new \Aimeos\MShop\Common\Item\Address\Simple( 'customer.', $values );
+		$address = new \Aimeos\MShop\Common\Item\Address\Simple('customer.', $values);
 
 		return new \Aimeos\MShop\Customer\Item\FosUser(
 			$address, $values, $listItems, $refItems,

lib/custom/setup/default/schema/customer.php

Spacing +183 added lines, -183 removed lines

@@ -8,220 +8,220 @@
 
 return array(
 	'table' => array(
-		'fos_user' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'fos_user' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array( 'notnull' => false ) );
-			$table->addColumn( 'username', 'string', array( 'length' => 180 ) );
-			$table->addColumn( 'username_canonical', 'string', array( 'length' => 180 ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 180 ) );
-			$table->addColumn( 'email_canonical', 'string', array( 'length' => 180 ) );
-			$table->addColumn( 'enabled', 'boolean', [] );
-			$table->addColumn( 'salt', 'string', array( 'length' => 255, 'notnull' => false ) );
-			$table->addColumn( 'password', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'last_login', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'confirmation_token', 'string', array( 'length' => 180, 'notnull' => false ) );
-			$table->addColumn( 'password_requested_at', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'roles', 'text', array( 'length' => 0x7fffffff, 'comment' => '(DC2Type:array)' ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'longitude', 'float', array( 'notnull' => false ) );
-			$table->addColumn( 'latitude', 'float', array( 'notnull' => false ) );
-			$table->addColumn( 'birthday', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'mtime', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'ctime', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosus_id' );
-			$table->addUniqueIndex( array( 'confirmation_token' ), 'unq_fosus_confirmtoken' );
-			$table->addUniqueIndex( array( 'username_canonical' ), 'unq_fosus_username' );
-			$table->addUniqueIndex( array( 'email_canonical' ), 'unq_fosus_email' );
-			$table->addIndex( array( 'langid' ), 'idx_fosus_langid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosus_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_fosus_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_fosus_post_city' );
-			$table->addIndex( array( 'lastname' ), 'idx_fosus_lastname' );
-			$table->addIndex( array( 'address1' ), 'idx_fosus_address1' );
-			$table->addIndex( array( 'city' ), 'idx_fosus_city' );
+		'fos_user' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('fos_user');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', array('notnull' => false));
+			$table->addColumn('username', 'string', array('length' => 180));
+			$table->addColumn('username_canonical', 'string', array('length' => 180));
+			$table->addColumn('email', 'string', array('length' => 180));
+			$table->addColumn('email_canonical', 'string', array('length' => 180));
+			$table->addColumn('enabled', 'boolean', []);
+			$table->addColumn('salt', 'string', array('length' => 255, 'notnull' => false));
+			$table->addColumn('password', 'string', array('length' => 255));
+			$table->addColumn('last_login', 'datetime', array('notnull' => false));
+			$table->addColumn('confirmation_token', 'string', array('length' => 180, 'notnull' => false));
+			$table->addColumn('password_requested_at', 'datetime', array('notnull' => false));
+			$table->addColumn('roles', 'text', array('length' => 0x7fffffff, 'comment' => '(DC2Type:array)'));
+			$table->addColumn('salutation', 'string', array('length' => 8));
+			$table->addColumn('company', 'string', array('length' => 100));
+			$table->addColumn('vatid', 'string', array('length' => 32));
+			$table->addColumn('title', 'string', array('length' => 64));
+			$table->addColumn('firstname', 'string', array('length' => 64));
+			$table->addColumn('lastname', 'string', array('length' => 64));
+			$table->addColumn('address1', 'string', array('length' => 200));
+			$table->addColumn('address2', 'string', array('length' => 200));
+			$table->addColumn('address3', 'string', array('length' => 200));
+			$table->addColumn('postal', 'string', array('length' => 16));
+			$table->addColumn('city', 'string', array('length' => 200));
+			$table->addColumn('state', 'string', array('length' => 200));
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
+			$table->addColumn('telephone', 'string', array('length' => 32));
+			$table->addColumn('telefax', 'string', array('length' => 32));
+			$table->addColumn('website', 'string', array('length' => 255));
+			$table->addColumn('longitude', 'float', array('notnull' => false));
+			$table->addColumn('latitude', 'float', array('notnull' => false));
+			$table->addColumn('birthday', 'date', array('notnull' => false));
+			$table->addColumn('vdate', 'date', array('notnull' => false));
+			$table->addColumn('mtime', 'datetime', array('notnull' => false));
+			$table->addColumn('ctime', 'datetime', array('notnull' => false));
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_fosus_id');
+			$table->addUniqueIndex(array('confirmation_token'), 'unq_fosus_confirmtoken');
+			$table->addUniqueIndex(array('username_canonical'), 'unq_fosus_username');
+			$table->addUniqueIndex(array('email_canonical'), 'unq_fosus_email');
+			$table->addIndex(array('langid'), 'idx_fosus_langid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_fosus_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_fosus_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_fosus_post_city');
+			$table->addIndex(array('lastname'), 'idx_fosus_lastname');
+			$table->addIndex(array('address1'), 'idx_fosus_address1');
+			$table->addIndex(array('city'), 'idx_fosus_city');
 
 			return $schema;
 		},
 
-		'fos_user_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'fos_user_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'parentid', 'integer', [] );
-			$table->addColumn( 'pos', 'smallint', [] );
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'longitude', 'float', array( 'notnull' => false ) );
-			$table->addColumn( 'latitude', 'float', array( 'notnull' => false ) );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosad_id' );
-			$table->addIndex( array( 'parentid' ), 'idx_fosad_pid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosad_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_fosad_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_fosad_post_city' );
-			$table->addIndex( array( 'address1' ), 'idx_fosad_address1' );
-			$table->addIndex( array( 'city' ), 'idx_fosad_city' );
-			$table->addIndex( array( 'email' ), 'idx_fosad_email' );
-
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosad_pid' );
+		'fos_user_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('fos_user_address');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('parentid', 'integer', []);
+			$table->addColumn('pos', 'smallint', []);
+			$table->addColumn('company', 'string', array('length' => 100));
+			$table->addColumn('vatid', 'string', array('length' => 32));
+			$table->addColumn('salutation', 'string', array('length' => 8));
+			$table->addColumn('title', 'string', array('length' => 64));
+			$table->addColumn('firstname', 'string', array('length' => 64));
+			$table->addColumn('lastname', 'string', array('length' => 64));
+			$table->addColumn('address1', 'string', array('length' => 200));
+			$table->addColumn('address2', 'string', array('length' => 200));
+			$table->addColumn('address3', 'string', array('length' => 200));
+			$table->addColumn('postal', 'string', array('length' => 16));
+			$table->addColumn('city', 'string', array('length' => 200));
+			$table->addColumn('state', 'string', array('length' => 200));
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
+			$table->addColumn('telephone', 'string', array('length' => 32));
+			$table->addColumn('email', 'string', array('length' => 255));
+			$table->addColumn('telefax', 'string', array('length' => 255));
+			$table->addColumn('website', 'string', array('length' => 255));
+			$table->addColumn('longitude', 'float', array('notnull' => false));
+			$table->addColumn('latitude', 'float', array('notnull' => false));
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_fosad_id');
+			$table->addIndex(array('parentid'), 'idx_fosad_pid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_fosad_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_fosad_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_fosad_post_city');
+			$table->addIndex(array('address1'), 'idx_fosad_address1');
+			$table->addIndex(array('city'), 'idx_fosad_city');
+			$table->addIndex(array('email'), 'idx_fosad_email');
+
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosad_pid');
 
 			return $schema;
 		},
 
-		'fos_user_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'fos_user_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'fos_user_list_type' );
+			$table = $schema->createTable('fos_user_list_type');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'pos', 'integer', ['default' => 0] );
-			$table->addColumn( 'status', 'smallint', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('domain', 'string', array('length' => 32));
+			$table->addColumn('code', 'string', array('length' => 32));
+			$table->addColumn('label', 'string', array('length' => 255));
+			$table->addColumn('pos', 'integer', ['default' => 0]);
+			$table->addColumn('status', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_foslity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_foslity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status', 'pos' ), 'idx_foslity_sid_status_pos' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_foslity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_foslity_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_foslity_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_foslity_sid_dom_code');
+			$table->addIndex(array('siteid', 'status', 'pos'), 'idx_foslity_sid_status_pos');
+			$table->addIndex(array('siteid', 'label'), 'idx_foslity_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_foslity_sid_code');
 
 			return $schema;
 		},
 
-		'fos_user_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'fos_user_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', [] );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'typeid', 'integer', [] );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
-			$table->addColumn( 'pos', 'integer', [] );
-			$table->addColumn( 'status', 'smallint', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_fosli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_fosli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'domain', 'refid', 'typeid' ), 'idx_fosli_pid_sid_dom_rid_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_fosli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_fosli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_fosli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_pid' );
-
-			$table->addForeignKeyConstraint( 'fos_user_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_typeid' );
+		'fos_user_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('fos_user_list');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('parentid', 'integer', []);
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('typeid', 'integer', []);
+			$table->addColumn('domain', 'string', array('length' => 32));
+			$table->addColumn('refid', 'string', array('length' => 32));
+			$table->addColumn('start', 'datetime', array('notnull' => false));
+			$table->addColumn('end', 'datetime', array('notnull' => false));
+			$table->addColumn('config', 'text', array('length' => 0xffff));
+			$table->addColumn('pos', 'integer', []);
+			$table->addColumn('status', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_fosli_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_fosli_sid_dm_rid_tid_pid');
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_fosli_sid_stat_start_end');
+			$table->addIndex(array('parentid', 'siteid', 'domain', 'refid', 'typeid'), 'idx_fosli_pid_sid_dom_rid_tid');
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_fosli_pid_sid_start');
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_fosli_pid_sid_end');
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_fosli_pid_sid_pos');
+
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_pid');
+
+			$table->addForeignKeyConstraint('fos_user_list_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_typeid');
 
 			return $schema;
 		},
 
-		'fos_user_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'fos_user_property_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'fos_user_property_type' );
+			$table = $schema->createTable('fos_user_property_type');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'pos', 'integer', ['default' => 0] );
-			$table->addColumn( 'status', 'smallint', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('domain', 'string', array('length' => 32));
+			$table->addColumn('code', 'string', array('length' => 32));
+			$table->addColumn('label', 'string', array('length' => 255));
+			$table->addColumn('pos', 'integer', ['default' => 0]);
+			$table->addColumn('status', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosprty_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_fosprty_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status', 'pos' ), 'idx_fosprty_sid_status_pos' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_fosprty_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_fosprty_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_fosprty_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_fosprty_sid_dom_code');
+			$table->addIndex(array('siteid', 'status', 'pos'), 'idx_fosprty_sid_status_pos');
+			$table->addIndex(array('siteid', 'label'), 'idx_fosprty_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_fosprty_sid_code');
 
 			return $schema;
 		},
 
-		'fos_user_property' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'fos_user_property' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'fos_user_property' );
+			$table = $schema->createTable('fos_user_property');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'parentid', 'integer', [] );
-			$table->addColumn( 'typeid', 'integer', [] );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'value', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('parentid', 'integer', []);
+			$table->addColumn('typeid', 'integer', []);
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
+			$table->addColumn('value', 'string', array('length' => 255));
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_fospr_id' );
-			$table->addUniqueIndex( array( 'parentid', 'siteid', 'typeid', 'langid', 'value' ), 'unq_fospr_sid_tid_lid_value' );
-			$table->addIndex( array( 'siteid', 'langid' ), 'idx_fospr_sid_langid' );
-			$table->addIndex( array( 'siteid', 'value' ), 'idx_fospr_sid_value' );
-			$table->addIndex( array( 'typeid' ), 'fk_fospr_typeid' );
-			$table->addIndex( array( 'parentid' ), 'fk_fospr_pid' );
+			$table->setPrimaryKey(array('id'), 'pk_fospr_id');
+			$table->addUniqueIndex(array('parentid', 'siteid', 'typeid', 'langid', 'value'), 'unq_fospr_sid_tid_lid_value');
+			$table->addIndex(array('siteid', 'langid'), 'idx_fospr_sid_langid');
+			$table->addIndex(array('siteid', 'value'), 'idx_fospr_sid_value');
+			$table->addIndex(array('typeid'), 'fk_fospr_typeid');
+			$table->addIndex(array('parentid'), 'fk_fospr_pid');
 
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fospr_pid' );
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fospr_pid');
 
-			$table->addForeignKeyConstraint( 'fos_user_property_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fospr_typeid' );
+			$table->addForeignKeyConstraint('fos_user_property_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fospr_typeid');
 
 			return $schema;
 		},