Inspection of "Streamlined length of address columns and indexes" - aimeos/ai-fosuser - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 81e4c3...4f1653 )

by Aimeos

created 2016-11-23 23:14 UTC

Status

Spacing +144 added lines, -144 removed lines patch added patch discarded remove patch

@@ -8,165 +8,165 @@
 block discarded – undo
 
 return array(
 	'table' => array(
-		'fos_user' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'fos_user' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'username', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'username_canonical', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'email_canonical', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'enabled', 'smallint', array() );
-			$table->addColumn( 'salt', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'password', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'last_login', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'locked', 'smallint', array() );
-			$table->addColumn( 'expired', 'smallint', array() );
-			$table->addColumn( 'expires_at', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'confirmation_token', 'string', array( 'length' => 255, 'notnull' => false ) );
-			$table->addColumn( 'password_requested_at', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'roles', 'text', array( 'length' => 0x7fffffff, 'comment' => '(DC2Type:array)' ) );
-			$table->addColumn( 'credentials_expired', 'smallint', array() );
-			$table->addColumn( 'credentials_expire_at', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) );
-			$table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) );
-			$table->addColumn( 'birthday', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'mtime', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'ctime', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_fosus_id' );
-			$table->addUniqueIndex( array( 'username_canonical' ), 'unq_fosus_username' );
-			$table->addUniqueIndex( array( 'email_canonical' ), 'unq_fosus_email' );
-			$table->addIndex( array( 'langid' ), 'idx_fosus_langid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosus_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_fosus_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_fosus_post_city' );
-			$table->addIndex( array( 'lastname' ), 'idx_fosus_lastname' );
-			$table->addIndex( array( 'address1' ), 'idx_fosus_address1' );
-			$table->addIndex( array( 'city' ), 'idx_fosus_city' );
+		'fos_user' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('fos_user');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('username', 'string', array('length' => 255));
+			$table->addColumn('username_canonical', 'string', array('length' => 255));
+			$table->addColumn('email', 'string', array('length' => 255));
+			$table->addColumn('email_canonical', 'string', array('length' => 255));
+			$table->addColumn('enabled', 'smallint', array());
+			$table->addColumn('salt', 'string', array('length' => 255));
+			$table->addColumn('password', 'string', array('length' => 255));
+			$table->addColumn('last_login', 'datetime', array('notnull' => false));
+			$table->addColumn('locked', 'smallint', array());
+			$table->addColumn('expired', 'smallint', array());
+			$table->addColumn('expires_at', 'datetime', array('notnull' => false));
+			$table->addColumn('confirmation_token', 'string', array('length' => 255, 'notnull' => false));
+			$table->addColumn('password_requested_at', 'datetime', array('notnull' => false));
+			$table->addColumn('roles', 'text', array('length' => 0x7fffffff, 'comment' => '(DC2Type:array)'));
+			$table->addColumn('credentials_expired', 'smallint', array());
+			$table->addColumn('credentials_expire_at', 'datetime', array('notnull' => false));
+			$table->addColumn('salutation', 'string', array('length' => 8, 'default' => ''));
+			$table->addColumn('company', 'string', array('length' => 100, 'default' => ''));
+			$table->addColumn('vatid', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('title', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('firstname', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('lastname', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('address1', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('address2', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('address3', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('postal', 'string', array('length' => 16, 'default' => ''));
+			$table->addColumn('city', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('state', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
+			$table->addColumn('telephone', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('telefax', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('website', 'string', array('length' => 255, 'default' => ''));
+			$table->addColumn('birthday', 'date', array('notnull' => false));
+			$table->addColumn('vdate', 'date', array('notnull' => false));
+			$table->addColumn('mtime', 'datetime', array('notnull' => false));
+			$table->addColumn('ctime', 'datetime', array('notnull' => false));
+			$table->addColumn('editor', 'string', array('length' => 255, 'default' => ''));
+
+			$table->setPrimaryKey(array('id'), 'pk_fosus_id');
+			$table->addUniqueIndex(array('username_canonical'), 'unq_fosus_username');
+			$table->addUniqueIndex(array('email_canonical'), 'unq_fosus_email');
+			$table->addIndex(array('langid'), 'idx_fosus_langid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_fosus_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_fosus_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_fosus_post_city');
+			$table->addIndex(array('lastname'), 'idx_fosus_lastname');
+			$table->addIndex(array('address1'), 'idx_fosus_address1');
+			$table->addIndex(array('city'), 'idx_fosus_city');
 
 			return $schema;
 		},
 
-		'fos_user_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'fos_user_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', 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' => 200 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
-			$table->addColumn( '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_fosad_id' );
-			$table->addIndex( array( 'parentid' ), 'idx_fosad_pid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosad_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_fosad_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_fosad_post_city' );
-			$table->addIndex( array( 'address1' ), 'idx_fosad_address1' );
-			$table->addIndex( array( 'city' ), 'idx_fosad_city' );
-			$table->addIndex( array( 'email' ), 'idx_fosad_email' );
-
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosad_pid' );
+		'fos_user_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('fos_user_address');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', 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' => 200));
+			$table->addColumn('address2', 'string', array('length' => 200));
+			$table->addColumn('address3', 'string', array('length' => 200));
+			$table->addColumn('postal', 'string', array('length' => 16));
+			$table->addColumn('city', 'string', array('length' => 200));
+			$table->addColumn('state', 'string', array('length' => 200));
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
+			$table->addColumn('telephone', 'string', array('length' => 32));
+			$table->addColumn('email', 'string', array('length' => 255));
+			$table->addColumn('telefax', 'string', array('length' => 255));
+			$table->addColumn('website', 'string', array('length' => 255));
+			$table->addColumn('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_fosad_id');
+			$table->addIndex(array('parentid'), 'idx_fosad_pid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_fosad_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_fosad_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_fosad_post_city');
+			$table->addIndex(array('address1'), 'idx_fosad_address1');
+			$table->addIndex(array('city'), 'idx_fosad_city');
+			$table->addIndex(array('email'), 'idx_fosad_email');
+
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosad_pid');
 
 			return $schema;
 		},
 
-		'fos_user_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'fos_user_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'fos_user_list_type' );
+			$table = $schema->createTable('fos_user_list_type');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', 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_foslity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_foslity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_foslity_sid_status' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_foslity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_foslity_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_foslity_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_foslity_sid_dom_code');
+			$table->addIndex(array('siteid', 'status'), 'idx_foslity_sid_status');
+			$table->addIndex(array('siteid', 'label'), 'idx_foslity_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_foslity_sid_code');
 
 			return $schema;
 		},
 
-		'fos_user_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'fos_user_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', 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_fosli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_fosli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_fosli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_fosli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_fosli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_fosli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_fosli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_pid' );
-
-			$table->addForeignKeyConstraint( 'fos_user_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_typeid' );
+		'fos_user_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('fos_user_list');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('parentid', 'integer', 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_fosli_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_fosli_sid_dm_rid_tid_pid');
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_fosli_sid_stat_start_end');
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_fosli_pid_sid_rid_dom_tid');
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_fosli_pid_sid_start');
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_fosli_pid_sid_end');
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_fosli_pid_sid_pos');
+
+			$table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_pid');
+
+			$table->addForeignKeyConstraint('fos_user_list_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_typeid');
 
 			return $schema;
 		},

Please login to merge, or discard this patch.

		@@ -8,165 +8,165 @@
		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', array() );
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', array() );
25		- $table->addColumn( 'expired', 'smallint', array() );
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', array() );
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( 'birthday', 'date', array( 'notnull' => false ) );
50		- $table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
51		- $table->addColumn( 'mtime', 'datetime', array( 'notnull' => false ) );
52		- $table->addColumn( 'ctime', 'datetime', array( 'notnull' => false ) );
53		- $table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) );
54		-
55		- $table->setPrimaryKey( array( 'id' ), 'pk_fosus_id' );
56		- $table->addUniqueIndex( array( 'username_canonical' ), 'unq_fosus_username' );
57		- $table->addUniqueIndex( array( 'email_canonical' ), 'unq_fosus_email' );
58		- $table->addIndex( array( 'langid' ), 'idx_fosus_langid' );
59		- $table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosus_last_first' );
60		- $table->addIndex( array( 'postal', 'address1' ), 'idx_fosus_post_addr1' );
61		- $table->addIndex( array( 'postal', 'city' ), 'idx_fosus_post_city' );
62		- $table->addIndex( array( 'lastname' ), 'idx_fosus_lastname' );
63		- $table->addIndex( array( 'address1' ), 'idx_fosus_address1' );
64		- $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', array());
	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', array());
	25	+ $table->addColumn('expired', 'smallint', array());
	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', array());
	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('birthday', 'date', array('notnull' => false));
	50	+ $table->addColumn('vdate', 'date', array('notnull' => false));
	51	+ $table->addColumn('mtime', 'datetime', array('notnull' => false));
	52	+ $table->addColumn('ctime', 'datetime', array('notnull' => false));
	53	+ $table->addColumn('editor', 'string', array('length' => 255, 'default' => ''));
	54	+
	55	+ $table->setPrimaryKey(array('id'), 'pk_fosus_id');
	56	+ $table->addUniqueIndex(array('username_canonical'), 'unq_fosus_username');
	57	+ $table->addUniqueIndex(array('email_canonical'), 'unq_fosus_email');
	58	+ $table->addIndex(array('langid'), 'idx_fosus_langid');
	59	+ $table->addIndex(array('lastname', 'firstname'), 'idx_fosus_last_first');
	60	+ $table->addIndex(array('postal', 'address1'), 'idx_fosus_post_addr1');
	61	+ $table->addIndex(array('postal', 'city'), 'idx_fosus_post_city');
	62	+ $table->addIndex(array('lastname'), 'idx_fosus_lastname');
	63	+ $table->addIndex(array('address1'), 'idx_fosus_address1');
	64	+ $table->addIndex(array('city'), 'idx_fosus_city');
65	65
66	66	return $schema;
67	67	},
68	68
69		- 'fos_user_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
70		-
71		- $table = $schema->createTable( 'fos_user_address' );
72		-
73		- $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
74		- $table->addColumn( 'siteid', 'integer', array() );
75		- $table->addColumn( 'parentid', 'integer', array() );
76		- $table->addColumn( 'company', 'string', array( 'length' => 100 ) );
77		- $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
78		- $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
79		- $table->addColumn( 'title', 'string', array( 'length' => 64 ) );
80		- $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
81		- $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
82		- $table->addColumn( 'address1', 'string', array( 'length' => 200 ) );
83		- $table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
84		- $table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
85		- $table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
86		- $table->addColumn( 'city', 'string', array( 'length' => 200 ) );
87		- $table->addColumn( 'state', 'string', array( 'length' => 200 ) );
88		- $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
89		- $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
90		- $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
91		- $table->addColumn( 'email', 'string', array( 'length' => 255 ) );
92		- $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
93		- $table->addColumn( 'website', 'string', array( 'length' => 255 ) );
94		- $table->addColumn( 'flag', 'integer', array() );
95		- $table->addColumn( 'pos', 'smallint', array() );
96		- $table->addColumn( 'mtime', 'datetime', array() );
97		- $table->addColumn( 'ctime', 'datetime', array() );
98		- $table->addColumn( 'editor', 'string', array('length' => 255 ) );
99		-
100		- $table->setPrimaryKey( array( 'id' ), 'pk_fosad_id' );
101		- $table->addIndex( array( 'parentid' ), 'idx_fosad_pid' );
102		- $table->addIndex( array( 'lastname', 'firstname' ), 'idx_fosad_last_first' );
103		- $table->addIndex( array( 'postal', 'address1' ), 'idx_fosad_post_addr1' );
104		- $table->addIndex( array( 'postal', 'city' ), 'idx_fosad_post_city' );
105		- $table->addIndex( array( 'address1' ), 'idx_fosad_address1' );
106		- $table->addIndex( array( 'city' ), 'idx_fosad_city' );
107		- $table->addIndex( array( 'email' ), 'idx_fosad_email' );
108		-
109		- $table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
110		- array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosad_pid' );
	69	+ 'fos_user_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
	70	+
	71	+ $table = $schema->createTable('fos_user_address');
	72	+
	73	+ $table->addColumn('id', 'integer', array('autoincrement' => true));
	74	+ $table->addColumn('siteid', 'integer', array());
	75	+ $table->addColumn('parentid', 'integer', array());
	76	+ $table->addColumn('company', 'string', array('length' => 100));
	77	+ $table->addColumn('vatid', 'string', array('length' => 32));
	78	+ $table->addColumn('salutation', 'string', array('length' => 8));
	79	+ $table->addColumn('title', 'string', array('length' => 64));
	80	+ $table->addColumn('firstname', 'string', array('length' => 64));
	81	+ $table->addColumn('lastname', 'string', array('length' => 64));
	82	+ $table->addColumn('address1', 'string', array('length' => 200));
	83	+ $table->addColumn('address2', 'string', array('length' => 200));
	84	+ $table->addColumn('address3', 'string', array('length' => 200));
	85	+ $table->addColumn('postal', 'string', array('length' => 16));
	86	+ $table->addColumn('city', 'string', array('length' => 200));
	87	+ $table->addColumn('state', 'string', array('length' => 200));
	88	+ $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
	89	+ $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
	90	+ $table->addColumn('telephone', 'string', array('length' => 32));
	91	+ $table->addColumn('email', 'string', array('length' => 255));
	92	+ $table->addColumn('telefax', 'string', array('length' => 255));
	93	+ $table->addColumn('website', 'string', array('length' => 255));
	94	+ $table->addColumn('flag', 'integer', array());
	95	+ $table->addColumn('pos', 'smallint', array());
	96	+ $table->addColumn('mtime', 'datetime', array());
	97	+ $table->addColumn('ctime', 'datetime', array());
	98	+ $table->addColumn('editor', 'string', array('length' => 255));
	99	+
	100	+ $table->setPrimaryKey(array('id'), 'pk_fosad_id');
	101	+ $table->addIndex(array('parentid'), 'idx_fosad_pid');
	102	+ $table->addIndex(array('lastname', 'firstname'), 'idx_fosad_last_first');
	103	+ $table->addIndex(array('postal', 'address1'), 'idx_fosad_post_addr1');
	104	+ $table->addIndex(array('postal', 'city'), 'idx_fosad_post_city');
	105	+ $table->addIndex(array('address1'), 'idx_fosad_address1');
	106	+ $table->addIndex(array('city'), 'idx_fosad_city');
	107	+ $table->addIndex(array('email'), 'idx_fosad_email');
	108	+
	109	+ $table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
	110	+ array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosad_pid');
111	111
112	112	return $schema;
113	113	},
114	114
115		- 'fos_user_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
	115	+ 'fos_user_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
116	116
117		- $table = $schema->createTable( 'fos_user_list_type' );
	117	+ $table = $schema->createTable('fos_user_list_type');
118	118
119		- $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
120		- $table->addColumn( 'siteid', 'integer', array() );
121		- $table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
122		- $table->addColumn( 'code', 'string', array( 'length' => 32 ) );
123		- $table->addColumn( 'label', 'string', array( 'length' => 255 ) );
124		- $table->addColumn( 'status', 'smallint', array() );
125		- $table->addColumn( 'mtime', 'datetime', array() );
126		- $table->addColumn( 'ctime', 'datetime', array() );
127		- $table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
	119	+ $table->addColumn('id', 'integer', array('autoincrement' => true));
	120	+ $table->addColumn('siteid', 'integer', array());
	121	+ $table->addColumn('domain', 'string', array('length' => 32));
	122	+ $table->addColumn('code', 'string', array('length' => 32));
	123	+ $table->addColumn('label', 'string', array('length' => 255));
	124	+ $table->addColumn('status', 'smallint', array());
	125	+ $table->addColumn('mtime', 'datetime', array());
	126	+ $table->addColumn('ctime', 'datetime', array());
	127	+ $table->addColumn('editor', 'string', array('length' => 255));
128	128
129		- $table->setPrimaryKey( array( 'id' ), 'pk_foslity_id' );
130		- $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_foslity_sid_dom_code' );
131		- $table->addIndex( array( 'siteid', 'status' ), 'idx_foslity_sid_status' );
132		- $table->addIndex( array( 'siteid', 'label' ), 'idx_foslity_sid_label' );
133		- $table->addIndex( array( 'siteid', 'code' ), 'idx_foslity_sid_code' );
	129	+ $table->setPrimaryKey(array('id'), 'pk_foslity_id');
	130	+ $table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_foslity_sid_dom_code');
	131	+ $table->addIndex(array('siteid', 'status'), 'idx_foslity_sid_status');
	132	+ $table->addIndex(array('siteid', 'label'), 'idx_foslity_sid_label');
	133	+ $table->addIndex(array('siteid', 'code'), 'idx_foslity_sid_code');
134	134
135	135	return $schema;
136	136	},
137	137
138		- 'fos_user_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
139		-
140		- $table = $schema->createTable( 'fos_user_list' );
141		-
142		- $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
143		- $table->addColumn( 'parentid', 'integer', array() );
144		- $table->addColumn( 'siteid', 'integer', array() );
145		- $table->addColumn( 'typeid', 'integer', array() );
146		- $table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
147		- $table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
148		- $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
149		- $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
150		- $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
151		- $table->addColumn( 'pos', 'integer', array() );
152		- $table->addColumn( 'status', 'smallint', array() );
153		- $table->addColumn( 'mtime', 'datetime', array() );
154		- $table->addColumn( 'ctime', 'datetime', array() );
155		- $table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
156		-
157		- $table->setPrimaryKey( array( 'id' ), 'pk_fosli_id' );
158		- $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_fosli_sid_dm_rid_tid_pid' );
159		- $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_fosli_sid_stat_start_end' );
160		- $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_fosli_pid_sid_rid_dom_tid' );
161		- $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_fosli_pid_sid_start' );
162		- $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_fosli_pid_sid_end' );
163		- $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_fosli_pid_sid_pos' );
164		-
165		- $table->addForeignKeyConstraint( 'fos_user', array( 'parentid' ), array( 'id' ),
166		- array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_pid' );
167		-
168		- $table->addForeignKeyConstraint( 'fos_user_list_type', array( 'typeid' ), array( 'id' ),
169		- array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_fosli_typeid' );
	138	+ 'fos_user_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
	139	+
	140	+ $table = $schema->createTable('fos_user_list');
	141	+
	142	+ $table->addColumn('id', 'integer', array('autoincrement' => true));
	143	+ $table->addColumn('parentid', 'integer', array());
	144	+ $table->addColumn('siteid', 'integer', array());
	145	+ $table->addColumn('typeid', 'integer', array());
	146	+ $table->addColumn('domain', 'string', array('length' => 32));
	147	+ $table->addColumn('refid', 'string', array('length' => 32));
	148	+ $table->addColumn('start', 'datetime', array('notnull' => false));
	149	+ $table->addColumn('end', 'datetime', array('notnull' => false));
	150	+ $table->addColumn('config', 'text', array('length' => 0xffff));
	151	+ $table->addColumn('pos', 'integer', array());
	152	+ $table->addColumn('status', 'smallint', array());
	153	+ $table->addColumn('mtime', 'datetime', array());
	154	+ $table->addColumn('ctime', 'datetime', array());
	155	+ $table->addColumn('editor', 'string', array('length' => 255));
	156	+
	157	+ $table->setPrimaryKey(array('id'), 'pk_fosli_id');
	158	+ $table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_fosli_sid_dm_rid_tid_pid');
	159	+ $table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_fosli_sid_stat_start_end');
	160	+ $table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_fosli_pid_sid_rid_dom_tid');
	161	+ $table->addIndex(array('parentid', 'siteid', 'start'), 'idx_fosli_pid_sid_start');
	162	+ $table->addIndex(array('parentid', 'siteid', 'end'), 'idx_fosli_pid_sid_end');
	163	+ $table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_fosli_pid_sid_pos');
	164	+
	165	+ $table->addForeignKeyConstraint('fos_user', array('parentid'), array('id'),
	166	+ array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_pid');
	167	+
	168	+ $table->addForeignKeyConstraint('fos_user_list_type', array('typeid'), array('id'),
	169	+ array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_fosli_typeid');
170	170
171	171	return $schema;
172	172	},

aimeos / ai-fosuser

Push — master ( 81e4c3...4f1653 )

Status

Category

Spacing +144 added lines, -144 removed lines patch added patch discarded remove patch