View GitHub Repository ai-fosuser

Schedule Inspection
Subscribe
Completed
Push — master ( b2adb5...b4566c )
by Aimeos
02:22
created
Status
Category
Toggle Patches
lib/custom/tests/bootstrap.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -4,17 +4,17 @@
 
 block discarded – undo
4 4 
  * Set error reporting to maximum
5 5 
  */
6 6 
 error_reporting( -1 );
7 
-ini_set( 'display_errors', true );
7 
+ini_set('display_errors', true);
8 8
9 
-date_default_timezone_set( 'UTC' );
9 
+date_default_timezone_set('UTC');
10 10
11 11 
 /*
12 12 
  * Set locale settings to reasonable defaults
13 13 
  */
14 
-setlocale( LC_ALL, 'en_US.UTF-8' );
15 
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
16 
-setlocale( LC_NUMERIC, 'POSIX' );
17 
-setlocale( LC_TIME, 'POSIX' );
14 
+setlocale(LC_ALL, 'en_US.UTF-8');
15 
+setlocale(LC_CTYPE, 'en_US.UTF-8');
16 
+setlocale(LC_NUMERIC, 'POSIX');
17 
+setlocale(LC_TIME, 'POSIX');
18 18
19 19
20 20 
 require_once 'TestHelper.php';
Please login to merge, or discard this patch.
lib/custom/setup/FosuserAddIndexes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44 
 	 */
45 45 
 	public function getPostDependencies()
46 46 
 	{
47 
-		return array( 'TablesCreateFosUser' );
47 
+		return array('TablesCreateFosUser');
48 48 
 	}
49 49
50 50 
 
@@ -53,23 +53,23 @@  discard block
 
 block discarded – undo
53 53 
 	 */
54 54 
 	public function migrate()
55 55 
 	{
56 
-		$this->msg( 'Adding indexes from "fos_user"', 0 ); $this->status( '' );
56 
+		$this->msg('Adding indexes from "fos_user"', 0); $this->status('');
57 57
58 
-		$schema = $this->getSchema( 'db-customer' );
58 
+		$schema = $this->getSchema('db-customer');
59 59
60 
-		foreach( $this->list as $idx => $stmt )
60 
+		foreach ($this->list as $idx => $stmt)
61 61 
 		{
62 
-			$this->msg( sprintf( 'Checking index "%1$s"', $idx ), 0 );
62 
+			$this->msg(sprintf('Checking index "%1$s"', $idx), 0);
63 63
64 
-			if( $schema->tableExists( 'fos_user' ) === true
65 
-				&& $schema->indexExists( 'fos_user', $idx ) === false )
64 
+			if ($schema->tableExists('fos_user') === true
65 
+				&& $schema->indexExists('fos_user', $idx) === false)
66 66 
 			{
67 
-				$this->execute( $stmt );
68 
-				$this->status( 'done' );
67 
+				$this->execute($stmt);
68 
+				$this->status('done');
69 69 
 			}
70 70 
 			else
71 71 
 			{
72 
-				$this->status( 'OK' );
72 
+				$this->status('OK');
73 73 
 			}
74 74 
 		}
75 75 
 	}
Please login to merge, or discard this patch.
lib/custom/setup/CustomerChangeAddressRefidParentidFosUser.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
 	 */
41 41 
 	public function getPostDependencies()
42 42 
 	{
43 
-		return array( 'TablesCreateFosUser' );
43 
+		return array('TablesCreateFosUser');
44 44 
 	}
45 45
46 46 
 
@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
 	 */
50 50 
 	protected function mysql()
51 51 
 	{
52 
-		$this->process( $this->mysql );
52 
+		$this->process($this->mysql);
53 53 
 	}
54 54
55 55 
 
@@ -58,22 +58,22 @@  discard block
 
 block discarded – undo
58 58 
 	 *
59 59 
 	 * array string $stmts List of SQL statements for changing the columns
60 60 
 	 */
61 
-	protected function process( array $stmts )
61 
+	protected function process(array $stmts)
62 62 
 	{
63 63 
 		$table = 'fos_user_address';
64 
-		$this->msg( sprintf( 'Rename "refid" to "parentid" in table "%1$s"', $table ), 0 ); $this->status( '' );
64 
+		$this->msg(sprintf('Rename "refid" to "parentid" in table "%1$s"', $table), 0); $this->status('');
65 65
66 
-		foreach( $stmts as $column => $stmts )
66 
+		foreach ($stmts as $column => $stmts)
67 67 
 		{
68 
-			$this->msg( sprintf( 'Checking column "%1$s"', $column ), 1 );
68 
+			$this->msg(sprintf('Checking column "%1$s"', $column), 1);
69 69
70 
-			if( $this->schema->tableExists( $table )
71 
-				&& $this->schema->columnExists( $table, $column ) === true
70 
+			if ($this->schema->tableExists($table)
71 
+				&& $this->schema->columnExists($table, $column) === true
72 72 
 			) {
73 
-				$this->executeList( $stmts );
74 
-				$this->status( 'done' );
73 
+				$this->executeList($stmts);
74 
+				$this->status('done');
75 75 
 			} else {
76 
-				$this->status( 'OK' );
76 
+				$this->status('OK');
77 77 
 			}
78 78 
 		}
79 79 
 	}
Please login to merge, or discard this patch.
lib/custom/setup/unittest/data/customer.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -5,16 +5,16 @@
 
 block discarded – undo
5 5 
  * @copyright Aimeos (aimeos.org), 2014-2016
6 6 
  */
7 7
8 
-return array (
8 
+return array(
9 9 
 	'customer' => array(
10 
-		'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' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
11 
-		'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' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
12 
-		'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' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
10 
+		'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' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
11 
+		'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' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0', 'password' =>  'test'),
12 
+		'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' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
13 13 
 	),
14 14 
 	'customer/address' => array(
15 
-		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' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0' ),
16 
-		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' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1' ),
17 
-		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' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1' ),
18 
-		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' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2' ),
15 
+		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' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0'),
16 
+		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' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1'),
17 
+		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' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1'),
18 
+		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' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2'),
19 19 
 	),
20 20 
 );
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Item/FosUser.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -33,10 +33,10 @@  discard block
 
 block discarded – undo
33 33 
 	 * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items
34 34 
 	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
35 35 
 	 */
36 
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, array $values = [], array $listItems = [],
37 
-		array $refItems = [], $salt = '', \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [] )
36 
+	public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address, array $values = [], array $listItems = [],
37 
+		array $refItems = [], $salt = '', \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [])
38 38 
 	{
39 
-		parent::__construct( $address, $values, $listItems, $refItems, $salt, $helper, $addresses );
39 
+		parent::__construct($address, $values, $listItems, $refItems, $salt, $helper, $addresses);
40 40
41 41 
 		$this->values = $values;
42 42 
 		$this->helper = $helper;
 
@@ -51,7 +51,7 @@  discard block
 
 block discarded – undo
51 51 
 	 */
52 52 
 	public function getPassword()
53 53 
 	{
54 
-		if( isset( $this->values['customer.password'] ) ) {
54 
+		if (isset($this->values['customer.password'])) {
55 55 
 			return (string) $this->values['customer.password'];
56 56 
 		}
57 57 
 
@@ -65,12 +65,12 @@  discard block
 
 block discarded – undo
65 65 
 	 * @param string $value Password of the customer item
66 66 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
67 67 
 	 */
68 
-	public function setPassword( $value )
68 
+	public function setPassword($value)
69 69 
 	{
70 
-		if( $value == $this->getPassword() ) { return $this; }
70 
+		if ($value == $this->getPassword()) { return $this; }
71 71
72 
-		if( $this->helper !== null ) {
73 
-			$value = $this->helper->encode( $value, $this->getSalt() );
72 
+		if ($this->helper !== null) {
73 
+			$value = $this->helper->encode($value, $this->getSalt());
74 74 
 		}
75 75
76 76 
 		$this->values['customer.password'] = (string) $value;
 
@@ -87,7 +87,7 @@  discard block
 
 block discarded – undo
87 87 
 	 */
88 88 
 	public function getRoles()
89 89 
 	{
90 
-		if( isset( $this->values['roles'] ) ) {
90 
+		if (isset($this->values['roles'])) {
91 91 
 			return (array) $this->values['roles'];
92 92 
 		}
93 93 
 
@@ -100,7 +100,7 @@  discard block
 
 block discarded – undo
100 100 
 	 *
101 101 
 	 * @param array $roles List of Symfony roles
102 102 
 	 */
103 
-	public function setRoles( array $roles )
103 
+	public function setRoles(array $roles)
104 104 
 	{
105 105 
 		$this->values['roles'] = $roles;
106 106 
 		$this->setModified();
 
@@ -116,7 +116,7 @@  discard block
 
 block discarded – undo
116 116 
 	 */
117 117 
 	public function getSalt()
118 118 
 	{
119 
-		if( isset( $this->values['salt'] ) ) {
119 
+		if (isset($this->values['salt'])) {
120 120 
 			return $this->values['salt'];
121 121 
 		}
122 122 
 
@@ -129,7 +129,7 @@  discard block
 
 block discarded – undo
129 129 
 	 *
130 130 
 	 * @param string $value Password salt
131 131 
 	 */
132 
-	public function setSalt( $value )
132 
+	public function setSalt($value)
133 133 
 	{
134 134 
 		$this->values['salt'] = (string) $value;
135 135 
 		$this->setModified();
Please login to merge, or discard this patch.
lib/custom/setup/unittest/data/customer-list.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -5,15 +5,15 @@
 
 block discarded – undo
5 5 
  * @copyright Aimeos (aimeos.org), 2014-2016
6 6 
  */
7 7
8 
-return array (
9 
-	'customer/lists/type' => array (
10 
-		'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
8 
+return array(
9 
+	'customer/lists/type' => array(
10 
+		'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
11 11 
 	),
12 12
13 
-	'customer/lists' => array (
14 
-		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 ),
15 
-		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 ),
16 
-		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 ),
17 
-		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 ),
13 
+	'customer/lists' => array(
14 
+		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),
15 
+		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),
16 
+		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),
17 
+		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),
18 18 
 	),
19 19 
 );
Please login to merge, or discard this patch.
lib/custom/setup/unittest/CustomerAddFosUserTestData.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
 	 */
22 22 
 	public function getPreDependencies()
23 23 
 	{
24 
-		return array( 'TablesCreateFosUser' );
24 
+		return array('TablesCreateFosUser');
25 25 
 	}
26 26
27 27 
 
@@ -31,38 +31,38 @@  discard block
 
 block discarded – undo
31 31 
 	public function migrate()
32 32 
 	{
33 33 
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
34 
-		if( !( $this->additional instanceof $iface ) ) {
35 
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
34 
+		if (!($this->additional instanceof $iface)) {
35 
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
36 36 
 		}
37 37
38 
-		$this->msg( 'Adding Fos user bundle customer test data', 0 );
38 
+		$this->msg('Adding Fos user bundle customer test data', 0);
39 39
40 40 
 		$parentIds = [];
41 41 
 		$ds = DIRECTORY_SEPARATOR;
42 
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
42 
+		$this->additional->setEditor('ai-fosuser:unittest');
43 43 
 		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
44 44
45 
-		if( ( $testdata = include( $path ) ) === false ){
46 
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
45 
+		if (($testdata = include($path)) === false) {
46 
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
47 47 
 		}
48 48
49 49
50 
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'FosUser' );
51 
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'FosUser' );
50 
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'FosUser');
51 
+		$customerAddressManager = $customerManager->getSubManager('address', 'FosUser');
52 52
53 53 
 		$search = $customerManager->createSearch();
54 
-		$search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
55 
-		$items = $customerManager->searchItems( $search );
54 
+		$search->setConditions($search->compare('==', 'customer.code', array('UTC001', 'UTC002', 'UTC003')));
55 
+		$items = $customerManager->searchItems($search);
56 56
57 57 
 		$this->conn->begin();
58 58
59 
-		$customerManager->deleteItems( array_keys( $items ) );
60 
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
61 
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
59 
+		$customerManager->deleteItems(array_keys($items));
60 
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
61 
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
62 62
63 63 
 		$this->conn->commit();
64 64
65 65
66 
-		$this->status( 'done' );
66 
+		$this->status('done');
67 67 
 	}
68 68 
 }
Please login to merge, or discard this patch.
lib/custom/setup/unittest/CustomerListAddFosUserTestData.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,7 @@  discard block
 
 block discarded – undo
22 22 
 	 */
23 23 
 	public function getPreDependencies()
24 24 
 	{
25 
-		return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData' );
25 
+		return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData');
26 26 
 	}
27 27
28 28 
 
@@ -32,29 +32,29 @@  discard block
 
 block discarded – undo
32 32 
 	public function migrate()
33 33 
 	{
34 34 
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
35 
-		if( !( $this->additional instanceof $iface ) ) {
36 
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
35 
+		if (!($this->additional instanceof $iface)) {
36 
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
37 37 
 		}
38 38
39 
-		$this->msg( 'Adding customer-list Fos user bundle test data', 0 );
40 
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
39 
+		$this->msg('Adding customer-list Fos user bundle test data', 0);
40 
+		$this->additional->setEditor('ai-fosuser:unittest');
41 41
42 42 
 		$ds = DIRECTORY_SEPARATOR;
43 
-		$path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php';
43 
+		$path = dirname(__FILE__) . $ds . 'data' . $ds . 'customer-list.php';
44 44
45 
-		if( ( $testdata = include( $path ) ) === false ){
46 
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) );
45 
+		if (($testdata = include($path)) === false) {
46 
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path));
47 47 
 		}
48 48
49 49 
 		$refKeys = [];
50 
-		foreach( $testdata['customer/lists'] as $dataset ) {
51 
-			$refKeys[ $dataset['domain'] ][] = $dataset['refid'];
50 
+		foreach ($testdata['customer/lists'] as $dataset) {
51 
+			$refKeys[$dataset['domain']][] = $dataset['refid'];
52 52 
 		}
53 53
54 54 
 		$refIds = [];
55 
-		$refIds['text'] = $this->getTextData( $refKeys['text'] );
56 
-		$this->addCustomerListData( $testdata, $refIds, 'FosUser' );
55 
+		$refIds['text'] = $this->getTextData($refKeys['text']);
56 
+		$this->addCustomerListData($testdata, $refIds, 'FosUser');
57 57
58 
-		$this->status( 'done' );
58 
+		$this->status('done');
59 59 
 	}
60 60 
 }
Please login to merge, or discard this patch.
lib/custom/setup/default/schema/customer.php 1 patch
Spacing   +148 added lines, -148 removed lines patch added patch discarded remove patch 
@@ -8,169 +8,169 @@
 
 block discarded – undo
8 8
9 9 
 return array(
10 10 
 	'table' => array(
11 
-		'fos_user' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
12 
-
13 
-			$table = $schema->createTable( 'fos_user' );
14 
-
15 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
16 
-			$table->addColumn( 'username', 'string', array( 'length' => 255 ) );
17 
-			$table->addColumn( 'username_canonical', 'string', array( 'length' => 255 ) );
18 
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
19 
-			$table->addColumn( 'email_canonical', 'string', array( 'length' => 255 ) );
20 
-			$table->addColumn( 'enabled', 'smallint', [] );
21 
-			$table->addColumn( 'salt', 'string', array( 'length' => 255 ) );
22 
-			$table->addColumn( 'password', 'string', array( 'length' => 255 ) );
23 
-			$table->addColumn( 'last_login', 'datetime', array( 'notnull' => false ) );
24 
-			$table->addColumn( 'locked', 'smallint', [] );
25 
-			$table->addColumn( 'expired', 'smallint', [] );
26 
-			$table->addColumn( 'expires_at', 'datetime', array( 'notnull' => false ) );
27 
-			$table->addColumn( 'confirmation_token', 'string', array( 'length' => 255, 'notnull' => false ) );
28 
-			$table->addColumn( 'password_requested_at', 'datetime', array( 'notnull' => false ) );
29 
-			$table->addColumn( 'roles', 'text', array( 'length' => 0x7fffffff, 'comment' => '(DC2Type:array)' ) );
30 
-			$table->addColumn( 'credentials_expired', 'smallint', [] );
31 
-			$table->addColumn( 'credentials_expire_at', 'datetime', array( 'notnull' => false ) );
32 
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) );
33 
-			$table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) );
34 
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) );
35 
-			$table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) );
36 
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) );
37 
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) );
38 
-			$table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) );
39 
-			$table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) );
40 
-			$table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) );
41 
-			$table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) );
42 
-			$table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) );
43 
-			$table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) );
44 
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
45 
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
46 
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32, 'default' => '' ) );
47 
-			$table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) );
48 
-			$table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) );
49 
-			$table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
50 
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
51 
-			$table->addColumn( 'birthday', 'date', array( 'notnull' => false ) );
52 
-			$table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
53 
-			$table->addColumn( 'mtime', 'datetime', array( 'notnull' => false ) );
54 
-			$table->addColumn( 'ctime', 'datetime', array( 'notnull' => false ) );
55 
-			$table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) );
56 
-
57 
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosus_id' );
58 
-			$table->addUniqueIndex( array( 'username_canonical' ), 'unq_fosus_username' );
59 
-			$table->addUniqueIndex( array( 'email_canonical' ), 'unq_fosus_email' );
60 
-			$table->addIndex( array( 'langid' ), 'idx_fosus_langid' );
61 
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosus_last_first' );
62 
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_fosus_post_addr1' );
63 
-			$table->addIndex( array( 'postal', 'city' ), 'idx_fosus_post_city' );
64 
-			$table->addIndex( array( 'lastname' ), 'idx_fosus_lastname' );
65 
-			$table->addIndex( array( 'address1' ), 'idx_fosus_address1' );
66 
-			$table->addIndex( array( 'city' ), 'idx_fosus_city' );
11 
+		'fos_user' => function(\Doctrine\DBAL\Schema\Schema $schema) {
12 
+
13 
+			$table = $schema->createTable('fos_user');
14 
+
15 
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
16 
+			$table->addColumn('username', 'string', array('length' => 255));
17 
+			$table->addColumn('username_canonical', 'string', array('length' => 255));
18 
+			$table->addColumn('email', 'string', array('length' => 255));
19 
+			$table->addColumn('email_canonical', 'string', array('length' => 255));
20 
+			$table->addColumn('enabled', 'smallint', []);
21 
+			$table->addColumn('salt', 'string', array('length' => 255));
22 
+			$table->addColumn('password', 'string', array('length' => 255));
23 
+			$table->addColumn('last_login', 'datetime', array('notnull' => false));
24 
+			$table->addColumn('locked', 'smallint', []);
25 
+			$table->addColumn('expired', 'smallint', []);
26 
+			$table->addColumn('expires_at', 'datetime', array('notnull' => false));
27 
+			$table->addColumn('confirmation_token', 'string', array('length' => 255, 'notnull' => false));
28 
+			$table->addColumn('password_requested_at', 'datetime', array('notnull' => false));
29 
+			$table->addColumn('roles', 'text', array('length' => 0x7fffffff, 'comment' => '(DC2Type:array)'));
30 
+			$table->addColumn('credentials_expired', 'smallint', []);
31 
+			$table->addColumn('credentials_expire_at', 'datetime', array('notnull' => false));
32 
+			$table->addColumn('salutation', 'string', array('length' => 8, 'default' => ''));
33 
+			$table->addColumn('company', 'string', array('length' => 100, 'default' => ''));
34 
+			$table->addColumn('vatid', 'string', array('length' => 32, 'default' => ''));
35 
+			$table->addColumn('title', 'string', array('length' => 64, 'default' => ''));
36 
+			$table->addColumn('firstname', 'string', array('length' => 64, 'default' => ''));
37 
+			$table->addColumn('lastname', 'string', array('length' => 64, 'default' => ''));
38 
+			$table->addColumn('address1', 'string', array('length' => 200, 'default' => ''));
39 
+			$table->addColumn('address2', 'string', array('length' => 200, 'default' => ''));
40 
+			$table->addColumn('address3', 'string', array('length' => 200, 'default' => ''));
41 
+			$table->addColumn('postal', 'string', array('length' => 16, 'default' => ''));
42 
+			$table->addColumn('city', 'string', array('length' => 200, 'default' => ''));
43 
+			$table->addColumn('state', 'string', array('length' => 200, 'default' => ''));
44 
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
45 
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
46 
+			$table->addColumn('telephone', 'string', array('length' => 32, 'default' => ''));
47 
+			$table->addColumn('telefax', 'string', array('length' => 32, 'default' => ''));
48 
+			$table->addColumn('website', 'string', array('length' => 255, 'default' => ''));
49 
+			$table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
50 
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
51 
+			$table->addColumn('birthday', 'date', array('notnull' => false));
52 
+			$table->addColumn('vdate', 'date', array('notnull' => false));
53 
+			$table->addColumn('mtime', 'datetime', array('notnull' => false));
54 
+			$table->addColumn('ctime', 'datetime', array('notnull' => false));
55 
+			$table->addColumn('editor', 'string', array('length' => 255, 'default' => ''));
56 
+
57 
+			$table->setPrimaryKey(array('id'), 'pk_fosus_id');
58 
+			$table->addUniqueIndex(array('username_canonical'), 'unq_fosus_username');
59 
+			$table->addUniqueIndex(array('email_canonical'), 'unq_fosus_email');
60 
+			$table->addIndex(array('langid'), 'idx_fosus_langid');
61 
+			$table->addIndex(array('lastname', 'firstname'), 'idx_fosus_last_first');
62 
+			$table->addIndex(array('postal', 'address1'), 'idx_fosus_post_addr1');
63 
+			$table->addIndex(array('postal', 'city'), 'idx_fosus_post_city');
64 
+			$table->addIndex(array('lastname'), 'idx_fosus_lastname');
65 
+			$table->addIndex(array('address1'), 'idx_fosus_address1');
66 
+			$table->addIndex(array('city'), 'idx_fosus_city');
67 67
68 68 
 			return $schema;
69 69 
 		},
70 70
71 
-		'fos_user_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
72 
-
73 
-			$table = $schema->createTable( 'fos_user_address' );
74 
-
75 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
76 
-			$table->addColumn( 'siteid', 'integer', [] );
77 
-			$table->addColumn( 'parentid', 'integer', [] );
78 
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
79 
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
80 
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
81 
-			$table->addColumn( 'title', 'string', array( 'length' => 64 ) );
82 
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
83 
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
84 
-			$table->addColumn( 'address1', 'string', array( 'length' => 200 ) );
85 
-			$table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
86 
-			$table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
87 
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
88 
-			$table->addColumn( 'city', 'string', array( 'length' => 200 ) );
89 
-			$table->addColumn( 'state', 'string', array( 'length' => 200 ) );
90 
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
91 
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
92 
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
93 
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
94 
-			$table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
95 
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
96 
-			$table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
97 
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
98 
-			$table->addColumn( 'flag', 'integer', [] );
99 
-			$table->addColumn( 'pos', 'smallint', [] );
100 
-			$table->addColumn( 'mtime', 'datetime', [] );
101 
-			$table->addColumn( 'ctime', 'datetime', [] );
102 
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
103 
-
104 
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosad_id' );
105 
-			$table->addIndex( array( 'parentid' ), 'idx_fosad_pid' );
106 
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosad_last_first' );
107 
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_fosad_post_addr1' );
108 
-			$table->addIndex( array( 'postal', 'city' ), 'idx_fosad_post_city' );
109 
-			$table->addIndex( array( 'address1' ), 'idx_fosad_address1' );
110 
-			$table->addIndex( array( 'city' ), 'idx_fosad_city' );
111 
-			$table->addIndex( array( 'email' ), 'idx_fosad_email' );
112 
-
113 
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
114 
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosad_pid' );
71 
+		'fos_user_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
72 
+
73 
+			$table = $schema->createTable('fos_user_address');
74 
+
75 
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
76 
+			$table->addColumn('siteid', 'integer', []);
77 
+			$table->addColumn('parentid', 'integer', []);
78 
+			$table->addColumn('company', 'string', array('length' => 100));
79 
+			$table->addColumn('vatid', 'string', array('length' => 32));
80 
+			$table->addColumn('salutation', 'string', array('length' => 8));
81 
+			$table->addColumn('title', 'string', array('length' => 64));
82 
+			$table->addColumn('firstname', 'string', array('length' => 64));
83 
+			$table->addColumn('lastname', 'string', array('length' => 64));
84 
+			$table->addColumn('address1', 'string', array('length' => 200));
85 
+			$table->addColumn('address2', 'string', array('length' => 200));
86 
+			$table->addColumn('address3', 'string', array('length' => 200));
87 
+			$table->addColumn('postal', 'string', array('length' => 16));
88 
+			$table->addColumn('city', 'string', array('length' => 200));
89 
+			$table->addColumn('state', 'string', array('length' => 200));
90 
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
91 
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
92 
+			$table->addColumn('telephone', 'string', array('length' => 32));
93 
+			$table->addColumn('email', 'string', array('length' => 255));
94 
+			$table->addColumn('telefax', 'string', array('length' => 255));
95 
+			$table->addColumn('website', 'string', array('length' => 255));
96 
+			$table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
97 
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
98 
+			$table->addColumn('flag', 'integer', []);
99 
+			$table->addColumn('pos', 'smallint', []);
100 
+			$table->addColumn('mtime', 'datetime', []);
101 
+			$table->addColumn('ctime', 'datetime', []);
102 
+			$table->addColumn('editor', 'string', array('length' => 255));
103 
+
104 
+			$table->setPrimaryKey(array('id'), 'pk_fosad_id');
105 
+			$table->addIndex(array('parentid'), 'idx_fosad_pid');
106 
+			$table->addIndex(array('lastname', 'firstname'), 'idx_fosad_last_first');
107 
+			$table->addIndex(array('postal', 'address1'), 'idx_fosad_post_addr1');
108 
+			$table->addIndex(array('postal', 'city'), 'idx_fosad_post_city');
109 
+			$table->addIndex(array('address1'), 'idx_fosad_address1');
110 
+			$table->addIndex(array('city'), 'idx_fosad_city');
111 
+			$table->addIndex(array('email'), 'idx_fosad_email');
112 
+
113 
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
114 
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosad_pid');
115 115
116 116 
 			return $schema;
117 117 
 		},
118 118
119 
-		'fos_user_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
119 
+		'fos_user_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
120 120
121 
-			$table = $schema->createTable( 'fos_user_list_type' );
121 
+			$table = $schema->createTable('fos_user_list_type');
122 122
123 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
124 
-			$table->addColumn( 'siteid', 'integer', [] );
125 
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
126 
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
127 
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
128 
-			$table->addColumn( 'status', 'smallint', [] );
129 
-			$table->addColumn( 'mtime', 'datetime', [] );
130 
-			$table->addColumn( 'ctime', 'datetime', [] );
131 
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
123 
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
124 
+			$table->addColumn('siteid', 'integer', []);
125 
+			$table->addColumn('domain', 'string', array('length' => 32));
126 
+			$table->addColumn('code', 'string', array('length' => 32));
127 
+			$table->addColumn('label', 'string', array('length' => 255));
128 
+			$table->addColumn('status', 'smallint', []);
129 
+			$table->addColumn('mtime', 'datetime', []);
130 
+			$table->addColumn('ctime', 'datetime', []);
131 
+			$table->addColumn('editor', 'string', array('length' => 255));
132 132
133 
-			$table->setPrimaryKey( array( 'id' ), 'pk_foslity_id' );
134 
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_foslity_sid_dom_code' );
135 
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_foslity_sid_status' );
136 
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_foslity_sid_label' );
137 
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_foslity_sid_code' );
133 
+			$table->setPrimaryKey(array('id'), 'pk_foslity_id');
134 
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_foslity_sid_dom_code');
135 
+			$table->addIndex(array('siteid', 'status'), 'idx_foslity_sid_status');
136 
+			$table->addIndex(array('siteid', 'label'), 'idx_foslity_sid_label');
137 
+			$table->addIndex(array('siteid', 'code'), 'idx_foslity_sid_code');
138 138
139 139 
 			return $schema;
140 140 
 		},
141 141
142 
-		'fos_user_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
143 
-
144 
-			$table = $schema->createTable( 'fos_user_list' );
145 
-
146 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
147 
-			$table->addColumn( 'parentid', 'integer', [] );
148 
-			$table->addColumn( 'siteid', 'integer', [] );
149 
-			$table->addColumn( 'typeid', 'integer', [] );
150 
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
151 
-			$table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
152 
-			$table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
153 
-			$table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
154 
-			$table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
155 
-			$table->addColumn( 'pos', 'integer', [] );
156 
-			$table->addColumn( 'status', 'smallint', [] );
157 
-			$table->addColumn( 'mtime', 'datetime', [] );
158 
-			$table->addColumn( 'ctime', 'datetime', [] );
159 
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
160 
-
161 
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosli_id' );
162 
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_fosli_sid_dm_rid_tid_pid' );
163 
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_fosli_sid_stat_start_end' );
164 
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_fosli_pid_sid_rid_dom_tid' );
165 
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_fosli_pid_sid_start' );
166 
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_fosli_pid_sid_end' );
167 
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_fosli_pid_sid_pos' );
168 
-
169 
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
170 
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_pid' );
171 
-
172 
-			$table->addForeignKeyConstraint( 'fos_user_list_type', array( 'typeid' ), array( 'id' ),
173 
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_typeid' );
142 
+		'fos_user_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
143 
+
144 
+			$table = $schema->createTable('fos_user_list');
145 
+
146 
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
147 
+			$table->addColumn('parentid', 'integer', []);
148 
+			$table->addColumn('siteid', 'integer', []);
149 
+			$table->addColumn('typeid', 'integer', []);
150 
+			$table->addColumn('domain', 'string', array('length' => 32));
151 
+			$table->addColumn('refid', 'string', array('length' => 32));
152 
+			$table->addColumn('start', 'datetime', array('notnull' => false));
153 
+			$table->addColumn('end', 'datetime', array('notnull' => false));
154 
+			$table->addColumn('config', 'text', array('length' => 0xffff));
155 
+			$table->addColumn('pos', 'integer', []);
156 
+			$table->addColumn('status', 'smallint', []);
157 
+			$table->addColumn('mtime', 'datetime', []);
158 
+			$table->addColumn('ctime', 'datetime', []);
159 
+			$table->addColumn('editor', 'string', array('length' => 255));
160 
+
161 
+			$table->setPrimaryKey(array('id'), 'pk_fosli_id');
162 
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_fosli_sid_dm_rid_tid_pid');
163 
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_fosli_sid_stat_start_end');
164 
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_fosli_pid_sid_rid_dom_tid');
165 
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_fosli_pid_sid_start');
166 
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_fosli_pid_sid_end');
167 
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_fosli_pid_sid_pos');
168 
+
169 
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
170 
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_pid');
171 
+
172 
+			$table->addForeignKeyConstraint('fos_user_list_type', array('typeid'), array('id'),
173 
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_typeid');
174 174
175 175 
 			return $schema;
176 176 
 		},
Please login to merge, or discard this patch.