aimeos / ai-laravel

lib/custom/setup/unittest/CustomerAddLaravelTestData.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesAddLaravelTestData' );
+		return array('TablesAddLaravelTestData');
 	}
 
 
@@ -31,36 +31,36 @@ 
 	public function migrate()
 	{
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+		if (!($this->additional instanceof $iface)) {
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
 		}
 
-		$this->msg( 'Adding Laravel customer test data', 0 );
-		$this->additional->setEditor( 'ai-laravel:unittest' );
+		$this->msg('Adding Laravel customer test data', 0);
+		$this->additional->setEditor('ai-laravel:unittest');
 
 		$parentIds = [];
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
+		$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, 'Laravel' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' );
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'Laravel');
+		$customerAddressManager = $customerManager->getSubManager('address', 'Laravel');
 
-		$this->cleanupCustomerData( $customerManager, $customerAddressManager );
+		$this->cleanupCustomerData($customerManager, $customerAddressManager);
 
 		$this->conn->begin();
 
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
 
 		$this->conn->commit();
 
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 
 
@@ -70,17 +70,17 @@ 
 	 * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager
 	 * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager
 	 */
-	protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager )
+	protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager)
 	{
 		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '=~', 'customer.code', 'UTC00' ) );
-		$customerItems = $customerManager->searchItems( $search );
+		$search->setConditions($search->compare('=~', 'customer.code', 'UTC00'));
+		$customerItems = $customerManager->searchItems($search);
 
 		$search = $customerAddressManager->createSearch();
-		$search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) );
-		$addressItems = $customerAddressManager->searchItems( $search );
+		$search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer'));
+		$addressItems = $customerAddressManager->searchItems($search);
 
-		$customerAddressManager->deleteItems( array_keys( $addressItems ) );
-		$customerManager->deleteItems( array_keys( $customerItems ) );
+		$customerAddressManager->deleteItems(array_keys($addressItems));
+		$customerManager->deleteItems(array_keys($customerItems));
 	}
 }

lib/custom/setup/unittest/CustomerPropertyAddLaravelTestData.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData' );
+		return array('TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData');
 	}
 
 
@@ -33,22 +33,22 @@ 
 	public function migrate()
 	{
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+		if (!($this->additional instanceof $iface)) {
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
 		}
 
-		$this->msg( 'Adding customer-property Laravel test data', 0 );
-		$this->additional->setEditor( 'ai-laravel:unittest' );
+		$this->msg('Adding customer-property Laravel test data', 0);
+		$this->additional->setEditor('ai-laravel:unittest');
 
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer-property.php';
+		$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, 'Laravel' );
+		$this->addCustomerPropertyData($testdata, 'Laravel');
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }
\ No newline at end of file

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

Spacing +8 added lines, -8 removed lines

@@ -5,17 +5,17 @@
  * @copyright Aimeos (aimeos.org), 2014-2017
  */
 
-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', 'flag' => 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', 'flag' => 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', 'flag' => 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', 'flag' => 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', 'flag' => 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', 'flag' => 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', 'flag' => 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', 'flag' => 0, 'pos' => '2'),
 	),
 );

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

Spacing +3 added lines, -3 removed lines

@@ -5,12 +5,12 @@
  * @copyright Aimeos (aimeos.org), 2018
  */
 
-return array (
+return array(
 	'customer/property/type' => array(
-		'customer/property/type/newsletter' => array( 'domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1 ),
+		'customer/property/type/newsletter' => array('domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1),
 	),
 
 	'customer/property' => array(
-		'customer/property/UTC001/newsletter' => array( 'parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1' ),
+		'customer/property/UTC001/newsletter' => array('parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1'),
 	),
 );
\ 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-2017
  */
 
-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),
 	),
 );
\ No newline at end of file

lib/custom/tests/MShop/Customer/Manager/Property/Type/LaravelTest.php

Spacing +72 added lines, -72 removed lines

@@ -20,8 +20,8 @@ 
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
 
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Laravel' );
-		$this->object = $manager->getSubManager( 'property', 'Laravel' )->getSubManager( 'type', 'Laravel' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context, 'Laravel');
+		$this->object = $manager->getSubManager('property', 'Laravel')->getSubManager('type', 'Laravel');
 	}
 
 
@@ -33,13 +33,13 @@ 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $this->object->createItem());
 	}
 
 
@@ -47,14 +47,14 @@ 
 	{
 		$result = $this->object->getResourceType();
 
-		$this->assertContains( 'customer/property/type', $result );
+		$this->assertContains('customer/property/type', $result);
 	}
 
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($this->object->getSearchAttributes() as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
@@ -63,82 +63,82 @@ 
 	{
 		$search = $this->object->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.property.type.code', 'newsletter' ),
-			$search->compare( '==', 'customer.property.type.editor', $this->editor )
+			$search->compare('==', 'customer.property.type.code', 'newsletter'),
+			$search->compare('==', 'customer.property.type.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
+		$search->setConditions($search->combine('&&', $conditions));
 
-		$results = $this->object->searchItems( $search );
+		$results = $this->object->searchItems($search);
 
-		if( ($expected = reset($results) ) === false )
+		if (($expected = reset($results)) === false)
 		{
-			throw new \RuntimeException( 'No property type item found.' );
+			throw new \RuntimeException('No property type item found.');
 		}
 
-		$actual = $this->object->getItem( $expected->getId() );
+		$actual = $this->object->getItem($expected->getId());
 
-		$this->assertEquals( $expected, $actual );
+		$this->assertEquals($expected, $actual);
 	}
 
 
 	public function testSaveInvalid()
 	{
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
-		$this->object->saveItem( new \Aimeos\MShop\Locale\Item\Standard() );
+		$this->setExpectedException('\Aimeos\MShop\Exception');
+		$this->object->saveItem(new \Aimeos\MShop\Locale\Item\Standard());
 	}
 
 
 	public function testSaveUpdateDeleteItem()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.property.type.editor', $this->editor ) );
+		$search->setConditions($search->compare('==', 'customer.property.type.editor', $this->editor));
 		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No type item found' );
+		if (($item = reset($results)) === false) {
+			throw new \RuntimeException('No type item found');
 		}
 
 		$item->setId(null);
-		$item->setCode( 'unitTestSave' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTestSave');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave2' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+		$itemExp->setCode('unitTestSave2');
+		$resultUpd = $this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
 
-		$this->object->deleteItem( $itemSaved->getId() );
+		$this->object->deleteItem($itemSaved->getId());
 
 
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getItem( $itemSaved->getId() );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
@@ -148,36 +148,36 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$expr[] = $search->compare( '!=', 'customer.property.type.id', null );
-		$expr[] = $search->compare( '!=', 'customer.property.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.property.type.domain', 'customer' );
-		$expr[] = $search->compare( '==', 'customer.property.type.code', 'newsletter' );
-		$expr[] = $search->compare( '>', 'customer.property.type.label', '' );
-		$expr[] = $search->compare( '>=', 'customer.property.type.position', 0 );
-		$expr[] = $search->compare( '==', 'customer.property.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.property.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.property.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.property.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine('&&', $expr) );
-		$results = $this->object->searchItems( $search, [], $total );
-		$this->assertEquals( 1, count( $results ) );
+		$expr[] = $search->compare('!=', 'customer.property.type.id', null);
+		$expr[] = $search->compare('!=', 'customer.property.type.siteid', null);
+		$expr[] = $search->compare('==', 'customer.property.type.domain', 'customer');
+		$expr[] = $search->compare('==', 'customer.property.type.code', 'newsletter');
+		$expr[] = $search->compare('>', 'customer.property.type.label', '');
+		$expr[] = $search->compare('>=', 'customer.property.type.position', 0);
+		$expr[] = $search->compare('==', 'customer.property.type.status', 1);
+		$expr[] = $search->compare('>=', 'customer.property.type.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('>=', 'customer.property.type.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.property.type.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
+		$results = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(1, count($results));
 
 
 		$search = $this->object->createSearch();
 		$conditions = array(
-			$search->compare( '=~', 'customer.property.type.code', 'newsletter'),
-			$search->compare( '==', 'customer.property.type.editor', $this->editor )
+			$search->compare('=~', 'customer.property.type.code', 'newsletter'),
+			$search->compare('==', 'customer.property.type.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine('&&', $conditions ) );
+		$search->setConditions($search->combine('&&', $conditions));
 		$search->setSlice(0, 1);
-		$items = $this->object->searchItems( $search, [], $total);
+		$items = $this->object->searchItems($search, [], $total);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertEquals( 1, $total );
+		$this->assertEquals(1, count($items));
+		$this->assertEquals(1, $total);
 
-		foreach($items as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($items as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 

lib/custom/tests/MShop/Customer/Manager/Lists/Type/LaravelTest.php

Spacing +59 added lines, -59 removed lines

@@ -16,29 +16,29 @@ 
 	protected function setUp()
 	{
 		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Laravel' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Laravel');
 
-		$listManager = $manager->getSubManager( 'lists', 'Laravel' );
-		$this->object = $listManager->getSubManager( 'type', 'Laravel' );
+		$listManager = $manager->getSubManager('lists', 'Laravel');
+		$this->object = $listManager->getSubManager('type', 'Laravel');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testCreateItem()
 	{
 		$item = $this->object->createItem();
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item);
 	}
 
 
@@ -48,18 +48,18 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No list type item found' );
+		if (($expected = reset($results)) === false) {
+			throw new \RuntimeException('No list type item found');
 		}
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+		$this->assertEquals($expected, $this->object->getItem($expected->getId()));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
@@ -69,51 +69,51 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No type item found' );
+		if (($item = reset($results)) === false) {
+			throw new \RuntimeException('No type item found');
 		}
 
 		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTestInit');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+		$itemExp->setCode('unitTestSave');
+		$resultUpd = $this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
 
-		$this->object->deleteItem( $itemSaved->getId() );
+		$this->object->deleteItem($itemSaved->getId());
 
 
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
@@ -123,26 +123,26 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.position', 0 );
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
+		$expr[] = $search->compare('>=', 'customer.lists.type.position', 0);
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
 		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, [], $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
+		$results = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(1, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 

lib/custom/tests/MShop/Customer/Manager/LaravelTest.php

Spacing +164 added lines, -164 removed lines

@@ -21,41 +21,41 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
+		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context);
 
 		$this->fixture = array(
 			'label' => 'unitTest',
 			'status' => 2,
 		);
 
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture, $this->address );
+		unset($this->object, $this->fixture, $this->address);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute )
+		foreach ($this->object->getSearchAttributes() as $attribute)
 		{
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem());
 	}
 
 
@@ -63,21 +63,21 @@ 
 	{
 		$search = $this->object->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC003' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'UTC003'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$items = $this->object->searchItems( $search, array( 'text' ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$items = $this->object->searchItems($search, array('text'));
 
-		if( ( $expected = reset( $items ) ) === false ) {
-			throw new \RuntimeException( 'No customer item with code "UTC003" found' );
+		if (($expected = reset($items)) === false) {
+			throw new \RuntimeException('No customer item with code "UTC003" found');
 		}
 
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
+		$actual = $this->object->getItem($expected->getId(), array('text'));
 
-		$this->assertEquals( $expected, $actual );
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
+		$this->assertEquals($expected, $actual);
+		$this->assertEquals(3, count($actual->getListItems('text')));
+		$this->assertEquals(3, count($actual->getRefItems('text')));
 	}
 
 
@@ -85,92 +85,92 @@ 
 	{
 		$item = $this->object->createItem();
 
-		$item->setCode( 'unitTest' );
-		$item->setLabel( 'unitTest' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTest');
+		$item->setLabel('unitTest');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTest2' );
-		$itemExp->setLabel( 'unitTest2' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $item->getId() );
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
-
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
-
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
-
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getItem( $item->getId() );
+		$itemExp->setCode('unitTest2');
+		$itemExp->setLabel('unitTest2');
+		$resultUpd = $this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($item->getId());
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress());
+		$this->assertEquals($item->getBirthday(), $itemSaved->getBirthday());
+		$this->assertEquals($item->getPassword(), $itemSaved->getPassword());
+
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
+
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress());
+		$this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday());
+		$this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
+
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
+
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getItem($item->getId());
 	}
 
 
 	public function testGetSaveAddressItems()
 	{
-		$item = $this->object->findItem( 'UTC001', ['customer/address'] );
+		$item = $this->object->findItem('UTC001', ['customer/address']);
 
-		$item->setId( null )->setCode( 'xyz' );
-		$item->getPaymentAddress()->setEmail( 'unittest@xyz.com' );
-		$item->addAddressItem( new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.' ) );
-		$this->object->saveItem( $item );
+		$item->setId(null)->setCode('xyz');
+		$item->getPaymentAddress()->setEmail('unittest@xyz.com');
+		$item->addAddressItem(new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.'));
+		$this->object->saveItem($item);
 
-		$item2 = $this->object->findItem( 'xyz', ['customer/address'] );
+		$item2 = $this->object->findItem('xyz', ['customer/address']);
 
-		$this->object->deleteItem( $item->getId() );
+		$this->object->deleteItem($item->getId());
 
-		$this->assertEquals( 2, count( $item->getAddressItems() ) );
-		$this->assertEquals( 2, count( $item2->getAddressItems() ) );
+		$this->assertEquals(2, count($item->getAddressItems()));
+		$this->assertEquals(2, count($item2->getAddressItems()));
 	}
 
 
 	public function testGetSavePropertyItems()
 	{
-		$item = $this->object->findItem( 'UTC001', ['customer/property'] );
+		$item = $this->object->findItem('UTC001', ['customer/property']);
 
-		$item->setId( null )->setCode( 'xyz' );
-		$item->getPaymentAddress()->setEmail( 'unittest@xyz.com' );
-		$this->object->saveItem( $item );
+		$item->setId(null)->setCode('xyz');
+		$item->getPaymentAddress()->setEmail('unittest@xyz.com');
+		$this->object->saveItem($item);
 
-		$item2 = $this->object->findItem( 'xyz', ['customer/property'] );
+		$item2 = $this->object->findItem('xyz', ['customer/property']);
 
-		$this->object->deleteItem( $item->getId() );
+		$this->object->deleteItem($item->getId());
 
-		$this->assertEquals( 1, count( $item->getPropertyItems() ) );
-		$this->assertEquals( 1, count( $item2->getPropertyItems() ) );
+		$this->assertEquals(1, count($item->getPropertyItems()));
+		$this->assertEquals(1, count($item2->getPropertyItems()));
 	}
 
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -180,69 +180,69 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$expr[] = $search->compare( '!=', 'customer.id', null );
-		$expr[] = $search->compare( '==', 'customer.label', 'unitCustomer2' );
-		$expr[] = $search->compare( '==', 'customer.code', 'UTC002' );
-
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
-		$expr[] = $search->compare( '>=', 'customer.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.latitude', '50.0' );
-
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
-
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
-		$expr[] = $search->compare( '==', 'customer.address.email', 'unitCustomer2@aimeos.org' );
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
-		$expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$result = $this->object->searchItems( $search, [], $total );
-		$this->assertEquals( 1, count( $result ) );
+		$expr[] = $search->compare('!=', 'customer.id', null);
+		$expr[] = $search->compare('==', 'customer.label', 'unitCustomer2');
+		$expr[] = $search->compare('==', 'customer.code', 'UTC002');
+
+		$expr[] = $search->compare('>=', 'customer.salutation', '');
+		$expr[] = $search->compare('>=', 'customer.company', '');
+		$expr[] = $search->compare('>=', 'customer.vatid', '');
+		$expr[] = $search->compare('>=', 'customer.title', '');
+		$expr[] = $search->compare('>=', 'customer.firstname', '');
+		$expr[] = $search->compare('>=', 'customer.lastname', '');
+		$expr[] = $search->compare('>=', 'customer.address1', '');
+		$expr[] = $search->compare('>=', 'customer.address2', '');
+		$expr[] = $search->compare('>=', 'customer.address3', '');
+		$expr[] = $search->compare('>=', 'customer.postal', '');
+		$expr[] = $search->compare('>=', 'customer.city', '');
+		$expr[] = $search->compare('>=', 'customer.state', '');
+		$expr[] = $search->compare('!=', 'customer.languageid', null);
+		$expr[] = $search->compare('>=', 'customer.countryid', '');
+		$expr[] = $search->compare('>=', 'customer.telephone', '');
+		$expr[] = $search->compare('>=', 'customer.email', '');
+		$expr[] = $search->compare('>=', 'customer.telefax', '');
+		$expr[] = $search->compare('>=', 'customer.website', '');
+		$expr[] = $search->compare('>=', 'customer.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.latitude', '50.0');
+
+		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01');
+		$expr[] = $search->compare('>=', 'customer.password', '');
+		$expr[] = $search->compare('==', 'customer.status', 0);
+		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.editor', $this->editor);
+
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
+		$expr[] = $search->compare('==', 'customer.address.email', 'unitCustomer2@aimeos.org');
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
+		$expr[] = $search->compare('>=', 'customer.address.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
+		$result = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(1, count($result));
 	}
 
 
@@ -251,60 +251,60 @@ 
 		$total = 0;
 
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
-		$search->setSlice( 0, 2 );
+		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor));
+		$search->setSlice(0, 2);
 
-		$results = $this->object->searchItems( $search, [], $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
+		$results = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(2, count($results));
+		$this->assertEquals(3, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 
 
 	public function testSearchItemsCriteria()
 	{
-		$search = $this->object->createSearch( true );
+		$search = $this->object->createSearch(true);
 		$conditions = array(
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
+			$search->compare('==', 'customer.address.editor', $this->editor),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, [], $total ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(2, count($this->object->searchItems($search, [], $total)));
 	}
 
 
 	public function testSearchItemsRef()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', 'UTC001' ) );
+		$search->setConditions($search->compare('==', 'customer.code', 'UTC001'));
 
-		$results = $this->object->searchItems( $search, ['customer/address', 'text'] );
+		$results = $this->object->searchItems($search, ['customer/address', 'text']);
 
-		if( ( $item = reset( $results ) ) === false ) {
-			throw new \Exception( 'No customer item for "UTC001" available' );
+		if (($item = reset($results)) === false) {
+			throw new \Exception('No customer item for "UTC001" available');
 		}
 
-		$this->assertEquals( 1, count( $item->getRefItems( 'text' ) ) );
-		$this->assertEquals( 1, count( $item->getAddressItems() ) );
+		$this->assertEquals(1, count($item->getRefItems('text')));
+		$this->assertEquals(1, count($item->getAddressItems()));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address'));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard'));
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testGetSubManagerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'address', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('address', 'unknown');
 	}
 }

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

Spacing +178 added lines, -178 removed lines

@@ -8,215 +8,215 @@
 
 return array(
 	'table' => array(
-		'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'superuser', 'smallint', array( 'default' => 0 ) );
-			$table->addColumn( 'siteid', 'integer', array( 'notnull' => false ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255, 'default' => '' ) );
-			$table->addColumn( 'name', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) );
-			$table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) );
-			$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, 'default' => '' ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'password', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'birthday', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'status', 'smallint', array( 'default' => 1 ) );
-			$table->addColumn( 'updated_at', 'datetime', [] );
-			$table->addColumn( 'created_at', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvusr_id' );
-			$table->addUniqueIndex( array( 'email' ), 'unq_lvusr_email' );
-			$table->addIndex( array( 'langid' ), 'idx_lvusr_langid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvusr_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_lvusr_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_lvusr_post_city' );
-			$table->addIndex( array( 'lastname' ), 'idx_lvusr_lastname' );
-			$table->addIndex( array( 'address1' ), 'idx_lvusr_address1' );
-			$table->addIndex( array( 'city' ), 'idx_lvusr_city' );
+		'users' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('users');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('superuser', 'smallint', array('default' => 0));
+			$table->addColumn('siteid', 'integer', array('notnull' => false));
+			$table->addColumn('label', 'string', array('length' => 255, 'default' => ''));
+			$table->addColumn('name', 'string', array('length' => 255));
+			$table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false));
+			$table->addColumn('salutation', 'string', array('length' => 8, 'default' => ''));
+			$table->addColumn('company', 'string', array('length' => 100, 'default' => ''));
+			$table->addColumn('vatid', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('title', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('firstname', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('lastname', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('address1', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('address2', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('address3', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('postal', 'string', array('length' => 16, 'default' => ''));
+			$table->addColumn('city', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('state', 'string', array('length' => 200, 'default' => ''));
+			$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, 'default' => ''));
+			$table->addColumn('telefax', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('website', 'string', array('length' => 255, 'default' => ''));
+			$table->addColumn('email', 'string', array('length' => 255));
+			$table->addColumn('password', 'string', array('length' => 255));
+			$table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('birthday', 'date', array('notnull' => false));
+			$table->addColumn('vdate', 'date', array('notnull' => false));
+			$table->addColumn('status', 'smallint', array('default' => 1));
+			$table->addColumn('updated_at', 'datetime', []);
+			$table->addColumn('created_at', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255, 'default' => ''));
+
+			$table->setPrimaryKey(array('id'), 'pk_lvusr_id');
+			$table->addUniqueIndex(array('email'), 'unq_lvusr_email');
+			$table->addIndex(array('langid'), 'idx_lvusr_langid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_lvusr_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_lvusr_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_lvusr_post_city');
+			$table->addIndex(array('lastname'), 'idx_lvusr_lastname');
+			$table->addIndex(array('address1'), 'idx_lvusr_address1');
+			$table->addIndex(array('city'), 'idx_lvusr_city');
 
 			return $schema;
 		},
 
-		'users_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'parentid', 'integer', [] );
-			$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', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'flag', 'integer', [] );
-			$table->addColumn( 'pos', 'smallint', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvuad_id' );
-			$table->addIndex( array( 'parentid' ), 'idx_lvuad_pid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvuad_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_lvuad_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_lvuad_post_city' );
-			$table->addIndex( array( 'address1' ), 'idx_lvuad_address1' );
-			$table->addIndex( array( 'city' ), 'idx_lvuad_city' );
-			$table->addIndex( array( 'email' ), 'idx_lvuad_email' );
-
-			$table->addForeignKeyConstraint( 'users', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuad_pid' );
+		'users_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('users_address');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('parentid', 'integer', []);
+			$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', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('flag', 'integer', []);
+			$table->addColumn('pos', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_lvuad_id');
+			$table->addIndex(array('parentid'), 'idx_lvuad_pid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_lvuad_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_lvuad_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_lvuad_post_city');
+			$table->addIndex(array('address1'), 'idx_lvuad_address1');
+			$table->addIndex(array('city'), 'idx_lvuad_city');
+			$table->addIndex(array('email'), 'idx_lvuad_email');
+
+			$table->addForeignKeyConstraint('users', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuad_pid');
 
 			return $schema;
 		},
 
-		'users_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'users_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'users_list_type' );
+			$table = $schema->createTable('users_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', [] );
-			$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', []);
+			$table->addColumn('status', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvulity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvulity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status', 'pos' ), 'idx_lvulity_sid_status_pos' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_lvulity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_lvulity_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_lvulity_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvulity_sid_dom_code');
+			$table->addIndex(array('siteid', 'status', 'pos'), 'idx_lvulity_sid_status_pos');
+			$table->addIndex(array('siteid', 'label'), 'idx_lvulity_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_lvulity_sid_code');
 
 			return $schema;
 		},
 
-		'users_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users_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_lvuli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_lvuli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_lvuli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_lvuli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_lvuli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_lvuli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_lvuli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'users', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_pid' );
-
-			$table->addForeignKeyConstraint( 'users_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_typeid' );
+		'users_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('users_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_lvuli_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_lvuli_sid_dm_rid_tid_pid');
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_lvuli_sid_stat_start_end');
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_lvuli_pid_sid_rid_dom_tid');
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_lvuli_pid_sid_start');
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_lvuli_pid_sid_end');
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_lvuli_pid_sid_pos');
+
+			$table->addForeignKeyConstraint('users', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_pid');
+
+			$table->addForeignKeyConstraint('users_list_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_typeid');
 
 			return $schema;
 		},
 
-		'users_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'users_property_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'users_property_type' );
+			$table = $schema->createTable('users_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', [] );
-			$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', []);
+			$table->addColumn('status', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvuprty_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvuprty_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status', 'pos' ), 'idx_lvuprty_sid_status_pos' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_lvuprty_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_lvuprty_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_lvuprty_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvuprty_sid_dom_code');
+			$table->addIndex(array('siteid', 'status', 'pos'), 'idx_lvuprty_sid_status_pos');
+			$table->addIndex(array('siteid', 'label'), 'idx_lvuprty_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_lvuprty_sid_code');
 
 			return $schema;
 		},
 
-		'users_property' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'users_property' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'users_property' );
+			$table = $schema->createTable('users_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_lvupr_id' );
-			$table->addUniqueIndex( array( 'parentid', 'siteid', 'typeid', 'langid', 'value' ), 'unq_lvupr_sid_tid_lid_value' );
-			$table->addIndex( array( 'siteid', 'langid' ), 'idx_lvupr_sid_langid' );
-			$table->addIndex( array( 'siteid', 'value' ), 'idx_lvupr_sid_value' );
-			$table->addIndex( array( 'typeid' ), 'fk_lvupr_typeid' );
-			$table->addIndex( array( 'parentid' ), 'fk_lvupr_pid' );
+			$table->setPrimaryKey(array('id'), 'pk_lvupr_id');
+			$table->addUniqueIndex(array('parentid', 'siteid', 'typeid', 'langid', 'value'), 'unq_lvupr_sid_tid_lid_value');
+			$table->addIndex(array('siteid', 'langid'), 'idx_lvupr_sid_langid');
+			$table->addIndex(array('siteid', 'value'), 'idx_lvupr_sid_value');
+			$table->addIndex(array('typeid'), 'fk_lvupr_typeid');
+			$table->addIndex(array('parentid'), 'fk_lvupr_pid');
 
-			$table->addForeignKeyConstraint( 'users', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvupr_pid' );
+			$table->addForeignKeyConstraint('users', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvupr_pid');
 
-			$table->addForeignKeyConstraint( 'users_property_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvupr_typeid' );
+			$table->addForeignKeyConstraint('users_property_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvupr_typeid');
 
 			return $schema;
 		},