aimeos / ai-ezpublish

manifest.php

Indentation +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'name' => 'ai-ezpublish',
-	'depends' => array(
-		'aimeos-core',
-	),
-	'include' => array(
-		'lib/custom/src',
-	),
-	'config' => array(
-		'lib/custom/config',
-	),
-	'setup' => array(
-		'lib/custom/setup',
-	),
+    'name' => 'ai-ezpublish',
+    'depends' => array(
+        'aimeos-core',
+    ),
+    'include' => array(
+        'lib/custom/src',
+    ),
+    'config' => array(
+        'lib/custom/config',
+    ),
+    'setup' => array(
+        'lib/custom/setup',
+    ),
 );

lib/custom/config/mshop/customer/manager/address/ezpublish.php

Indentation +24 added lines, -24 removed lines

@@ -6,14 +6,14 @@ 
  */
 
 return array(
-	'delete' => array(
-		'ansi' => '
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser_address"
 			WHERE :cond
 		',
-	),
-	'insert' => array(
-		'ansi' => '
+    ),
+    'insert' => array(
+        'ansi' => '
 			INSERT INTO "ezuser_address" (
 				"siteid", "parentid", "company", "vatid", "salutation", "title",
 				"firstname", "lastname", "address1", "address2", "address3",
@@ -24,9 +24,9 @@ 
 				?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?
 			)
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser_address"
 			SET "siteid" = ?, "parentid" = ?, "company" = ?, "vatid" = ?, "salutation" = ?,
 				"title" = ?, "firstname" = ?, "lastname" = ?, "address1" = ?,
@@ -36,9 +36,9 @@ 
 				"pos" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT DISTINCT ezuad."id" AS "customer.address.id", ezuad."parentid" AS "customer.address.parentid",
 				ezuad."company" AS "customer.address.company", ezuad."vatid" AS "customer.address.vatid",
 				ezuad."salutation" AS "customer.address.salutation", ezuad."title" AS "customer.address.title",
@@ -58,9 +58,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezuad."id"
@@ -70,14 +70,14 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		',
-	),
-	'newid' => array(
-		'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
-		'mysql' => 'SELECT LAST_INSERT_ID()',
-		'oracle' => 'SELECT ezuser_address.CURRVAL FROM DUAL',
-		'pgsql' => 'SELECT lastval()',
-		'sqlite' => 'SELECT last_insert_rowid()',
-		'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
-		'sqlanywhere' => 'SELECT @@IDENTITY',
-	),
+    ),
+    'newid' => array(
+        'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
+        'mysql' => 'SELECT LAST_INSERT_ID()',
+        'oracle' => 'SELECT ezuser_address.CURRVAL FROM DUAL',
+        'pgsql' => 'SELECT lastval()',
+        'sqlite' => 'SELECT last_insert_rowid()',
+        'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
+        'sqlanywhere' => 'SELECT @@IDENTITY',
+    ),
 );

lib/custom/config/mshop/customer/manager/lists/ezpublish.php

Indentation +36 added lines, -36 removed lines

@@ -6,8 +6,8 @@ 
  */
 
 return array(
-	'aggregate' => array(
-		'ansi' => '
+    'aggregate' => array(
+        'ansi' => '
 			SELECT "key", COUNT(DISTINCT "id") AS "count"
 			FROM (
 				SELECT :key AS "key", ezuli."id" AS "id"
@@ -19,9 +19,9 @@ 
 			) AS list
 			GROUP BY "key"
 		',
-	),
-	'getposmax' => array(
-		'ansi' => '
+    ),
+    'getposmax' => array(
+        'ansi' => '
 			SELECT MAX( "pos" ) AS pos
 			FROM "ezuser_list"
 			WHERE "siteid" = ?
@@ -29,37 +29,37 @@ 
 				AND "typeid" = ?
 				AND "domain" = ?
 		',
-	),
-	'insert' => array(
-		'ansi' => '
+    ),
+    'insert' => array(
+        'ansi' => '
 			INSERT INTO "ezuser_list"( "parentid", "siteid", "typeid", "domain", "refid", "start", "end",
 			"config", "pos", "status", "mtime", "editor", "ctime" )
 			VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser_list"
 			SET "parentid"=?, "siteid" = ?, "typeid" = ?, "domain" = ?, "refid" = ?, "start" = ?, "end" = ?,
 				"config" = ?, "pos" = ?, "status" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'updatepos' => array(
-		'ansi' => '
+    ),
+    'updatepos' => array(
+        'ansi' => '
 			UPDATE "ezuser_list"
 				SET "pos" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'delete' => array(
-		'ansi' => '
+    ),
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser_list"
 			WHERE :cond AND siteid = ?
 		',
-	),
-	'move' => array(
-		'ansi' => '
+    ),
+    'move' => array(
+        'ansi' => '
 			UPDATE "ezuser_list"
 				SET "pos" = "pos" + ?, "mtime" = ?, "editor" = ?
 			WHERE "siteid" = ?
@@ -68,9 +68,9 @@ 
 				AND "domain" = ?
 				AND "pos" >= ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT ezuli."id" AS "customer.lists.id", ezuli."siteid" AS "customer.lists.siteid",
 				ezuli."parentid" AS "customer.lists.parentid", ezuli."typeid" AS "customer.lists.typeid",
 				ezuli."domain" AS "customer.lists.domain", ezuli."refid" AS "customer.lists.refid",
@@ -84,9 +84,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezuli."id"
@@ -96,14 +96,14 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		',
-	),
-	'newid' => array(
-		'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
-		'mysql' => 'SELECT LAST_INSERT_ID()',
-		'oracle' => 'SELECT ezuser_list.CURRVAL FROM DUAL',
-		'pgsql' => 'SELECT lastval()',
-		'sqlite' => 'SELECT last_insert_rowid()',
-		'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
-		'sqlanywhere' => 'SELECT @@IDENTITY',
-	),
+    ),
+    'newid' => array(
+        'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
+        'mysql' => 'SELECT LAST_INSERT_ID()',
+        'oracle' => 'SELECT ezuser_list.CURRVAL FROM DUAL',
+        'pgsql' => 'SELECT lastval()',
+        'sqlite' => 'SELECT last_insert_rowid()',
+        'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
+        'sqlanywhere' => 'SELECT @@IDENTITY',
+    ),
 );

lib/custom/config/mshop/customer/manager/lists/type/ezpublish.php

Indentation +24 added lines, -24 removed lines

@@ -6,28 +6,28 @@ 
  */
 
 return array(
-	'insert' => array(
-		'ansi' => '
+    'insert' => array(
+        'ansi' => '
 			INSERT INTO "ezuser_list_type"( "siteid", "code", "domain", "label", "status",
 				"mtime", "editor", "ctime" )
 			VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser_list_type"
 			SET "siteid"=?, "code" = ?, "domain" = ?, "label" = ?, "status" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'delete' => array(
-		'ansi' => '
+    ),
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser_list_type"
 			WHERE :cond AND siteid = ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT ezulity."id" AS "customer.lists.type.id", ezulity."siteid" AS "customer.lists.type.siteid",
 				ezulity."code" AS "customer.lists.type.code", ezulity."domain" AS "customer.lists.type.domain",
 				ezulity."label" AS "customer.lists.type.label", ezulity."status" AS "customer.lists.type.status",
@@ -40,9 +40,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezulity."id"
@@ -52,14 +52,14 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS LIST
 		',
-	),
-	'newid' => array(
-		'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
-		'mysql' => 'SELECT LAST_INSERT_ID()',
-		'oracle' => 'SELECT ezuser_list_type.CURRVAL FROM DUAL',
-		'pgsql' => 'SELECT lastval()',
-		'sqlite' => 'SELECT last_insert_rowid()',
-		'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
-		'sqlanywhere' => 'SELECT @@IDENTITY',
-	),
+    ),
+    'newid' => array(
+        'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
+        'mysql' => 'SELECT LAST_INSERT_ID()',
+        'oracle' => 'SELECT ezuser_list_type.CURRVAL FROM DUAL',
+        'pgsql' => 'SELECT lastval()',
+        'sqlite' => 'SELECT last_insert_rowid()',
+        'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
+        'sqlanywhere' => 'SELECT @@IDENTITY',
+    ),
 );

lib/custom/tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -4,17 +4,17 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', true );
+ini_set('display_errors', true);
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_TIME, 'POSIX');
 
 
 require_once 'TestHelper.php';

lib/custom/setup/EzuserAddAddress.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 		{
 			$this->executeList( $sql, 'db-customer' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}

Spacing +50 added lines, -50 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateEzpublish' );
+		return array('TablesCreateEzpublish');
 	}
 
 
@@ -30,12 +30,12 @@ 
 	 */
 	public function migrate()
 	{
-		$this->msg( 'Adding address fields to ezuser table', 0 );
+		$this->msg('Adding address fields to ezuser table', 0);
 
-		$dbal = $this->getConnection( 'db-customer' )->getRawObject();
+		$dbal = $this->getConnection('db-customer')->getRawObject();
 
-		if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
-			throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
+		if (!($dbal instanceof \Doctrine\DBAL\Connection)) {
+			throw new \Aimeos\MW\Setup\Exception('Not a DBAL connection');
 		}
 
 
@@ -43,17 +43,17 @@ 
 		$comparator = new \Doctrine\DBAL\Schema\Comparator();
 		$toSchema = clone $fromSchema;
 
-		$this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
-		$sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
+		$this->addIndexes($this->addColumns($toSchema->getTable('ezuser')));
+		$sql = $fromSchema->getMigrateToSql($toSchema, $dbal->getDatabasePlatform());
 
-		if( $sql !== array() )
+		if ($sql !== array())
 		{
-			$this->executeList( $sql, 'db-customer' );
-			$this->status( 'done' );
+			$this->executeList($sql, 'db-customer');
+			$this->status('done');
 		}
 		else
 		{
-			$this->status( 'OK' );
+			$this->status('OK');
 		}
 	}
 
@@ -64,38 +64,38 @@ 
 	 * @param \Doctrine\DBAL\Schema\Table $table Table object
 	 * @return \Doctrine\DBAL\Schema\Table Updated table object
 	 */
-	protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
+	protected function addColumns(\Doctrine\DBAL\Schema\Table $table)
 	{
 		$columns = array(
-			'company' => array( 'string', array( 'length' => 100 ) ),
-			'vatid' => array( 'string', array( 'length' => 32 ) ),
-			'salutation' => array( 'string', array( 'length' => 8 ) ),
-			'title' => array( 'string', array( 'length' => 64 ) ),
-			'firstname' => array( 'string', array( 'length' => 64 ) ),
-			'lastname' => array( 'string', array( 'length' => 64 ) ),
-			'address1' => array( 'string', array( 'length' => 255 ) ),
-			'address2' => array( 'string', array( 'length' => 255 ) ),
-			'address3' => array( 'string', array( 'length' => 255 ) ),
-			'postal' => array( 'string', array( 'length' => 16 ) ),
-			'city' => array( 'string', array( 'length' => 255 ) ),
-			'state' => array( 'string', array( 'length' => 255 ) ),
-			'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
-			'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
-			'telephone' => array( 'string', array( 'length' => 32 ) ),
-			'telefax' => array( 'string', array( 'length' => 32 ) ),
-			'website' => array( 'string', array( 'length' => 255 ) ),
-			'birthday' => array( 'date', array( 'notnull' => false ) ),
-			'vdate' => array( 'date', array( 'notnull' => false ) ),
-			'status' => array( 'smallint', array() ),
-			'mtime' => array( 'datetime', array() ),
-			'ctime' => array( 'datetime', array() ),
-			'editor' => array( 'string', array( 'length' => 255 ) ),
+			'company' => array('string', array('length' => 100)),
+			'vatid' => array('string', array('length' => 32)),
+			'salutation' => array('string', array('length' => 8)),
+			'title' => array('string', array('length' => 64)),
+			'firstname' => array('string', array('length' => 64)),
+			'lastname' => array('string', array('length' => 64)),
+			'address1' => array('string', array('length' => 255)),
+			'address2' => array('string', array('length' => 255)),
+			'address3' => array('string', array('length' => 255)),
+			'postal' => array('string', array('length' => 16)),
+			'city' => array('string', array('length' => 255)),
+			'state' => array('string', array('length' => 255)),
+			'langid' => array('string', array('length' => 5, 'notnull' => false)),
+			'countryid' => array('string', array('length' => 2, 'notnull' => false, 'fixed' => true)),
+			'telephone' => array('string', array('length' => 32)),
+			'telefax' => array('string', array('length' => 32)),
+			'website' => array('string', array('length' => 255)),
+			'birthday' => array('date', array('notnull' => false)),
+			'vdate' => array('date', array('notnull' => false)),
+			'status' => array('smallint', array()),
+			'mtime' => array('datetime', array()),
+			'ctime' => array('datetime', array()),
+			'editor' => array('string', array('length' => 255)),
 		);
 
-		foreach( $columns as $name => $def )
+		foreach ($columns as $name => $def)
 		{
-			if( $table->hasColumn( $name ) === false ) {
-				$table->addColumn( $name, $def[0], $def[1] );
+			if ($table->hasColumn($name) === false) {
+				$table->addColumn($name, $def[0], $def[1]);
 			}
 		}
 
@@ -109,23 +109,23 @@ 
 	 * @param \Doctrine\DBAL\Schema\Table $table Table object
 	 * @return \Doctrine\DBAL\Schema\Table Updated table object
 	 */
-	protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
+	protected function addIndexes(\Doctrine\DBAL\Schema\Table $table)
 	{
 		$indexes = array(
-			'idx_ezpus_langid' => array( 'langid' ),
-			'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
-			'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
-			'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
-			'idx_ezpus_lastname' => array( 'lastname' ),
-			'idx_ezpus_address1' => array( 'address1' ),
-			'idx_ezpus_postal' => array( 'postal' ),
-			'idx_ezpus_city' => array( 'city' ),
+			'idx_ezpus_langid' => array('langid'),
+			'idx_ezpus_status_ln_fn' => array('status', 'lastname', 'firstname'),
+			'idx_ezpus_status_ad1_ad2' => array('status', 'address1', 'address2'),
+			'idx_ezpus_status_postal_city' => array('status', 'postal', 'city'),
+			'idx_ezpus_lastname' => array('lastname'),
+			'idx_ezpus_address1' => array('address1'),
+			'idx_ezpus_postal' => array('postal'),
+			'idx_ezpus_city' => array('city'),
 		);
 
-		foreach( $indexes as $name => $def )
+		foreach ($indexes as $name => $def)
 		{
-			if( $table->hasIndex( $name ) === false ) {
-				$table->addIndex( $def, $name );
+			if ($table->hasIndex($name) === false) {
+				$table->addIndex($def, $name);
 			}
 		}
 

Indentation +116 added lines, -116 removed lines

@@ -14,120 +14,120 @@
  */
 class EzuserAddAddress extends \Aimeos\MW\Setup\Task\TablesCreateMShop
 {
-	/**
-	 * Returns the list of task names which depends on this task.
-	 *
-	 * @return array List of task names
-	 */
-	public function getPreDependencies()
-	{
-		return array( 'TablesCreateEzpublish' );
-	}
-
-
-	/**
-	 * Migrate database schema
-	 */
-	public function migrate()
-	{
-		$this->msg( 'Adding address fields to ezuser table', 0 );
-
-		$dbal = $this->getConnection( 'db-customer' )->getRawObject();
-
-		if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
-			throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
-		}
-
-
-		$fromSchema = $dbal->getSchemaManager()->createSchema();
-		$toSchema = clone $fromSchema;
-
-		$this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
-		$sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
-
-		if( $sql !== array() )
-		{
-			$this->executeList( $sql, 'db-customer' );
-			$this->status( 'done' );
-		}
-		else
-		{
-			$this->status( 'OK' );
-		}
-	}
-
-
-	/**
-	 * Adds the missing columns to the table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table Table object
-	 * @return \Doctrine\DBAL\Schema\Table Updated table object
-	 */
-	protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
-	{
-		$columns = array(
-			'company' => array( 'string', array( 'length' => 100 ) ),
-			'vatid' => array( 'string', array( 'length' => 32 ) ),
-			'salutation' => array( 'string', array( 'length' => 8 ) ),
-			'title' => array( 'string', array( 'length' => 64 ) ),
-			'firstname' => array( 'string', array( 'length' => 64 ) ),
-			'lastname' => array( 'string', array( 'length' => 64 ) ),
-			'address1' => array( 'string', array( 'length' => 255 ) ),
-			'address2' => array( 'string', array( 'length' => 255 ) ),
-			'address3' => array( 'string', array( 'length' => 255 ) ),
-			'postal' => array( 'string', array( 'length' => 16 ) ),
-			'city' => array( 'string', array( 'length' => 255 ) ),
-			'state' => array( 'string', array( 'length' => 255 ) ),
-			'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
-			'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
-			'telephone' => array( 'string', array( 'length' => 32 ) ),
-			'telefax' => array( 'string', array( 'length' => 32 ) ),
-			'website' => array( 'string', array( 'length' => 255 ) ),
-			'birthday' => array( 'date', array( 'notnull' => false ) ),
-			'vdate' => array( 'date', array( 'notnull' => false ) ),
-			'status' => array( 'smallint', array() ),
-			'mtime' => array( 'datetime', array() ),
-			'ctime' => array( 'datetime', array() ),
-			'editor' => array( 'string', array( 'length' => 255 ) ),
-		);
-
-		foreach( $columns as $name => $def )
-		{
-			if( $table->hasColumn( $name ) === false ) {
-				$table->addColumn( $name, $def[0], $def[1] );
-			}
-		}
-
-		return $table;
-	}
-
-
-	/**
-	 * Adds the missing indexes to the table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table Table object
-	 * @return \Doctrine\DBAL\Schema\Table Updated table object
-	 */
-	protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
-	{
-		$indexes = array(
-			'idx_ezpus_langid' => array( 'langid' ),
-			'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
-			'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
-			'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
-			'idx_ezpus_lastname' => array( 'lastname' ),
-			'idx_ezpus_address1' => array( 'address1' ),
-			'idx_ezpus_postal' => array( 'postal' ),
-			'idx_ezpus_city' => array( 'city' ),
-		);
-
-		foreach( $indexes as $name => $def )
-		{
-			if( $table->hasIndex( $name ) === false ) {
-				$table->addIndex( $def, $name );
-			}
-		}
-
-		return $table;
-	}
+    /**
+     * Returns the list of task names which depends on this task.
+     *
+     * @return array List of task names
+     */
+    public function getPreDependencies()
+    {
+        return array( 'TablesCreateEzpublish' );
+    }
+
+
+    /**
+     * Migrate database schema
+     */
+    public function migrate()
+    {
+        $this->msg( 'Adding address fields to ezuser table', 0 );
+
+        $dbal = $this->getConnection( 'db-customer' )->getRawObject();
+
+        if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
+            throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
+        }
+
+
+        $fromSchema = $dbal->getSchemaManager()->createSchema();
+        $toSchema = clone $fromSchema;
+
+        $this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
+        $sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
+
+        if( $sql !== array() )
+        {
+            $this->executeList( $sql, 'db-customer' );
+            $this->status( 'done' );
+        }
+        else
+        {
+            $this->status( 'OK' );
+        }
+    }
+
+
+    /**
+     * Adds the missing columns to the table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table Table object
+     * @return \Doctrine\DBAL\Schema\Table Updated table object
+     */
+    protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
+    {
+        $columns = array(
+            'company' => array( 'string', array( 'length' => 100 ) ),
+            'vatid' => array( 'string', array( 'length' => 32 ) ),
+            'salutation' => array( 'string', array( 'length' => 8 ) ),
+            'title' => array( 'string', array( 'length' => 64 ) ),
+            'firstname' => array( 'string', array( 'length' => 64 ) ),
+            'lastname' => array( 'string', array( 'length' => 64 ) ),
+            'address1' => array( 'string', array( 'length' => 255 ) ),
+            'address2' => array( 'string', array( 'length' => 255 ) ),
+            'address3' => array( 'string', array( 'length' => 255 ) ),
+            'postal' => array( 'string', array( 'length' => 16 ) ),
+            'city' => array( 'string', array( 'length' => 255 ) ),
+            'state' => array( 'string', array( 'length' => 255 ) ),
+            'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
+            'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
+            'telephone' => array( 'string', array( 'length' => 32 ) ),
+            'telefax' => array( 'string', array( 'length' => 32 ) ),
+            'website' => array( 'string', array( 'length' => 255 ) ),
+            'birthday' => array( 'date', array( 'notnull' => false ) ),
+            'vdate' => array( 'date', array( 'notnull' => false ) ),
+            'status' => array( 'smallint', array() ),
+            'mtime' => array( 'datetime', array() ),
+            'ctime' => array( 'datetime', array() ),
+            'editor' => array( 'string', array( 'length' => 255 ) ),
+        );
+
+        foreach( $columns as $name => $def )
+        {
+            if( $table->hasColumn( $name ) === false ) {
+                $table->addColumn( $name, $def[0], $def[1] );
+            }
+        }
+
+        return $table;
+    }
+
+
+    /**
+     * Adds the missing indexes to the table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table Table object
+     * @return \Doctrine\DBAL\Schema\Table Updated table object
+     */
+    protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
+    {
+        $indexes = array(
+            'idx_ezpus_langid' => array( 'langid' ),
+            'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
+            'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
+            'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
+            'idx_ezpus_lastname' => array( 'lastname' ),
+            'idx_ezpus_address1' => array( 'address1' ),
+            'idx_ezpus_postal' => array( 'postal' ),
+            'idx_ezpus_city' => array( 'city' ),
+        );
+
+        foreach( $indexes as $name => $def )
+        {
+            if( $table->hasIndex( $name ) === false ) {
+                $table->addIndex( $def, $name );
+            }
+        }
+
+        return $table;
+    }
 }

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

Indentation +121 added lines, -121 removed lines

@@ -7,125 +7,125 @@
 
 
 return array(
-	'table' => array(
-		'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser' );
-
-			$table->addColumn( 'contentobject_id', 'integer', array() );
-			$table->addColumn( 'email', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) );
-			$table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) );
-
-			$table->setPrimaryKey( array( 'contentobject_id' ) );
-			$table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' );
-
-			return $schema;
-		},
-
-		'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$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' => 255 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 255 ) );
-			$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( 'flag', 'integer', array() );
-			$table->addColumn( 'pos', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' );
-			$table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' );
-			$table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' );
-			$table->addIndex( array( 'city' ), 'idx_ezpad_city' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' );
-
-			return $schema;
-		},
-
-		'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_list_type' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' );
-
-			return $schema;
-		},
-
-		'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'typeid', 'integer', array() );
-			$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', array() );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' );
-
-			$table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' );
-
-			return $schema;
-		},
-	),
+    'table' => array(
+        'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser' );
+
+            $table->addColumn( 'contentobject_id', 'integer', array() );
+            $table->addColumn( 'email', 'string', array( 'length' => 150 ) );
+            $table->addColumn( 'login', 'string', array( 'length' => 150 ) );
+            $table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) );
+            $table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) );
+            $table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) );
+
+            $table->setPrimaryKey( array( 'contentobject_id' ) );
+            $table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' );
+
+            return $schema;
+        },
+
+        'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser_address' );
+
+            $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
+            $table->addColumn( 'siteid', 'integer', array() );
+            $table->addColumn( 'parentid', 'integer', array() );
+            $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' => 255 ) );
+            $table->addColumn( 'address2', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'address3', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
+            $table->addColumn( 'city', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'state', 'string', array( 'length' => 255 ) );
+            $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( 'flag', 'integer', array() );
+            $table->addColumn( 'pos', 'smallint', array() );
+            $table->addColumn( 'mtime', 'datetime', array() );
+            $table->addColumn( 'ctime', 'datetime', array() );
+            $table->addColumn( 'editor', 'string', array('length' => 255 ) );
+
+            $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' );
+            $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' );
+            $table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' );
+            $table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' );
+            $table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' );
+            $table->addIndex( array( 'city' ), 'idx_ezpad_city' );
+
+            $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
+                array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' );
+
+            return $schema;
+        },
+
+        'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser_list_type' );
+
+            $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
+            $table->addColumn( 'siteid', 'integer', array() );
+            $table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'code', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'label', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'status', 'smallint', array() );
+            $table->addColumn( 'mtime', 'datetime', array() );
+            $table->addColumn( 'ctime', 'datetime', array() );
+            $table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+
+            $table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' );
+            $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' );
+            $table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' );
+            $table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' );
+            $table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' );
+
+            return $schema;
+        },
+
+        'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser_list' );
+
+            $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
+            $table->addColumn( 'parentid', 'integer', array() );
+            $table->addColumn( 'siteid', 'integer', array() );
+            $table->addColumn( 'typeid', 'integer', array() );
+            $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', array() );
+            $table->addColumn( 'status', 'smallint', array() );
+            $table->addColumn( 'mtime', 'datetime', array() );
+            $table->addColumn( 'ctime', 'datetime', array() );
+            $table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+
+            $table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' );
+            $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' );
+            $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' );
+            $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' );
+            $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' );
+            $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' );
+            $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' );
+
+            $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
+                array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' );
+
+            $table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ),
+                array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' );
+
+            return $schema;
+        },
+    ),
 );

Spacing +98 added lines, -98 removed lines

@@ -8,122 +8,122 @@
 
 return array(
 	'table' => array(
-		'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'ezuser' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'ezuser' );
+			$table = $schema->createTable('ezuser');
 
-			$table->addColumn( 'contentobject_id', 'integer', array() );
-			$table->addColumn( 'email', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) );
-			$table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) );
+			$table->addColumn('contentobject_id', 'integer', array());
+			$table->addColumn('email', 'string', array('length' => 150));
+			$table->addColumn('login', 'string', array('length' => 150));
+			$table->addColumn('login_normalized', 'string', array('length' => 150));
+			$table->addColumn('password_hash', 'string', array('length' => 50));
+			$table->addColumn('password_hash_type', 'integer', array('default' => 1));
 
-			$table->setPrimaryKey( array( 'contentobject_id' ) );
-			$table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' );
+			$table->setPrimaryKey(array('contentobject_id'));
+			$table->addUniqueIndex(array('login_normalized'), 'ezuser_login');
 
 			return $schema;
 		},
 
-		'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$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' => 255 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 255 ) );
-			$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( 'flag', 'integer', array() );
-			$table->addColumn( 'pos', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' );
-			$table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' );
-			$table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' );
-			$table->addIndex( array( 'city' ), 'idx_ezpad_city' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' );
+		'ezuser_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('ezuser_address');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', array());
+			$table->addColumn('parentid', 'integer', array());
+			$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' => 255));
+			$table->addColumn('address2', 'string', array('length' => 255));
+			$table->addColumn('address3', 'string', array('length' => 255));
+			$table->addColumn('postal', 'string', array('length' => 16));
+			$table->addColumn('city', 'string', array('length' => 255));
+			$table->addColumn('state', 'string', array('length' => 255));
+			$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('flag', 'integer', array());
+			$table->addColumn('pos', 'smallint', array());
+			$table->addColumn('mtime', 'datetime', array());
+			$table->addColumn('ctime', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_ezpad_id');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_ezpad_ln_fn');
+			$table->addIndex(array('address1', 'address2'), 'idx_ezpad_ad1_ad2');
+			$table->addIndex(array('postal', 'city'), 'idx_ezpad_post_ci');
+			$table->addIndex(array('parentid'), 'idx_ezpad_pid');
+			$table->addIndex(array('city'), 'idx_ezpad_city');
+
+			$table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpad_pid');
 
 			return $schema;
 		},
 
-		'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'ezuser_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'ezuser_list_type' );
+			$table = $schema->createTable('ezuser_list_type');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', array());
+			$table->addColumn('domain', 'string', array('length' => 32));
+			$table->addColumn('code', 'string', array('length' => 32));
+			$table->addColumn('label', 'string', array('length' => 255));
+			$table->addColumn('status', 'smallint', array());
+			$table->addColumn('mtime', 'datetime', array());
+			$table->addColumn('ctime', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_ezplity_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_ezplity_sid_dom_code');
+			$table->addIndex(array('siteid', 'status'), 'idx_ezplity_sid_status');
+			$table->addIndex(array('siteid', 'label'), 'idx_ezplity_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_ezplity_sid_code');
 
 			return $schema;
 		},
 
-		'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'typeid', 'integer', array() );
-			$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', array() );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' );
-
-			$table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' );
+		'ezuser_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('ezuser_list');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('parentid', 'integer', array());
+			$table->addColumn('siteid', 'integer', array());
+			$table->addColumn('typeid', 'integer', array());
+			$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', array());
+			$table->addColumn('status', 'smallint', array());
+			$table->addColumn('mtime', 'datetime', array());
+			$table->addColumn('ctime', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_ezpli_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_ezpli_sid_dm_rid_tid_pid');
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_ezpli_sid_stat_start_end');
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_ezpli_pid_sid_rid_dom_tid');
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_ezpli_pid_sid_start');
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_ezpli_pid_sid_end');
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_ezpli_pid_sid_pos');
+
+			$table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_pid');
+
+			$table->addForeignKeyConstraint('ezuser_list_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_typeid');
 
 			return $schema;
 		},

lib/custom/setup/TablesCreateEzpublish.php

Indentation +27 added lines, -27 removed lines

@@ -14,31 +14,31 @@
  */
 class TablesCreateEzpublish extends \Aimeos\MW\Setup\Task\TablesCreateMShop
 {
-	/**
-	 * Returns the list of task names which depends on this task.
-	 *
-	 * @return array List of task names
-	 */
-	public function getPostDependencies()
-	{
-		return array( 'MShopAddTypeData' );
-	}
-
-
-	/**
-	 * Migrate database schema
-	 */
-	public function migrate()
-	{
-		$this->msg( 'Creating Aimeos ezPublish tables', 0 );
-		$this->status( '' );
-
-		$ds = DIRECTORY_SEPARATOR;
-
-		$files = array(
-			'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
-		);
-
-		$this->setupSchema( $files );
-	}
+    /**
+     * Returns the list of task names which depends on this task.
+     *
+     * @return array List of task names
+     */
+    public function getPostDependencies()
+    {
+        return array( 'MShopAddTypeData' );
+    }
+
+
+    /**
+     * Migrate database schema
+     */
+    public function migrate()
+    {
+        $this->msg( 'Creating Aimeos ezPublish tables', 0 );
+        $this->status( '' );
+
+        $ds = DIRECTORY_SEPARATOR;
+
+        $files = array(
+            'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
+        );
+
+        $this->setupSchema( $files );
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPostDependencies()
 	{
-		return array( 'MShopAddTypeData' );
+		return array('MShopAddTypeData');
 	}
 
 
@@ -30,15 +30,15 @@ 
 	 */
 	public function migrate()
 	{
-		$this->msg( 'Creating Aimeos ezPublish tables', 0 );
-		$this->status( '' );
+		$this->msg('Creating Aimeos ezPublish tables', 0);
+		$this->status('');
 
 		$ds = DIRECTORY_SEPARATOR;
 
 		$files = array(
-			'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
+			'db-customer' => __DIR__.$ds.'default'.$ds.'schema'.$ds.'customer.php',
 		);
 
-		$this->setupSchema( $files );
+		$this->setupSchema($files);
 	}
 }

lib/custom/config/mshop/customer/manager/group/ezpublish.php

Indentation +9 added lines, -9 removed lines

@@ -6,16 +6,16 @@ 
  */
 
 return array(
-	'groups' => array(
-		'ansi' => '
+    'groups' => array(
+        'ansi' => '
 			SELECT "contentobject_id", "role_id"
 			FROM "ezuser_role"
 			WHERE :cond AND "role_id" IS NOT NULL
 			GROUP BY "contentobject_id", "role_id"
 		'
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT ezro."id" AS "customer.group.id", ezro."id" AS "customer.group.code",
 				ezro."name" AS "customer.group.label"
 			FROM "ezrole" AS ezro
@@ -25,9 +25,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		'
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezro."id"
@@ -37,5 +37,5 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		'
-	),
+    ),
 );