| @@ -7,125 +7,125 @@ | ||
| 7 | 7 | |
| 8 | 8 | |
| 9 | 9 | return array( | 
| 10 | - 'table' => array( | |
| 11 | -		'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 12 | - | |
| 13 | - $table = $schema->createTable( 'ezuser' ); | |
| 14 | - | |
| 15 | - $table->addColumn( 'contentobject_id', 'integer', array() ); | |
| 16 | - $table->addColumn( 'email', 'string', array( 'length' => 150 ) ); | |
| 17 | - $table->addColumn( 'login', 'string', array( 'length' => 150 ) ); | |
| 18 | - $table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) ); | |
| 19 | - $table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) ); | |
| 20 | - $table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) ); | |
| 21 | - | |
| 22 | - $table->setPrimaryKey( array( 'contentobject_id' ) ); | |
| 23 | - $table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' ); | |
| 24 | - | |
| 25 | - return $schema; | |
| 26 | - }, | |
| 27 | - | |
| 28 | -		'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 29 | - | |
| 30 | - $table = $schema->createTable( 'ezuser_address' ); | |
| 31 | - | |
| 32 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 33 | - $table->addColumn( 'siteid', 'integer', array() ); | |
| 34 | - $table->addColumn( 'parentid', 'integer', array() ); | |
| 35 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); | |
| 36 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); | |
| 37 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); | |
| 38 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); | |
| 39 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); | |
| 40 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); | |
| 41 | - $table->addColumn( 'address1', 'string', array( 'length' => 255 ) ); | |
| 42 | - $table->addColumn( 'address2', 'string', array( 'length' => 255 ) ); | |
| 43 | - $table->addColumn( 'address3', 'string', array( 'length' => 255 ) ); | |
| 44 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); | |
| 45 | - $table->addColumn( 'city', 'string', array( 'length' => 255 ) ); | |
| 46 | - $table->addColumn( 'state', 'string', array( 'length' => 255 ) ); | |
| 47 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); | |
| 48 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); | |
| 49 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); | |
| 50 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); | |
| 51 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); | |
| 52 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); | |
| 53 | - $table->addColumn( 'flag', 'integer', array() ); | |
| 54 | - $table->addColumn( 'pos', 'smallint', array() ); | |
| 55 | - $table->addColumn( 'mtime', 'datetime', array() ); | |
| 56 | - $table->addColumn( 'ctime', 'datetime', array() ); | |
| 57 | -			$table->addColumn( 'editor', 'string', array('length' => 255 ) ); | |
| 58 | - | |
| 59 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' ); | |
| 60 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' ); | |
| 61 | - $table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' ); | |
| 62 | - $table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' ); | |
| 63 | - $table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' ); | |
| 64 | - $table->addIndex( array( 'city' ), 'idx_ezpad_city' ); | |
| 65 | - | |
| 66 | - $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), | |
| 67 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' ); | |
| 68 | - | |
| 69 | - return $schema; | |
| 70 | - }, | |
| 71 | - | |
| 72 | -		'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 73 | - | |
| 74 | - $table = $schema->createTable( 'ezuser_list_type' ); | |
| 75 | - | |
| 76 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 77 | - $table->addColumn( 'siteid', 'integer', array() ); | |
| 78 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); | |
| 79 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); | |
| 80 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); | |
| 81 | - $table->addColumn( 'status', 'smallint', array() ); | |
| 82 | - $table->addColumn( 'mtime', 'datetime', array() ); | |
| 83 | - $table->addColumn( 'ctime', 'datetime', array() ); | |
| 84 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); | |
| 85 | - | |
| 86 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' ); | |
| 87 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' ); | |
| 88 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' ); | |
| 89 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' ); | |
| 90 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' ); | |
| 91 | - | |
| 92 | - return $schema; | |
| 93 | - }, | |
| 94 | - | |
| 95 | -		'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 96 | - | |
| 97 | - $table = $schema->createTable( 'ezuser_list' ); | |
| 98 | - | |
| 99 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 100 | - $table->addColumn( 'parentid', 'integer', array() ); | |
| 101 | - $table->addColumn( 'siteid', 'integer', array() ); | |
| 102 | - $table->addColumn( 'typeid', 'integer', array() ); | |
| 103 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); | |
| 104 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); | |
| 105 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); | |
| 106 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); | |
| 107 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); | |
| 108 | - $table->addColumn( 'pos', 'integer', array() ); | |
| 109 | - $table->addColumn( 'status', 'smallint', array() ); | |
| 110 | - $table->addColumn( 'mtime', 'datetime', array() ); | |
| 111 | - $table->addColumn( 'ctime', 'datetime', array() ); | |
| 112 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); | |
| 113 | - | |
| 114 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' ); | |
| 115 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' ); | |
| 116 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' ); | |
| 117 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' ); | |
| 118 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' ); | |
| 119 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' ); | |
| 120 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' ); | |
| 121 | - | |
| 122 | - $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), | |
| 123 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' ); | |
| 124 | - | |
| 125 | - $table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ), | |
| 126 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' ); | |
| 127 | - | |
| 128 | - return $schema; | |
| 129 | - }, | |
| 130 | - ), | |
| 10 | + 'table' => array( | |
| 11 | +        'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 12 | + | |
| 13 | + $table = $schema->createTable( 'ezuser' ); | |
| 14 | + | |
| 15 | + $table->addColumn( 'contentobject_id', 'integer', array() ); | |
| 16 | + $table->addColumn( 'email', 'string', array( 'length' => 150 ) ); | |
| 17 | + $table->addColumn( 'login', 'string', array( 'length' => 150 ) ); | |
| 18 | + $table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) ); | |
| 19 | + $table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) ); | |
| 20 | + $table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) ); | |
| 21 | + | |
| 22 | + $table->setPrimaryKey( array( 'contentobject_id' ) ); | |
| 23 | + $table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' ); | |
| 24 | + | |
| 25 | + return $schema; | |
| 26 | + }, | |
| 27 | + | |
| 28 | +        'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 29 | + | |
| 30 | + $table = $schema->createTable( 'ezuser_address' ); | |
| 31 | + | |
| 32 | + $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 33 | + $table->addColumn( 'siteid', 'integer', array() ); | |
| 34 | + $table->addColumn( 'parentid', 'integer', array() ); | |
| 35 | + $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); | |
| 36 | + $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); | |
| 37 | + $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); | |
| 38 | + $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); | |
| 39 | + $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); | |
| 40 | + $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); | |
| 41 | + $table->addColumn( 'address1', 'string', array( 'length' => 255 ) ); | |
| 42 | + $table->addColumn( 'address2', 'string', array( 'length' => 255 ) ); | |
| 43 | + $table->addColumn( 'address3', 'string', array( 'length' => 255 ) ); | |
| 44 | + $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); | |
| 45 | + $table->addColumn( 'city', 'string', array( 'length' => 255 ) ); | |
| 46 | + $table->addColumn( 'state', 'string', array( 'length' => 255 ) ); | |
| 47 | + $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); | |
| 48 | + $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); | |
| 49 | + $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); | |
| 50 | + $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); | |
| 51 | + $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); | |
| 52 | + $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); | |
| 53 | + $table->addColumn( 'flag', 'integer', array() ); | |
| 54 | + $table->addColumn( 'pos', 'smallint', array() ); | |
| 55 | + $table->addColumn( 'mtime', 'datetime', array() ); | |
| 56 | + $table->addColumn( 'ctime', 'datetime', array() ); | |
| 57 | +            $table->addColumn( 'editor', 'string', array('length' => 255 ) ); | |
| 58 | + | |
| 59 | + $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' ); | |
| 60 | + $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' ); | |
| 61 | + $table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' ); | |
| 62 | + $table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' ); | |
| 63 | + $table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' ); | |
| 64 | + $table->addIndex( array( 'city' ), 'idx_ezpad_city' ); | |
| 65 | + | |
| 66 | + $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), | |
| 67 | + array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' ); | |
| 68 | + | |
| 69 | + return $schema; | |
| 70 | + }, | |
| 71 | + | |
| 72 | +        'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 73 | + | |
| 74 | + $table = $schema->createTable( 'ezuser_list_type' ); | |
| 75 | + | |
| 76 | + $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 77 | + $table->addColumn( 'siteid', 'integer', array() ); | |
| 78 | + $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); | |
| 79 | + $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); | |
| 80 | + $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); | |
| 81 | + $table->addColumn( 'status', 'smallint', array() ); | |
| 82 | + $table->addColumn( 'mtime', 'datetime', array() ); | |
| 83 | + $table->addColumn( 'ctime', 'datetime', array() ); | |
| 84 | + $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); | |
| 85 | + | |
| 86 | + $table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' ); | |
| 87 | + $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' ); | |
| 88 | + $table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' ); | |
| 89 | + $table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' ); | |
| 90 | + $table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' ); | |
| 91 | + | |
| 92 | + return $schema; | |
| 93 | + }, | |
| 94 | + | |
| 95 | +        'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 96 | + | |
| 97 | + $table = $schema->createTable( 'ezuser_list' ); | |
| 98 | + | |
| 99 | + $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 100 | + $table->addColumn( 'parentid', 'integer', array() ); | |
| 101 | + $table->addColumn( 'siteid', 'integer', array() ); | |
| 102 | + $table->addColumn( 'typeid', 'integer', array() ); | |
| 103 | + $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); | |
| 104 | + $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); | |
| 105 | + $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); | |
| 106 | + $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); | |
| 107 | + $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); | |
| 108 | + $table->addColumn( 'pos', 'integer', array() ); | |
| 109 | + $table->addColumn( 'status', 'smallint', array() ); | |
| 110 | + $table->addColumn( 'mtime', 'datetime', array() ); | |
| 111 | + $table->addColumn( 'ctime', 'datetime', array() ); | |
| 112 | + $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); | |
| 113 | + | |
| 114 | + $table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' ); | |
| 115 | + $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' ); | |
| 116 | + $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' ); | |
| 117 | + $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' ); | |
| 118 | + $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' ); | |
| 119 | + $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' ); | |
| 120 | + $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' ); | |
| 121 | + | |
| 122 | + $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), | |
| 123 | + array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' ); | |
| 124 | + | |
| 125 | + $table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ), | |
| 126 | + array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' ); | |
| 127 | + | |
| 128 | + return $schema; | |
| 129 | + }, | |
| 130 | + ), | |
| 131 | 131 | ); | 
| @@ -8,122 +8,122 @@ | ||
| 8 | 8 | |
| 9 | 9 | return array( | 
| 10 | 10 | 'table' => array( | 
| 11 | -		'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 11 | +		'ezuser' => function(\Doctrine\DBAL\Schema\Schema $schema) { | |
| 12 | 12 | |
| 13 | - $table = $schema->createTable( 'ezuser' ); | |
| 13 | +			$table = $schema->createTable('ezuser'); | |
| 14 | 14 | |
| 15 | - $table->addColumn( 'contentobject_id', 'integer', array() ); | |
| 16 | - $table->addColumn( 'email', 'string', array( 'length' => 150 ) ); | |
| 17 | - $table->addColumn( 'login', 'string', array( 'length' => 150 ) ); | |
| 18 | - $table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) ); | |
| 19 | - $table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) ); | |
| 20 | - $table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) ); | |
| 15 | +			$table->addColumn('contentobject_id', 'integer', array()); | |
| 16 | +			$table->addColumn('email', 'string', array('length' => 150)); | |
| 17 | +			$table->addColumn('login', 'string', array('length' => 150)); | |
| 18 | +			$table->addColumn('login_normalized', 'string', array('length' => 150)); | |
| 19 | +			$table->addColumn('password_hash', 'string', array('length' => 50)); | |
| 20 | +			$table->addColumn('password_hash_type', 'integer', array('default' => 1)); | |
| 21 | 21 | |
| 22 | - $table->setPrimaryKey( array( 'contentobject_id' ) ); | |
| 23 | - $table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' ); | |
| 22 | +			$table->setPrimaryKey(array('contentobject_id')); | |
| 23 | +			$table->addUniqueIndex(array('login_normalized'), 'ezuser_login'); | |
| 24 | 24 | |
| 25 | 25 | return $schema; | 
| 26 | 26 | }, | 
| 27 | 27 | |
| 28 | -		'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 29 | - | |
| 30 | - $table = $schema->createTable( 'ezuser_address' ); | |
| 31 | - | |
| 32 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 33 | - $table->addColumn( 'siteid', 'integer', array() ); | |
| 34 | - $table->addColumn( 'parentid', 'integer', array() ); | |
| 35 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); | |
| 36 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); | |
| 37 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); | |
| 38 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); | |
| 39 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); | |
| 40 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); | |
| 41 | - $table->addColumn( 'address1', 'string', array( 'length' => 255 ) ); | |
| 42 | - $table->addColumn( 'address2', 'string', array( 'length' => 255 ) ); | |
| 43 | - $table->addColumn( 'address3', 'string', array( 'length' => 255 ) ); | |
| 44 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); | |
| 45 | - $table->addColumn( 'city', 'string', array( 'length' => 255 ) ); | |
| 46 | - $table->addColumn( 'state', 'string', array( 'length' => 255 ) ); | |
| 47 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); | |
| 48 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); | |
| 49 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); | |
| 50 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); | |
| 51 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); | |
| 52 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); | |
| 53 | - $table->addColumn( 'flag', 'integer', array() ); | |
| 54 | - $table->addColumn( 'pos', 'smallint', array() ); | |
| 55 | - $table->addColumn( 'mtime', 'datetime', array() ); | |
| 56 | - $table->addColumn( 'ctime', 'datetime', array() ); | |
| 57 | -			$table->addColumn( 'editor', 'string', array('length' => 255 ) ); | |
| 58 | - | |
| 59 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' ); | |
| 60 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' ); | |
| 61 | - $table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' ); | |
| 62 | - $table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' ); | |
| 63 | - $table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' ); | |
| 64 | - $table->addIndex( array( 'city' ), 'idx_ezpad_city' ); | |
| 65 | - | |
| 66 | - $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), | |
| 67 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' ); | |
| 28 | +		'ezuser_address' => function(\Doctrine\DBAL\Schema\Schema $schema) { | |
| 29 | + | |
| 30 | +			$table = $schema->createTable('ezuser_address'); | |
| 31 | + | |
| 32 | +			$table->addColumn('id', 'integer', array('autoincrement' => true)); | |
| 33 | +			$table->addColumn('siteid', 'integer', array()); | |
| 34 | +			$table->addColumn('parentid', 'integer', array()); | |
| 35 | +			$table->addColumn('company', 'string', array('length' => 100)); | |
| 36 | +			$table->addColumn('vatid', 'string', array('length' => 32)); | |
| 37 | +			$table->addColumn('salutation', 'string', array('length' => 8)); | |
| 38 | +			$table->addColumn('title', 'string', array('length' => 64)); | |
| 39 | +			$table->addColumn('firstname', 'string', array('length' => 64)); | |
| 40 | +			$table->addColumn('lastname', 'string', array('length' => 64)); | |
| 41 | +			$table->addColumn('address1', 'string', array('length' => 255)); | |
| 42 | +			$table->addColumn('address2', 'string', array('length' => 255)); | |
| 43 | +			$table->addColumn('address3', 'string', array('length' => 255)); | |
| 44 | +			$table->addColumn('postal', 'string', array('length' => 16)); | |
| 45 | +			$table->addColumn('city', 'string', array('length' => 255)); | |
| 46 | +			$table->addColumn('state', 'string', array('length' => 255)); | |
| 47 | +			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); | |
| 48 | +			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); | |
| 49 | +			$table->addColumn('telephone', 'string', array('length' => 32)); | |
| 50 | +			$table->addColumn('email', 'string', array('length' => 255)); | |
| 51 | +			$table->addColumn('telefax', 'string', array('length' => 255)); | |
| 52 | +			$table->addColumn('website', 'string', array('length' => 255)); | |
| 53 | +			$table->addColumn('flag', 'integer', array()); | |
| 54 | +			$table->addColumn('pos', 'smallint', array()); | |
| 55 | +			$table->addColumn('mtime', 'datetime', array()); | |
| 56 | +			$table->addColumn('ctime', 'datetime', array()); | |
| 57 | +			$table->addColumn('editor', 'string', array('length' => 255)); | |
| 58 | + | |
| 59 | +			$table->setPrimaryKey(array('id'), 'pk_ezpad_id'); | |
| 60 | +			$table->addIndex(array('lastname', 'firstname'), 'idx_ezpad_ln_fn'); | |
| 61 | +			$table->addIndex(array('address1', 'address2'), 'idx_ezpad_ad1_ad2'); | |
| 62 | +			$table->addIndex(array('postal', 'city'), 'idx_ezpad_post_ci'); | |
| 63 | +			$table->addIndex(array('parentid'), 'idx_ezpad_pid'); | |
| 64 | +			$table->addIndex(array('city'), 'idx_ezpad_city'); | |
| 65 | + | |
| 66 | +			$table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'), | |
| 67 | +				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpad_pid'); | |
| 68 | 68 | |
| 69 | 69 | return $schema; | 
| 70 | 70 | }, | 
| 71 | 71 | |
| 72 | -		'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 72 | +		'ezuser_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) { | |
| 73 | 73 | |
| 74 | - $table = $schema->createTable( 'ezuser_list_type' ); | |
| 74 | +			$table = $schema->createTable('ezuser_list_type'); | |
| 75 | 75 | |
| 76 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 77 | - $table->addColumn( 'siteid', 'integer', array() ); | |
| 78 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); | |
| 79 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); | |
| 80 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); | |
| 81 | - $table->addColumn( 'status', 'smallint', array() ); | |
| 82 | - $table->addColumn( 'mtime', 'datetime', array() ); | |
| 83 | - $table->addColumn( 'ctime', 'datetime', array() ); | |
| 84 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); | |
| 76 | +			$table->addColumn('id', 'integer', array('autoincrement' => true)); | |
| 77 | +			$table->addColumn('siteid', 'integer', array()); | |
| 78 | +			$table->addColumn('domain', 'string', array('length' => 32)); | |
| 79 | +			$table->addColumn('code', 'string', array('length' => 32)); | |
| 80 | +			$table->addColumn('label', 'string', array('length' => 255)); | |
| 81 | +			$table->addColumn('status', 'smallint', array()); | |
| 82 | +			$table->addColumn('mtime', 'datetime', array()); | |
| 83 | +			$table->addColumn('ctime', 'datetime', array()); | |
| 84 | +			$table->addColumn('editor', 'string', array('length' => 255)); | |
| 85 | 85 | |
| 86 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' ); | |
| 87 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' ); | |
| 88 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' ); | |
| 89 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' ); | |
| 90 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' ); | |
| 86 | +			$table->setPrimaryKey(array('id'), 'pk_ezplity_id'); | |
| 87 | +			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_ezplity_sid_dom_code'); | |
| 88 | +			$table->addIndex(array('siteid', 'status'), 'idx_ezplity_sid_status'); | |
| 89 | +			$table->addIndex(array('siteid', 'label'), 'idx_ezplity_sid_label'); | |
| 90 | +			$table->addIndex(array('siteid', 'code'), 'idx_ezplity_sid_code'); | |
| 91 | 91 | |
| 92 | 92 | return $schema; | 
| 93 | 93 | }, | 
| 94 | 94 | |
| 95 | -		'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { | |
| 96 | - | |
| 97 | - $table = $schema->createTable( 'ezuser_list' ); | |
| 98 | - | |
| 99 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); | |
| 100 | - $table->addColumn( 'parentid', 'integer', array() ); | |
| 101 | - $table->addColumn( 'siteid', 'integer', array() ); | |
| 102 | - $table->addColumn( 'typeid', 'integer', array() ); | |
| 103 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); | |
| 104 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); | |
| 105 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); | |
| 106 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); | |
| 107 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); | |
| 108 | - $table->addColumn( 'pos', 'integer', array() ); | |
| 109 | - $table->addColumn( 'status', 'smallint', array() ); | |
| 110 | - $table->addColumn( 'mtime', 'datetime', array() ); | |
| 111 | - $table->addColumn( 'ctime', 'datetime', array() ); | |
| 112 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); | |
| 113 | - | |
| 114 | - $table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' ); | |
| 115 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' ); | |
| 116 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' ); | |
| 117 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' ); | |
| 118 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' ); | |
| 119 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' ); | |
| 120 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' ); | |
| 121 | - | |
| 122 | - $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ), | |
| 123 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' ); | |
| 124 | - | |
| 125 | - $table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ), | |
| 126 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' ); | |
| 95 | +		'ezuser_list' => function(\Doctrine\DBAL\Schema\Schema $schema) { | |
| 96 | + | |
| 97 | +			$table = $schema->createTable('ezuser_list'); | |
| 98 | + | |
| 99 | +			$table->addColumn('id', 'integer', array('autoincrement' => true)); | |
| 100 | +			$table->addColumn('parentid', 'integer', array()); | |
| 101 | +			$table->addColumn('siteid', 'integer', array()); | |
| 102 | +			$table->addColumn('typeid', 'integer', array()); | |
| 103 | +			$table->addColumn('domain', 'string', array('length' => 32)); | |
| 104 | +			$table->addColumn('refid', 'string', array('length' => 32)); | |
| 105 | +			$table->addColumn('start', 'datetime', array('notnull' => false)); | |
| 106 | +			$table->addColumn('end', 'datetime', array('notnull' => false)); | |
| 107 | +			$table->addColumn('config', 'text', array('length' => 0xffff)); | |
| 108 | +			$table->addColumn('pos', 'integer', array()); | |
| 109 | +			$table->addColumn('status', 'smallint', array()); | |
| 110 | +			$table->addColumn('mtime', 'datetime', array()); | |
| 111 | +			$table->addColumn('ctime', 'datetime', array()); | |
| 112 | +			$table->addColumn('editor', 'string', array('length' => 255)); | |
| 113 | + | |
| 114 | +			$table->setPrimaryKey(array('id'), 'pk_ezpli_id'); | |
| 115 | +			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_ezpli_sid_dm_rid_tid_pid'); | |
| 116 | +			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_ezpli_sid_stat_start_end'); | |
| 117 | +			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_ezpli_pid_sid_rid_dom_tid'); | |
| 118 | +			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_ezpli_pid_sid_start'); | |
| 119 | +			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_ezpli_pid_sid_end'); | |
| 120 | +			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_ezpli_pid_sid_pos'); | |
| 121 | + | |
| 122 | +			$table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'), | |
| 123 | +				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_pid'); | |
| 124 | + | |
| 125 | +			$table->addForeignKeyConstraint('ezuser_list_type', array('typeid'), array('id'), | |
| 126 | +				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_typeid'); | |
| 127 | 127 | |
| 128 | 128 | return $schema; | 
| 129 | 129 | }, | 
| @@ -6,16 +6,16 @@ discard block | ||
| 6 | 6 | */ | 
| 7 | 7 | |
| 8 | 8 | return array( | 
| 9 | - 'groups' => array( | |
| 10 | - 'ansi' => ' | |
| 9 | + 'groups' => array( | |
| 10 | + 'ansi' => ' | |
| 11 | 11 | SELECT "contentobject_id", "role_id" | 
| 12 | 12 | FROM "ezuser_role" | 
| 13 | 13 | WHERE :cond AND "role_id" IS NOT NULL | 
| 14 | 14 | GROUP BY "contentobject_id", "role_id" | 
| 15 | 15 | ' | 
| 16 | - ), | |
| 17 | - 'search' => array( | |
| 18 | - 'ansi' => ' | |
| 16 | + ), | |
| 17 | + 'search' => array( | |
| 18 | + 'ansi' => ' | |
| 19 | 19 | SELECT ezro."id" AS "customer.group.id", ezro."id" AS "customer.group.code", | 
| 20 | 20 | ezro."name" AS "customer.group.label" | 
| 21 | 21 | FROM "ezrole" AS ezro | 
| @@ -25,9 +25,9 @@ discard block | ||
| 25 | 25 | /*-orderby*/ ORDER BY :order /*orderby-*/ | 
| 26 | 26 | LIMIT :size OFFSET :start | 
| 27 | 27 | ' | 
| 28 | - ), | |
| 29 | - 'count' => array( | |
| 30 | - 'ansi' => ' | |
| 28 | + ), | |
| 29 | + 'count' => array( | |
| 30 | + 'ansi' => ' | |
| 31 | 31 | SELECT COUNT(*) AS "count" | 
| 32 | 32 | FROM ( | 
| 33 | 33 | SELECT DISTINCT ezro."id" | 
| @@ -37,5 +37,5 @@ discard block | ||
| 37 | 37 | LIMIT 10000 OFFSET 0 | 
| 38 | 38 | ) AS list | 
| 39 | 39 | ' | 
| 40 | - ), | |
| 40 | + ), | |
| 41 | 41 | ); | 
| @@ -6,8 +6,8 @@ discard block | ||
| 6 | 6 | */ | 
| 7 | 7 | |
| 8 | 8 | return array( | 
| 9 | - 'update' => array( | |
| 10 | - 'ansi' => ' | |
| 9 | + 'update' => array( | |
| 10 | + 'ansi' => ' | |
| 11 | 11 | UPDATE "ezuser" | 
| 12 | 12 | SET "company" = ?, "vatid" = ?, "salutation" = ?, "title" = ?, | 
| 13 | 13 | "firstname" = ?, "lastname" = ?, "address1" = ?, "address2" = ?, "address3" = ?, | 
| @@ -16,9 +16,9 @@ discard block | ||
| 16 | 16 | "mtime" = ?, "editor" = ?, "ctime" = ? | 
| 17 | 17 | WHERE "contentobject_id" = ? | 
| 18 | 18 | ', | 
| 19 | - ), | |
| 20 | - 'search' => array( | |
| 21 | - 'ansi' => ' | |
| 19 | + ), | |
| 20 | + 'search' => array( | |
| 21 | + 'ansi' => ' | |
| 22 | 22 | SELECT DISTINCT ezu."contentobject_id" AS "customer.id", | 
| 23 | 23 | ezu."login_normalized" as "customer.code", ezu."login" as "customer.label", | 
| 24 | 24 | ezu."company" AS "customer.company", ezu."vatid" AS "customer.vatid", | 
| @@ -41,9 +41,9 @@ discard block | ||
| 41 | 41 | /*-orderby*/ ORDER BY :order /*orderby-*/ | 
| 42 | 42 | LIMIT :size OFFSET :start | 
| 43 | 43 | ', | 
| 44 | - ), | |
| 45 | - 'count' => array( | |
| 46 | - 'ansi' => ' | |
| 44 | + ), | |
| 45 | + 'count' => array( | |
| 46 | + 'ansi' => ' | |
| 47 | 47 | SELECT COUNT(*) AS "count" | 
| 48 | 48 | FROM ( | 
| 49 | 49 | SELECT DISTINCT ezu."contentobject_id" | 
| @@ -54,5 +54,5 @@ discard block | ||
| 54 | 54 | LIMIT 10000 OFFSET 0 | 
| 55 | 55 | ) AS list | 
| 56 | 56 | ', | 
| 57 | - ), | |
| 57 | + ), | |
| 58 | 58 | ); | 
| @@ -8,88 +8,88 @@ | ||
| 8 | 8 | */ | 
| 9 | 9 | class TestHelper | 
| 10 | 10 |  { | 
| 11 | - private static $aimeos; | |
| 12 | - private static $context = array(); | |
| 11 | + private static $aimeos; | |
| 12 | + private static $context = array(); | |
| 13 | 13 | |
| 14 | 14 | |
| 15 | - public static function bootstrap() | |
| 16 | -	{ | |
| 17 | - $aimeos = self::getAimeos(); | |
| 15 | + public static function bootstrap() | |
| 16 | +    { | |
| 17 | + $aimeos = self::getAimeos(); | |
| 18 | 18 | |
| 19 | - $includepaths = $aimeos->getIncludePaths(); | |
| 20 | - $includepaths[] = get_include_path(); | |
| 21 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); | |
| 22 | - } | |
| 19 | + $includepaths = $aimeos->getIncludePaths(); | |
| 20 | + $includepaths[] = get_include_path(); | |
| 21 | + set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); | |
| 22 | + } | |
| 23 | 23 | |
| 24 | 24 | |
| 25 | - public static function getContext( $site = 'unittest' ) | |
| 26 | -	{ | |
| 27 | -		if( !isset( self::$context[$site] ) ) { | |
| 28 | - self::$context[$site] = self::createContext( $site ); | |
| 29 | - } | |
| 25 | + public static function getContext( $site = 'unittest' ) | |
| 26 | +    { | |
| 27 | +        if( !isset( self::$context[$site] ) ) { | |
| 28 | + self::$context[$site] = self::createContext( $site ); | |
| 29 | + } | |
| 30 | 30 | |
| 31 | - return clone self::$context[$site]; | |
| 32 | - } | |
| 31 | + return clone self::$context[$site]; | |
| 32 | + } | |
| 33 | 33 | |
| 34 | 34 | |
| 35 | - private static function getAimeos() | |
| 36 | -	{ | |
| 37 | - if( !isset( self::$aimeos ) ) | |
| 38 | -		{ | |
| 39 | - require_once 'Bootstrap.php'; | |
| 40 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); | |
| 35 | + private static function getAimeos() | |
| 36 | +    { | |
| 37 | + if( !isset( self::$aimeos ) ) | |
| 38 | +        { | |
| 39 | + require_once 'Bootstrap.php'; | |
| 40 | + spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); | |
| 41 | 41 | |
| 42 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); | |
| 43 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); | |
| 44 | - } | |
| 42 | + $extdir = dirname( dirname( dirname( __DIR__ ) ) ); | |
| 43 | + self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); | |
| 44 | + } | |
| 45 | 45 | |
| 46 | - return self::$aimeos; | |
| 47 | - } | |
| 46 | + return self::$aimeos; | |
| 47 | + } | |
| 48 | 48 | |
| 49 | 49 | |
| 50 | - /** | |
| 51 | - * @param string $site | |
| 52 | - */ | |
| 53 | - private static function createContext( $site ) | |
| 54 | -	{ | |
| 55 | - $ctx = new \Aimeos\MShop\Context\Item\Ezpublish(); | |
| 56 | - $aimeos = self::getAimeos(); | |
| 50 | + /** | |
| 51 | + * @param string $site | |
| 52 | + */ | |
| 53 | + private static function createContext( $site ) | |
| 54 | +    { | |
| 55 | + $ctx = new \Aimeos\MShop\Context\Item\Ezpublish(); | |
| 56 | + $aimeos = self::getAimeos(); | |
| 57 | 57 | |
| 58 | 58 | |
| 59 | - $paths = $aimeos->getConfigPaths(); | |
| 60 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; | |
| 59 | + $paths = $aimeos->getConfigPaths(); | |
| 60 | + $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; | |
| 61 | 61 | |
| 62 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); | |
| 63 | - $ctx->setConfig( $conf ); | |
| 62 | + $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); | |
| 63 | + $ctx->setConfig( $conf ); | |
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf ); | |
| 67 | - $ctx->setDatabaseManager( $dbm ); | |
| 66 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf ); | |
| 67 | + $ctx->setDatabaseManager( $dbm ); | |
| 68 | 68 | |
| 69 | 69 | |
| 70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); | |
| 71 | - $ctx->setLogger( $logger ); | |
| 70 | + $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); | |
| 71 | + $ctx->setLogger( $logger ); | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | - $cache = new \Aimeos\MW\Cache\None(); | |
| 75 | - $ctx->setCache( $cache ); | |
| 74 | + $cache = new \Aimeos\MW\Cache\None(); | |
| 75 | + $ctx->setCache( $cache ); | |
| 76 | 76 | |
| 77 | 77 | |
| 78 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); | |
| 79 | - $ctx->setI18n( array( 'de' => $i18n ) ); | |
| 78 | + $i18n = new \Aimeos\MW\Translation\None( 'de' ); | |
| 79 | + $ctx->setI18n( array( 'de' => $i18n ) ); | |
| 80 | 80 | |
| 81 | 81 | |
| 82 | - $session = new \Aimeos\MW\Session\None(); | |
| 83 | - $ctx->setSession( $session ); | |
| 82 | + $session = new \Aimeos\MW\Session\None(); | |
| 83 | + $ctx->setSession( $session ); | |
| 84 | 84 | |
| 85 | 85 | |
| 86 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); | |
| 87 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); | |
| 86 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); | |
| 87 | + $localeItem = $localeManager->bootstrap( $site, '', '', false ); | |
| 88 | 88 | |
| 89 | - $ctx->setLocale( $localeItem ); | |
| 89 | + $ctx->setLocale( $localeItem ); | |
| 90 | 90 | |
| 91 | - $ctx->setEditor( 'ai-ezpublish:unittest' ); | |
| 91 | + $ctx->setEditor( 'ai-ezpublish:unittest' ); | |
| 92 | 92 | |
| 93 | - return $ctx; | |
| 94 | - } | |
| 93 | + return $ctx; | |
| 94 | + } | |
| 95 | 95 | } | 
| @@ -18,14 +18,14 @@ discard block | ||
| 18 | 18 | |
| 19 | 19 | $includepaths = $aimeos->getIncludePaths(); | 
| 20 | 20 | $includepaths[] = get_include_path(); | 
| 21 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); | |
| 21 | + set_include_path(implode(PATH_SEPARATOR, $includepaths)); | |
| 22 | 22 | } | 
| 23 | 23 | |
| 24 | 24 | |
| 25 | - public static function getContext( $site = 'unittest' ) | |
| 25 | + public static function getContext($site = 'unittest') | |
| 26 | 26 |  	{ | 
| 27 | -		if( !isset( self::$context[$site] ) ) { | |
| 28 | - self::$context[$site] = self::createContext( $site ); | |
| 27 | +		if (!isset(self::$context[$site])) { | |
| 28 | + self::$context[$site] = self::createContext($site); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | return clone self::$context[$site]; | 
| @@ -34,13 +34,13 @@ discard block | ||
| 34 | 34 | |
| 35 | 35 | private static function getAimeos() | 
| 36 | 36 |  	{ | 
| 37 | - if( !isset( self::$aimeos ) ) | |
| 37 | + if (!isset(self::$aimeos)) | |
| 38 | 38 |  		{ | 
| 39 | 39 | require_once 'Bootstrap.php'; | 
| 40 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); | |
| 40 | +			spl_autoload_register('Aimeos\\Bootstrap::autoload'); | |
| 41 | 41 | |
| 42 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); | |
| 43 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); | |
| 42 | + $extdir = dirname(dirname(dirname(__DIR__))); | |
| 43 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); | |
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | return self::$aimeos; | 
| @@ -50,45 +50,45 @@ discard block | ||
| 50 | 50 | /** | 
| 51 | 51 | * @param string $site | 
| 52 | 52 | */ | 
| 53 | - private static function createContext( $site ) | |
| 53 | + private static function createContext($site) | |
| 54 | 54 |  	{ | 
| 55 | 55 | $ctx = new \Aimeos\MShop\Context\Item\Ezpublish(); | 
| 56 | 56 | $aimeos = self::getAimeos(); | 
| 57 | 57 | |
| 58 | 58 | |
| 59 | 59 | $paths = $aimeos->getConfigPaths(); | 
| 60 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; | |
| 60 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; | |
| 61 | 61 | |
| 62 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); | |
| 63 | - $ctx->setConfig( $conf ); | |
| 62 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $paths); | |
| 63 | + $ctx->setConfig($conf); | |
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf ); | |
| 67 | - $ctx->setDatabaseManager( $dbm ); | |
| 66 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($conf); | |
| 67 | + $ctx->setDatabaseManager($dbm); | |
| 68 | 68 | |
| 69 | 69 | |
| 70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); | |
| 71 | - $ctx->setLogger( $logger ); | |
| 70 | + $logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG); | |
| 71 | + $ctx->setLogger($logger); | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | $cache = new \Aimeos\MW\Cache\None(); | 
| 75 | - $ctx->setCache( $cache ); | |
| 75 | + $ctx->setCache($cache); | |
| 76 | 76 | |
| 77 | 77 | |
| 78 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); | |
| 79 | - $ctx->setI18n( array( 'de' => $i18n ) ); | |
| 78 | +		$i18n = new \Aimeos\MW\Translation\None('de'); | |
| 79 | +		$ctx->setI18n(array('de' => $i18n)); | |
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | $session = new \Aimeos\MW\Session\None(); | 
| 83 | - $ctx->setSession( $session ); | |
| 83 | + $ctx->setSession($session); | |
| 84 | 84 | |
| 85 | 85 | |
| 86 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); | |
| 87 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); | |
| 86 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); | |
| 87 | + $localeItem = $localeManager->bootstrap($site, '', '', false); | |
| 88 | 88 | |
| 89 | - $ctx->setLocale( $localeItem ); | |
| 89 | + $ctx->setLocale($localeItem); | |
| 90 | 90 | |
| 91 | - $ctx->setEditor( 'ai-ezpublish:unittest' ); | |
| 91 | +		$ctx->setEditor('ai-ezpublish:unittest'); | |
| 92 | 92 | |
| 93 | 93 | return $ctx; | 
| 94 | 94 | } | 
| @@ -11,44 +11,44 @@ | ||
| 11 | 11 | |
| 12 | 12 | class EzpublishTest extends \PHPUnit_Framework_TestCase | 
| 13 | 13 |  { | 
| 14 | - private $object; | |
| 14 | + private $object; | |
| 15 | 15 | |
| 16 | 16 | |
| 17 | - protected function setUp() | |
| 18 | -	{ | |
| 19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' ); | |
| 17 | + protected function setUp() | |
| 18 | +    { | |
| 19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' ); | |
| 20 | 20 | |
| 21 | - $listManager = $manager->getSubManager( 'lists', 'Ezpublish' ); | |
| 22 | - $this->object = $listManager->getSubManager( 'type', 'Ezpublish' ); | |
| 23 | - } | |
| 21 | + $listManager = $manager->getSubManager( 'lists', 'Ezpublish' ); | |
| 22 | + $this->object = $listManager->getSubManager( 'type', 'Ezpublish' ); | |
| 23 | + } | |
| 24 | 24 | |
| 25 | 25 | |
| 26 | - protected function tearDown() | |
| 27 | -	{ | |
| 28 | - unset( $this->object ); | |
| 29 | - } | |
| 26 | + protected function tearDown() | |
| 27 | +    { | |
| 28 | + unset( $this->object ); | |
| 29 | + } | |
| 30 | 30 | |
| 31 | 31 | |
| 32 | - public function testCleanup() | |
| 33 | -	{ | |
| 34 | - $this->object->cleanup( array( -1 ) ); | |
| 35 | - } | |
| 32 | + public function testCleanup() | |
| 33 | +    { | |
| 34 | + $this->object->cleanup( array( -1 ) ); | |
| 35 | + } | |
| 36 | 36 | |
| 37 | 37 | |
| 38 | - public function testGetSearchAttributes() | |
| 39 | -	{ | |
| 40 | - $attributes = $this->object->getSearchAttributes(); | |
| 41 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 38 | + public function testGetSearchAttributes() | |
| 39 | +    { | |
| 40 | + $attributes = $this->object->getSearchAttributes(); | |
| 41 | + $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 42 | 42 | |
| 43 | -		foreach( $attributes as $attribute ) { | |
| 44 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 45 | - } | |
| 46 | - } | |
| 43 | +        foreach( $attributes as $attribute ) { | |
| 44 | + $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 45 | + } | |
| 46 | + } | |
| 47 | 47 | |
| 48 | 48 | |
| 49 | - public function testGetSubManager() | |
| 50 | -	{ | |
| 51 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 52 | - $this->object->getSubManager( 'unknown' ); | |
| 53 | - } | |
| 49 | + public function testGetSubManager() | |
| 50 | +    { | |
| 51 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 52 | + $this->object->getSubManager( 'unknown' ); | |
| 53 | + } | |
| 54 | 54 | } | 
| @@ -16,39 +16,39 @@ | ||
| 16 | 16 | |
| 17 | 17 | protected function setUp() | 
| 18 | 18 |  	{ | 
| 19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' ); | |
| 19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Ezpublish'); | |
| 20 | 20 | |
| 21 | - $listManager = $manager->getSubManager( 'lists', 'Ezpublish' ); | |
| 22 | - $this->object = $listManager->getSubManager( 'type', 'Ezpublish' ); | |
| 21 | +		$listManager = $manager->getSubManager('lists', 'Ezpublish'); | |
| 22 | +		$this->object = $listManager->getSubManager('type', 'Ezpublish'); | |
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | protected function tearDown() | 
| 27 | 27 |  	{ | 
| 28 | - unset( $this->object ); | |
| 28 | + unset($this->object); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | public function testCleanup() | 
| 33 | 33 |  	{ | 
| 34 | - $this->object->cleanup( array( -1 ) ); | |
| 34 | + $this->object->cleanup(array( -1 )); | |
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | public function testGetSearchAttributes() | 
| 39 | 39 |  	{ | 
| 40 | 40 | $attributes = $this->object->getSearchAttributes(); | 
| 41 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 41 | + $this->assertGreaterThan(0, count($attributes)); | |
| 42 | 42 | |
| 43 | -		foreach( $attributes as $attribute ) { | |
| 44 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 43 | +		foreach ($attributes as $attribute) { | |
| 44 | +			$this->assertInstanceOf('\Aimeos\MW\Criteria\Attribute\Iface', $attribute); | |
| 45 | 45 | } | 
| 46 | 46 | } | 
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testGetSubManager() | 
| 50 | 50 |  	{ | 
| 51 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 52 | - $this->object->getSubManager( 'unknown' ); | |
| 51 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 52 | +		$this->object->getSubManager('unknown'); | |
| 53 | 53 | } | 
| 54 | 54 | } | 
| @@ -11,62 +11,62 @@ | ||
| 11 | 11 | |
| 12 | 12 | class EzpublishTest extends \PHPUnit_Framework_TestCase | 
| 13 | 13 |  { | 
| 14 | - private $object; | |
| 14 | + private $object; | |
| 15 | 15 | |
| 16 | 16 | |
| 17 | - protected function setUp() | |
| 18 | -	{ | |
| 19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' ); | |
| 20 | - $this->object = $manager->getSubManager( 'lists', 'Ezpublish' ); | |
| 21 | - } | |
| 17 | + protected function setUp() | |
| 18 | +    { | |
| 19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' ); | |
| 20 | + $this->object = $manager->getSubManager( 'lists', 'Ezpublish' ); | |
| 21 | + } | |
| 22 | 22 | |
| 23 | 23 | |
| 24 | - protected function tearDown() | |
| 25 | -	{ | |
| 26 | - unset( $this->object ); | |
| 27 | - } | |
| 24 | + protected function tearDown() | |
| 25 | +    { | |
| 26 | + unset( $this->object ); | |
| 27 | + } | |
| 28 | 28 | |
| 29 | 29 | |
| 30 | - public function testCleanup() | |
| 31 | -	{ | |
| 32 | - $this->object->cleanup( array( -1 ) ); | |
| 33 | - } | |
| 30 | + public function testCleanup() | |
| 31 | +    { | |
| 32 | + $this->object->cleanup( array( -1 ) ); | |
| 33 | + } | |
| 34 | 34 | |
| 35 | 35 | |
| 36 | - public function testGetSearchAttributes() | |
| 37 | -	{ | |
| 38 | - $attributes = $this->object->getSearchAttributes(); | |
| 39 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 36 | + public function testGetSearchAttributes() | |
| 37 | +    { | |
| 38 | + $attributes = $this->object->getSearchAttributes(); | |
| 39 | + $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 40 | 40 | |
| 41 | -		foreach( $attributes as $attribute ) { | |
| 42 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 43 | - } | |
| 44 | - } | |
| 41 | +        foreach( $attributes as $attribute ) { | |
| 42 | + $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 43 | + } | |
| 44 | + } | |
| 45 | 45 | |
| 46 | 46 | |
| 47 | - public function testGetSubManager() | |
| 48 | -	{ | |
| 49 | -		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); | |
| 50 | -		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); | |
| 47 | + public function testGetSubManager() | |
| 48 | +    { | |
| 49 | +        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); | |
| 50 | +        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); | |
| 51 | 51 | |
| 52 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 53 | - $this->object->getSubManager( 'unknown' ); | |
| 54 | - } | |
| 52 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 53 | + $this->object->getSubManager( 'unknown' ); | |
| 54 | + } | |
| 55 | 55 | |
| 56 | 56 | |
| 57 | - public function testSaveItemInvalidItem() | |
| 58 | -	{ | |
| 59 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 60 | - $this->object->saveItem( new \Aimeos\MShop\Common\Item\Type\Standard( 'common.lists.type.' ) ); | |
| 61 | - } | |
| 57 | + public function testSaveItemInvalidItem() | |
| 58 | +    { | |
| 59 | + $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 60 | + $this->object->saveItem( new \Aimeos\MShop\Common\Item\Type\Standard( 'common.lists.type.' ) ); | |
| 61 | + } | |
| 62 | 62 | |
| 63 | 63 | |
| 64 | - public function testSaveItemInvalidDomain() | |
| 65 | -	{ | |
| 66 | - $item = $this->object->createItem(); | |
| 67 | - $item->setDomain( 'customer/group' ); | |
| 64 | + public function testSaveItemInvalidDomain() | |
| 65 | +    { | |
| 66 | + $item = $this->object->createItem(); | |
| 67 | + $item->setDomain( 'customer/group' ); | |
| 68 | 68 | |
| 69 | - $this->setExpectedException( '\Aimeos\MShop\Customer\Exception' ); | |
| 70 | - $this->object->saveItem( $item ); | |
| 71 | - } | |
| 69 | + $this->setExpectedException( '\Aimeos\MShop\Customer\Exception' ); | |
| 70 | + $this->object->saveItem( $item ); | |
| 71 | + } | |
| 72 | 72 | } | 
| @@ -16,57 +16,57 @@ | ||
| 16 | 16 | |
| 17 | 17 | protected function setUp() | 
| 18 | 18 |  	{ | 
| 19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' ); | |
| 20 | - $this->object = $manager->getSubManager( 'lists', 'Ezpublish' ); | |
| 19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Ezpublish'); | |
| 20 | +		$this->object = $manager->getSubManager('lists', 'Ezpublish'); | |
| 21 | 21 | } | 
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | protected function tearDown() | 
| 25 | 25 |  	{ | 
| 26 | - unset( $this->object ); | |
| 26 | + unset($this->object); | |
| 27 | 27 | } | 
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | public function testCleanup() | 
| 31 | 31 |  	{ | 
| 32 | - $this->object->cleanup( array( -1 ) ); | |
| 32 | + $this->object->cleanup(array( -1 )); | |
| 33 | 33 | } | 
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | public function testGetSearchAttributes() | 
| 37 | 37 |  	{ | 
| 38 | 38 | $attributes = $this->object->getSearchAttributes(); | 
| 39 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 39 | + $this->assertGreaterThan(0, count($attributes)); | |
| 40 | 40 | |
| 41 | -		foreach( $attributes as $attribute ) { | |
| 42 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 41 | +		foreach ($attributes as $attribute) { | |
| 42 | +			$this->assertInstanceOf('\Aimeos\MW\Criteria\Attribute\Iface', $attribute); | |
| 43 | 43 | } | 
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | |
| 47 | 47 | public function testGetSubManager() | 
| 48 | 48 |  	{ | 
| 49 | -		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); | |
| 50 | -		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); | |
| 49 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); | |
| 50 | +		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); | |
| 51 | 51 | |
| 52 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 53 | - $this->object->getSubManager( 'unknown' ); | |
| 52 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 53 | +		$this->object->getSubManager('unknown'); | |
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | public function testSaveItemInvalidItem() | 
| 58 | 58 |  	{ | 
| 59 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 60 | - $this->object->saveItem( new \Aimeos\MShop\Common\Item\Type\Standard( 'common.lists.type.' ) ); | |
| 59 | +		$this->setExpectedException('\Aimeos\MShop\Exception'); | |
| 60 | +		$this->object->saveItem(new \Aimeos\MShop\Common\Item\Type\Standard('common.lists.type.')); | |
| 61 | 61 | } | 
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | public function testSaveItemInvalidDomain() | 
| 65 | 65 |  	{ | 
| 66 | 66 | $item = $this->object->createItem(); | 
| 67 | - $item->setDomain( 'customer/group' ); | |
| 67 | +		$item->setDomain('customer/group'); | |
| 68 | 68 | |
| 69 | - $this->setExpectedException( '\Aimeos\MShop\Customer\Exception' ); | |
| 70 | - $this->object->saveItem( $item ); | |
| 69 | +		$this->setExpectedException('\Aimeos\MShop\Customer\Exception'); | |
| 70 | + $this->object->saveItem($item); | |
| 71 | 71 | } | 
| 72 | 72 | } | 
| @@ -11,49 +11,49 @@ | ||
| 11 | 11 | |
| 12 | 12 | class EzpublishTest extends \PHPUnit_Framework_TestCase | 
| 13 | 13 |  { | 
| 14 | - private $object; | |
| 14 | + private $object; | |
| 15 | 15 | |
| 16 | 16 | |
| 17 | - protected function setUp() | |
| 18 | -	{ | |
| 19 | - $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( \TestHelper::getContext() ); | |
| 17 | + protected function setUp() | |
| 18 | +    { | |
| 19 | + $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( \TestHelper::getContext() ); | |
| 20 | 20 | |
| 21 | - $this->object = $customer->getSubManager( 'address', 'Ezpublish' ); | |
| 22 | - } | |
| 21 | + $this->object = $customer->getSubManager( 'address', 'Ezpublish' ); | |
| 22 | + } | |
| 23 | 23 | |
| 24 | 24 | |
| 25 | - protected function tearDown() | |
| 26 | -	{ | |
| 27 | - unset( $this->object ); | |
| 28 | - } | |
| 25 | + protected function tearDown() | |
| 26 | +    { | |
| 27 | + unset( $this->object ); | |
| 28 | + } | |
| 29 | 29 | |
| 30 | 30 | |
| 31 | - public function testCleanup() | |
| 32 | -	{ | |
| 33 | - $this->object->cleanup( array( -1 ) ); | |
| 34 | - } | |
| 31 | + public function testCleanup() | |
| 32 | +    { | |
| 33 | + $this->object->cleanup( array( -1 ) ); | |
| 34 | + } | |
| 35 | 35 | |
| 36 | 36 | |
| 37 | - public function testDeleteItems() | |
| 38 | -	{ | |
| 39 | - $this->object->deleteItems( array( -1 ) ); | |
| 40 | - } | |
| 37 | + public function testDeleteItems() | |
| 38 | +    { | |
| 39 | + $this->object->deleteItems( array( -1 ) ); | |
| 40 | + } | |
| 41 | 41 | |
| 42 | 42 | |
| 43 | - public function testGetSearchAttributes() | |
| 44 | -	{ | |
| 45 | - $attributes = $this->object->getSearchAttributes(); | |
| 46 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 43 | + public function testGetSearchAttributes() | |
| 44 | +    { | |
| 45 | + $attributes = $this->object->getSearchAttributes(); | |
| 46 | + $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 47 | 47 | |
| 48 | -		foreach( $attributes as $attribute ) { | |
| 49 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 50 | - } | |
| 51 | - } | |
| 48 | +        foreach( $attributes as $attribute ) { | |
| 49 | + $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 50 | + } | |
| 51 | + } | |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - public function testGetSubManager() | |
| 55 | -	{ | |
| 56 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 57 | - $this->object->getSubManager( 'unknown' ); | |
| 58 | - } | |
| 54 | + public function testGetSubManager() | |
| 55 | +    { | |
| 56 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 57 | + $this->object->getSubManager( 'unknown' ); | |
| 58 | + } | |
| 59 | 59 | } | 
| @@ -16,44 +16,44 @@ | ||
| 16 | 16 | |
| 17 | 17 | protected function setUp() | 
| 18 | 18 |  	{ | 
| 19 | - $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( \TestHelper::getContext() ); | |
| 19 | + $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish(\TestHelper::getContext()); | |
| 20 | 20 | |
| 21 | - $this->object = $customer->getSubManager( 'address', 'Ezpublish' ); | |
| 21 | +		$this->object = $customer->getSubManager('address', 'Ezpublish'); | |
| 22 | 22 | } | 
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | protected function tearDown() | 
| 26 | 26 |  	{ | 
| 27 | - unset( $this->object ); | |
| 27 | + unset($this->object); | |
| 28 | 28 | } | 
| 29 | 29 | |
| 30 | 30 | |
| 31 | 31 | public function testCleanup() | 
| 32 | 32 |  	{ | 
| 33 | - $this->object->cleanup( array( -1 ) ); | |
| 33 | + $this->object->cleanup(array( -1 )); | |
| 34 | 34 | } | 
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | public function testDeleteItems() | 
| 38 | 38 |  	{ | 
| 39 | - $this->object->deleteItems( array( -1 ) ); | |
| 39 | + $this->object->deleteItems(array( -1 )); | |
| 40 | 40 | } | 
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | public function testGetSearchAttributes() | 
| 44 | 44 |  	{ | 
| 45 | 45 | $attributes = $this->object->getSearchAttributes(); | 
| 46 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 46 | + $this->assertGreaterThan(0, count($attributes)); | |
| 47 | 47 | |
| 48 | -		foreach( $attributes as $attribute ) { | |
| 49 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 48 | +		foreach ($attributes as $attribute) { | |
| 49 | +			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); | |
| 50 | 50 | } | 
| 51 | 51 | } | 
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | public function testGetSubManager() | 
| 55 | 55 |  	{ | 
| 56 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 57 | - $this->object->getSubManager( 'unknown' ); | |
| 56 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 57 | +		$this->object->getSubManager('unknown'); | |
| 58 | 58 | } | 
| 59 | 59 | } | 
| @@ -11,98 +11,98 @@ | ||
| 11 | 11 | |
| 12 | 12 | class EzpublishTest extends \PHPUnit_Framework_TestCase | 
| 13 | 13 |  { | 
| 14 | - private $context; | |
| 15 | - private $object; | |
| 14 | + private $context; | |
| 15 | + private $object; | |
| 16 | 16 | |
| 17 | 17 | |
| 18 | - protected function setUp() | |
| 19 | -	{ | |
| 20 | - $this->context = \TestHelper::getContext(); | |
| 21 | - $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context ); | |
| 18 | + protected function setUp() | |
| 19 | +    { | |
| 20 | + $this->context = \TestHelper::getContext(); | |
| 21 | + $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context ); | |
| 22 | 22 | |
| 23 | - $this->object = $customer->getSubManager( 'group', 'Ezpublish' ); | |
| 24 | - } | |
| 23 | + $this->object = $customer->getSubManager( 'group', 'Ezpublish' ); | |
| 24 | + } | |
| 25 | 25 | |
| 26 | 26 | |
| 27 | - protected function tearDown() | |
| 28 | -	{ | |
| 29 | - unset( $this->object ); | |
| 30 | - } | |
| 27 | + protected function tearDown() | |
| 28 | +    { | |
| 29 | + unset( $this->object ); | |
| 30 | + } | |
| 31 | 31 | |
| 32 | 32 | |
| 33 | - public function testCleanup() | |
| 34 | -	{ | |
| 35 | - $this->object->cleanup( array( -1 ) ); | |
| 36 | - } | |
| 33 | + public function testCleanup() | |
| 34 | +    { | |
| 35 | + $this->object->cleanup( array( -1 ) ); | |
| 36 | + } | |
| 37 | 37 | |
| 38 | 38 | |
| 39 | - public function testDeleteItems() | |
| 40 | -	{ | |
| 41 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 42 | - $this->object->deleteItems( array( -1 ) ); | |
| 43 | - } | |
| 39 | + public function testDeleteItems() | |
| 40 | +    { | |
| 41 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 42 | + $this->object->deleteItems( array( -1 ) ); | |
| 43 | + } | |
| 44 | 44 | |
| 45 | 45 | |
| 46 | - public function testGetSearchAttributes() | |
| 47 | -	{ | |
| 48 | - $attributes = $this->object->getSearchAttributes(); | |
| 49 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 46 | + public function testGetSearchAttributes() | |
| 47 | +    { | |
| 48 | + $attributes = $this->object->getSearchAttributes(); | |
| 49 | + $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 50 | 50 | |
| 51 | -		foreach( $attributes as $attribute ) { | |
| 52 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 53 | - } | |
| 54 | - } | |
| 51 | +        foreach( $attributes as $attribute ) { | |
| 52 | + $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 53 | + } | |
| 54 | + } | |
| 55 | 55 | |
| 56 | 56 | |
| 57 | - public function testGetSubManager() | |
| 58 | -	{ | |
| 59 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 60 | - $this->object->getSubManager( 'unknown' ); | |
| 61 | - } | |
| 57 | + public function testGetSubManager() | |
| 58 | +    { | |
| 59 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 60 | + $this->object->getSubManager( 'unknown' ); | |
| 61 | + } | |
| 62 | 62 | |
| 63 | 63 | |
| 64 | - public function testSaveItem() | |
| 65 | -	{ | |
| 66 | - $this->setExpectedException( '\\Aimeos\\MShop\\Customer\\Exception' ); | |
| 67 | - $this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) ); | |
| 68 | - } | |
| 64 | + public function testSaveItem() | |
| 65 | +    { | |
| 66 | + $this->setExpectedException( '\\Aimeos\\MShop\\Customer\\Exception' ); | |
| 67 | + $this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) ); | |
| 68 | + } | |
| 69 | 69 | |
| 70 | 70 | |
| 71 | - public function testSearchItems() | |
| 72 | -	{ | |
| 73 | - $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' ) | |
| 74 | - ->setConstructorArgs( array( \TestHelper::getContext() ) ) | |
| 75 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 76 | - ->getMock(); | |
| 71 | + public function testSearchItems() | |
| 72 | +    { | |
| 73 | + $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' ) | |
| 74 | + ->setConstructorArgs( array( \TestHelper::getContext() ) ) | |
| 75 | + ->setMethods( array( 'searchItemsBase' ) ) | |
| 76 | + ->getMock(); | |
| 77 | 77 | |
| 78 | - $result = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' ) | |
| 79 | - ->setMethods( array( 'affectedRows', 'fetch', 'finish', 'nextResult' ) ) | |
| 80 | - ->getMock(); | |
| 78 | + $result = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' ) | |
| 79 | + ->setMethods( array( 'affectedRows', 'fetch', 'finish', 'nextResult' ) ) | |
| 80 | + ->getMock(); | |
| 81 | 81 | |
| 82 | - $mock->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 83 | - ->will( $this->returnValue( $result ) ); | |
| 82 | + $mock->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 83 | + ->will( $this->returnValue( $result ) ); | |
| 84 | 84 | |
| 85 | - $result->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 86 | - ->will( $this->onConsecutiveCalls( array( 'customer.group.id' => 1 ), false ) ); | |
| 85 | + $result->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 86 | + ->will( $this->onConsecutiveCalls( array( 'customer.group.id' => 1 ), false ) ); | |
| 87 | 87 | |
| 88 | - $result = $mock->searchItems( $mock->createSearch() ); | |
| 88 | + $result = $mock->searchItems( $mock->createSearch() ); | |
| 89 | 89 | |
| 90 | - $this->assertEquals( 1, count( $result ) ); | |
| 91 | - $this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Group\Iface', $result[1] ); | |
| 92 | - } | |
| 90 | + $this->assertEquals( 1, count( $result ) ); | |
| 91 | + $this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Group\Iface', $result[1] ); | |
| 92 | + } | |
| 93 | 93 | |
| 94 | 94 | |
| 95 | - public function testSearchItemsException() | |
| 96 | -	{ | |
| 97 | - $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' ) | |
| 98 | - ->setConstructorArgs( array( \TestHelper::getContext() ) ) | |
| 99 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 100 | - ->getMock(); | |
| 95 | + public function testSearchItemsException() | |
| 96 | +    { | |
| 97 | + $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' ) | |
| 98 | + ->setConstructorArgs( array( \TestHelper::getContext() ) ) | |
| 99 | + ->setMethods( array( 'searchItemsBase' ) ) | |
| 100 | + ->getMock(); | |
| 101 | 101 | |
| 102 | - $mock->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 103 | - ->will( $this->throwException( new \Aimeos\MShop\Exception() ) ); | |
| 102 | + $mock->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 103 | + ->will( $this->throwException( new \Aimeos\MShop\Exception() ) ); | |
| 104 | 104 | |
| 105 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 106 | - $mock->searchItems( $mock->createSearch() ); | |
| 107 | - } | |
| 105 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 106 | + $mock->searchItems( $mock->createSearch() ); | |
| 107 | + } | |
| 108 | 108 | } | 
| @@ -18,91 +18,91 @@ | ||
| 18 | 18 | protected function setUp() | 
| 19 | 19 |  	{ | 
| 20 | 20 | $this->context = \TestHelper::getContext(); | 
| 21 | - $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context ); | |
| 21 | + $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish($this->context); | |
| 22 | 22 | |
| 23 | - $this->object = $customer->getSubManager( 'group', 'Ezpublish' ); | |
| 23 | +		$this->object = $customer->getSubManager('group', 'Ezpublish'); | |
| 24 | 24 | } | 
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | protected function tearDown() | 
| 28 | 28 |  	{ | 
| 29 | - unset( $this->object ); | |
| 29 | + unset($this->object); | |
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | public function testCleanup() | 
| 34 | 34 |  	{ | 
| 35 | - $this->object->cleanup( array( -1 ) ); | |
| 35 | + $this->object->cleanup(array( -1 )); | |
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testDeleteItems() | 
| 40 | 40 |  	{ | 
| 41 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 42 | - $this->object->deleteItems( array( -1 ) ); | |
| 41 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 42 | + $this->object->deleteItems(array( -1 )); | |
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | public function testGetSearchAttributes() | 
| 47 | 47 |  	{ | 
| 48 | 48 | $attributes = $this->object->getSearchAttributes(); | 
| 49 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 49 | + $this->assertGreaterThan(0, count($attributes)); | |
| 50 | 50 | |
| 51 | -		foreach( $attributes as $attribute ) { | |
| 52 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); | |
| 51 | +		foreach ($attributes as $attribute) { | |
| 52 | +			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); | |
| 53 | 53 | } | 
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | public function testGetSubManager() | 
| 58 | 58 |  	{ | 
| 59 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 60 | - $this->object->getSubManager( 'unknown' ); | |
| 59 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 60 | +		$this->object->getSubManager('unknown'); | |
| 61 | 61 | } | 
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | public function testSaveItem() | 
| 65 | 65 |  	{ | 
| 66 | - $this->setExpectedException( '\\Aimeos\\MShop\\Customer\\Exception' ); | |
| 67 | - $this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) ); | |
| 66 | +		$this->setExpectedException('\\Aimeos\\MShop\\Customer\\Exception'); | |
| 67 | +		$this->object->saveItem(new \Aimeos\MShop\Common\Item\Lists\Standard('common.lists.')); | |
| 68 | 68 | } | 
| 69 | 69 | |
| 70 | 70 | |
| 71 | 71 | public function testSearchItems() | 
| 72 | 72 |  	{ | 
| 73 | - $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' ) | |
| 74 | - ->setConstructorArgs( array( \TestHelper::getContext() ) ) | |
| 75 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 73 | +		$mock = $this->getMockBuilder('\Aimeos\MShop\Customer\Manager\Group\Ezpublish') | |
| 74 | + ->setConstructorArgs(array(\TestHelper::getContext())) | |
| 75 | +			->setMethods(array('searchItemsBase')) | |
| 76 | 76 | ->getMock(); | 
| 77 | 77 | |
| 78 | - $result = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' ) | |
| 79 | - ->setMethods( array( 'affectedRows', 'fetch', 'finish', 'nextResult' ) ) | |
| 78 | +		$result = $this->getMockBuilder('\Aimeos\MW\DB\Result\Iface') | |
| 79 | +			->setMethods(array('affectedRows', 'fetch', 'finish', 'nextResult')) | |
| 80 | 80 | ->getMock(); | 
| 81 | 81 | |
| 82 | - $mock->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 83 | - ->will( $this->returnValue( $result ) ); | |
| 82 | +		$mock->expects($this->once())->method('searchItemsBase') | |
| 83 | + ->will($this->returnValue($result)); | |
| 84 | 84 | |
| 85 | - $result->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 86 | - ->will( $this->onConsecutiveCalls( array( 'customer.group.id' => 1 ), false ) ); | |
| 85 | +		$result->expects($this->exactly(2))->method('fetch') | |
| 86 | +			->will($this->onConsecutiveCalls(array('customer.group.id' => 1), false)); | |
| 87 | 87 | |
| 88 | - $result = $mock->searchItems( $mock->createSearch() ); | |
| 88 | + $result = $mock->searchItems($mock->createSearch()); | |
| 89 | 89 | |
| 90 | - $this->assertEquals( 1, count( $result ) ); | |
| 91 | - $this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Group\Iface', $result[1] ); | |
| 90 | + $this->assertEquals(1, count($result)); | |
| 91 | +		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Group\Iface', $result[1]); | |
| 92 | 92 | } | 
| 93 | 93 | |
| 94 | 94 | |
| 95 | 95 | public function testSearchItemsException() | 
| 96 | 96 |  	{ | 
| 97 | - $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' ) | |
| 98 | - ->setConstructorArgs( array( \TestHelper::getContext() ) ) | |
| 99 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 97 | +		$mock = $this->getMockBuilder('\Aimeos\MShop\Customer\Manager\Group\Ezpublish') | |
| 98 | + ->setConstructorArgs(array(\TestHelper::getContext())) | |
| 99 | +			->setMethods(array('searchItemsBase')) | |
| 100 | 100 | ->getMock(); | 
| 101 | 101 | |
| 102 | - $mock->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 103 | - ->will( $this->throwException( new \Aimeos\MShop\Exception() ) ); | |
| 102 | +		$mock->expects($this->once())->method('searchItemsBase') | |
| 103 | + ->will($this->throwException(new \Aimeos\MShop\Exception())); | |
| 104 | 104 | |
| 105 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); | |
| 106 | - $mock->searchItems( $mock->createSearch() ); | |
| 105 | +		$this->setExpectedException('\\Aimeos\\MShop\\Exception'); | |
| 106 | + $mock->searchItems($mock->createSearch()); | |
| 107 | 107 | } | 
| 108 | 108 | } | 
| @@ -11,213 +11,213 @@ | ||
| 11 | 11 | |
| 12 | 12 | class EzpublishTest extends \PHPUnit_Framework_TestCase | 
| 13 | 13 |  { | 
| 14 | - private $address; | |
| 15 | - private $context; | |
| 16 | - private $object; | |
| 14 | + private $address; | |
| 15 | + private $context; | |
| 16 | + private $object; | |
| 17 | 17 | |
| 18 | 18 | |
| 19 | - protected function setUp() | |
| 20 | -	{ | |
| 21 | -		if( !interface_exists( 'eZ\Publish\API\Repository\UserService' ) ) { | |
| 22 | - $this->markTestSkipped( 'Install ezsystems/ezpublish-api first' ); | |
| 23 | - } | |
| 19 | + protected function setUp() | |
| 20 | +    { | |
| 21 | +        if( !interface_exists( 'eZ\Publish\API\Repository\UserService' ) ) { | |
| 22 | + $this->markTestSkipped( 'Install ezsystems/ezpublish-api first' ); | |
| 23 | + } | |
| 24 | 24 | |
| 25 | - $this->context = \TestHelper::getContext(); | |
| 25 | + $this->context = \TestHelper::getContext(); | |
| 26 | 26 | |
| 27 | - $this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context ); | |
| 28 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); | |
| 29 | - } | |
| 27 | + $this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context ); | |
| 28 | + $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); | |
| 29 | + } | |
| 30 | 30 | |
| 31 | 31 | |
| 32 | - protected function tearDown() | |
| 33 | -	{ | |
| 34 | - unset( $this->object, $this->context, $this->address ); | |
| 35 | - } | |
| 32 | + protected function tearDown() | |
| 33 | +    { | |
| 34 | + unset( $this->object, $this->context, $this->address ); | |
| 35 | + } | |
| 36 | 36 | |
| 37 | 37 | |
| 38 | - public function testCleanup() | |
| 39 | -	{ | |
| 40 | - $this->object->cleanup( array( -1 ) ); | |
| 41 | - } | |
| 38 | + public function testCleanup() | |
| 39 | +    { | |
| 40 | + $this->object->cleanup( array( -1 ) ); | |
| 41 | + } | |
| 42 | 42 | |
| 43 | 43 | |
| 44 | - public function testCreateItem() | |
| 45 | -	{ | |
| 46 | - $this->assertInstanceOf( 'Aimeos\MShop\Customer\Item\Iface', $this->object->createItem() ); | |
| 47 | - } | |
| 44 | + public function testCreateItem() | |
| 45 | +    { | |
| 46 | + $this->assertInstanceOf( 'Aimeos\MShop\Customer\Item\Iface', $this->object->createItem() ); | |
| 47 | + } | |
| 48 | 48 | |
| 49 | 49 | |
| 50 | - public function testDeleteItems() | |
| 51 | -	{ | |
| 52 | - $mock = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 53 | - $user = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\User' )->getMock(); | |
| 50 | + public function testDeleteItems() | |
| 51 | +    { | |
| 52 | + $mock = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 53 | + $user = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\User' )->getMock(); | |
| 54 | 54 | |
| 55 | - $mock->expects( $this->once() )->method( 'loadUser' )->will( $this->returnValue( $user ) ); | |
| 56 | - $mock->expects( $this->once() )->method( 'deleteUser' ); | |
| 55 | + $mock->expects( $this->once() )->method( 'loadUser' )->will( $this->returnValue( $user ) ); | |
| 56 | + $mock->expects( $this->once() )->method( 'deleteUser' ); | |
| 57 | 57 | |
| 58 | - $this->context->setEzUserService( $mock ); | |
| 59 | - $this->object->deleteItems( array( -1 ) ); | |
| 60 | - } | |
| 58 | + $this->context->setEzUserService( $mock ); | |
| 59 | + $this->object->deleteItems( array( -1 ) ); | |
| 60 | + } | |
| 61 | 61 | |
| 62 | 62 | |
| 63 | - public function testGetSearchAttributes() | |
| 64 | -	{ | |
| 65 | - $attributes = $this->object->getSearchAttributes(); | |
| 66 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 63 | + public function testGetSearchAttributes() | |
| 64 | +    { | |
| 65 | + $attributes = $this->object->getSearchAttributes(); | |
| 66 | + $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 67 | 67 | |
| 68 | -		foreach( $attributes as $attribute ) { | |
| 69 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 70 | - } | |
| 71 | - } | |
| 68 | +        foreach( $attributes as $attribute ) { | |
| 69 | + $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 70 | + } | |
| 71 | + } | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | - public function testGetSubManager() | |
| 75 | -	{ | |
| 76 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager( 'address' ) ); | |
| 77 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); | |
| 74 | + public function testGetSubManager() | |
| 75 | +    { | |
| 76 | + $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager( 'address' ) ); | |
| 77 | + $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); | |
| 78 | 78 | |
| 79 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 80 | - $this->object->getSubManager( 'unknown' ); | |
| 81 | - } | |
| 79 | + $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 80 | + $this->object->getSubManager( 'unknown' ); | |
| 81 | + } | |
| 82 | 82 | |
| 83 | 83 | |
| 84 | - public function testGetSubManagerInvalidName() | |
| 85 | -	{ | |
| 86 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 87 | - $this->object->getSubManager( 'address', 'unknown' ); | |
| 88 | - } | |
| 84 | + public function testGetSubManagerInvalidName() | |
| 85 | +    { | |
| 86 | + $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 87 | + $this->object->getSubManager( 'address', 'unknown' ); | |
| 88 | + } | |
| 89 | 89 | |
| 90 | 90 | |
| 91 | - public function testSaveItemInsert() | |
| 92 | -	{ | |
| 93 | - $service = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 94 | - $struct = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\UserCreateStruct' )->getMock(); | |
| 95 | - $user = $this->getMockBuilder( '\eZ\Publish\API\Repository\Values\User\User' ) | |
| 96 | - ->setMethods( array( 'getUserId', 'getVersionInfo', 'getFieldValue', 'getFields', 'getFieldsByLanguage' ) ) | |
| 97 | - ->getMock(); | |
| 91 | + public function testSaveItemInsert() | |
| 92 | +    { | |
| 93 | + $service = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 94 | + $struct = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\UserCreateStruct' )->getMock(); | |
| 95 | + $user = $this->getMockBuilder( '\eZ\Publish\API\Repository\Values\User\User' ) | |
| 96 | + ->setMethods( array( 'getUserId', 'getVersionInfo', 'getFieldValue', 'getFields', 'getFieldsByLanguage' ) ) | |
| 97 | + ->getMock(); | |
| 98 | 98 | |
| 99 | - $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 100 | - $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 101 | - $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 102 | - $result = $this->getMockBuilder( 'Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 99 | + $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 100 | + $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 101 | + $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 102 | + $result = $this->getMockBuilder( 'Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 103 | 103 | |
| 104 | - $service->expects( $this->once() )->method( 'newUserCreateStruct' )->will( $this->returnValue( $struct ) ); | |
| 105 | - $service->expects( $this->once() )->method( 'createUser' )->will( $this->returnValue( $user ) ); | |
| 106 | - $user->expects( $this->once() )->method( 'getUserId' )->will( $this->returnValue( 1 ) ); | |
| 107 | - $dbm->expects( $this->once() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 108 | - $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 109 | - $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result ) ); | |
| 104 | + $service->expects( $this->once() )->method( 'newUserCreateStruct' )->will( $this->returnValue( $struct ) ); | |
| 105 | + $service->expects( $this->once() )->method( 'createUser' )->will( $this->returnValue( $user ) ); | |
| 106 | + $user->expects( $this->once() )->method( 'getUserId' )->will( $this->returnValue( 1 ) ); | |
| 107 | + $dbm->expects( $this->once() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 108 | + $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 109 | + $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result ) ); | |
| 110 | 110 | |
| 111 | 111 | |
| 112 | - $this->context->setDatabaseManager( $dbm ); | |
| 113 | - $this->context->setEzUserService( $service ); | |
| 112 | + $this->context->setDatabaseManager( $dbm ); | |
| 113 | + $this->context->setEzUserService( $service ); | |
| 114 | 114 | |
| 115 | - $this->object->saveItem( new \Aimeos\MShop\Customer\Item\Standard( $this->address ) ); | |
| 116 | - } | |
| 115 | + $this->object->saveItem( new \Aimeos\MShop\Customer\Item\Standard( $this->address ) ); | |
| 116 | + } | |
| 117 | 117 | |
| 118 | 118 | |
| 119 | - public function testSaveItemUpdate() | |
| 120 | -	{ | |
| 121 | - $service = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 122 | - $user = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\User' )->getMock(); | |
| 123 | - $struct = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\UserUpdateStruct' )->getMock(); | |
| 124 | - $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 125 | - $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 126 | - $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 127 | - $result = $this->getMockBuilder( 'Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 119 | + public function testSaveItemUpdate() | |
| 120 | +    { | |
| 121 | + $service = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 122 | + $user = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\User' )->getMock(); | |
| 123 | + $struct = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\UserUpdateStruct' )->getMock(); | |
| 124 | + $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 125 | + $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 126 | + $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 127 | + $result = $this->getMockBuilder( 'Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 128 | 128 | |
| 129 | - $service->expects( $this->once() )->method( 'updateUser' ); | |
| 130 | - $service->expects( $this->once() )->method( 'loadUser' )->will( $this->returnValue( $user ) ); | |
| 131 | - $service->expects( $this->once() )->method( 'newUserUpdateStruct' )->will( $this->returnValue( $struct ) ); | |
| 132 | - $dbm->expects( $this->once() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 133 | - $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 134 | - $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result ) ); | |
| 135 | - $result->expects( $this->once() )->method( 'finish' ); | |
| 136 | - $dbm->expects( $this->once() )->method( 'release' ); | |
| 129 | + $service->expects( $this->once() )->method( 'updateUser' ); | |
| 130 | + $service->expects( $this->once() )->method( 'loadUser' )->will( $this->returnValue( $user ) ); | |
| 131 | + $service->expects( $this->once() )->method( 'newUserUpdateStruct' )->will( $this->returnValue( $struct ) ); | |
| 132 | + $dbm->expects( $this->once() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 133 | + $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 134 | + $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result ) ); | |
| 135 | + $result->expects( $this->once() )->method( 'finish' ); | |
| 136 | + $dbm->expects( $this->once() )->method( 'release' ); | |
| 137 | 137 | |
| 138 | 138 | |
| 139 | - $item = new \Aimeos\MShop\Customer\Item\Standard( $this->address, array( 'customer.id' => 1 ) ); | |
| 140 | - $item->setStatus( 1 ); | |
| 139 | + $item = new \Aimeos\MShop\Customer\Item\Standard( $this->address, array( 'customer.id' => 1 ) ); | |
| 140 | + $item->setStatus( 1 ); | |
| 141 | 141 | |
| 142 | - $this->context->setDatabaseManager( $dbm ); | |
| 143 | - $this->context->setEzUserService( $service ); | |
| 144 | - $this->object->saveItem( $item ); | |
| 145 | - } | |
| 142 | + $this->context->setDatabaseManager( $dbm ); | |
| 143 | + $this->context->setEzUserService( $service ); | |
| 144 | + $this->object->saveItem( $item ); | |
| 145 | + } | |
| 146 | 146 | |
| 147 | 147 | |
| 148 | - public function testSaveItemInvalidItem() | |
| 149 | -	{ | |
| 150 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 151 | - $this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) ); | |
| 152 | - } | |
| 148 | + public function testSaveItemInvalidItem() | |
| 149 | +    { | |
| 150 | + $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 151 | + $this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) ); | |
| 152 | + } | |
| 153 | 153 | |
| 154 | 154 | |
| 155 | - public function testSaveItemNotModified() | |
| 156 | -	{ | |
| 157 | - $item = new \Aimeos\MShop\Customer\Item\Standard( $this->address, array( 'customer.id' => 1 ) ); | |
| 158 | - $this->object->saveItem( $item ); | |
| 159 | - } | |
| 155 | + public function testSaveItemNotModified() | |
| 156 | +    { | |
| 157 | + $item = new \Aimeos\MShop\Customer\Item\Standard( $this->address, array( 'customer.id' => 1 ) ); | |
| 158 | + $this->object->saveItem( $item ); | |
| 159 | + } | |
| 160 | 160 | |
| 161 | 161 | |
| 162 | - public function testSaveItemInvalidContext() | |
| 163 | -	{ | |
| 164 | - $context = new \Aimeos\MShop\Context\Item\Standard(); | |
| 165 | - $context->setConfig( $this->context->getConfig() ); | |
| 162 | + public function testSaveItemInvalidContext() | |
| 163 | +    { | |
| 164 | + $context = new \Aimeos\MShop\Context\Item\Standard(); | |
| 165 | + $context->setConfig( $this->context->getConfig() ); | |
| 166 | 166 | |
| 167 | - $object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context ); | |
| 167 | + $object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context ); | |
| 168 | 168 | |
| 169 | - $this->setExpectedException( '\Aimeos\MShop\Customer\Exception' ); | |
| 170 | - $object->saveItem( new \Aimeos\MShop\Customer\Item\Standard( $this->address ) ); | |
| 171 | - } | |
| 169 | + $this->setExpectedException( '\Aimeos\MShop\Customer\Exception' ); | |
| 170 | + $object->saveItem( new \Aimeos\MShop\Customer\Item\Standard( $this->address ) ); | |
| 171 | + } | |
| 172 | 172 | |
| 173 | 173 | |
| 174 | - public function testSearchItems() | |
| 175 | -	{ | |
| 176 | - $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Ezpublish' ) | |
| 177 | - ->setConstructorArgs( array( $this->context ) ) | |
| 178 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 179 | - ->getMock(); | |
| 174 | + public function testSearchItems() | |
| 175 | +    { | |
| 176 | + $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Ezpublish' ) | |
| 177 | + ->setConstructorArgs( array( $this->context ) ) | |
| 178 | + ->setMethods( array( 'searchItemsBase' ) ) | |
| 179 | + ->getMock(); | |
| 180 | 180 | |
| 181 | - $result1 = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 181 | + $result1 = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 182 | 182 | |
| 183 | - $mock->expects( $this->once() )->method( 'searchItemsBase' )->will( $this->returnValue( $result1 ) ); | |
| 184 | - $result1->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 185 | - ->will( $this->onConsecutiveCalls( array( 'customer.id' => -1 ), false ) ); | |
| 183 | + $mock->expects( $this->once() )->method( 'searchItemsBase' )->will( $this->returnValue( $result1 ) ); | |
| 184 | + $result1->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 185 | + ->will( $this->onConsecutiveCalls( array( 'customer.id' => -1 ), false ) ); | |
| 186 | 186 | |
| 187 | 187 | |
| 188 | - $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 189 | - $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 190 | - $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 191 | - $result2 = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 188 | + $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 189 | + $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 190 | + $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 191 | + $result2 = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 192 | 192 | |
| 193 | - $dbm->expects( $this->any() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 194 | - $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 195 | - $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result2 ) ); | |
| 196 | - $result2->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 197 | - ->will( $this->onConsecutiveCalls( array( 'contentobject_id' => -1, 'role_id' => -2 ), false ) ); | |
| 193 | + $dbm->expects( $this->any() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 194 | + $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 195 | + $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result2 ) ); | |
| 196 | + $result2->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 197 | + ->will( $this->onConsecutiveCalls( array( 'contentobject_id' => -1, 'role_id' => -2 ), false ) ); | |
| 198 | 198 | |
| 199 | - $dbm->expects( $this->any() )->method( 'release' ); | |
| 199 | + $dbm->expects( $this->any() )->method( 'release' ); | |
| 200 | 200 | |
| 201 | 201 | |
| 202 | - $this->context->setDatabaseManager( $dbm ); | |
| 203 | - $list = $mock->searchItems( $mock->createSearch() ); | |
| 202 | + $this->context->setDatabaseManager( $dbm ); | |
| 203 | + $list = $mock->searchItems( $mock->createSearch() ); | |
| 204 | 204 | |
| 205 | - $this->assertEquals( 1, count( $list ) ); | |
| 206 | - $this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $list[-1] ); | |
| 207 | - } | |
| 205 | + $this->assertEquals( 1, count( $list ) ); | |
| 206 | + $this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $list[-1] ); | |
| 207 | + } | |
| 208 | 208 | |
| 209 | 209 | |
| 210 | - public function testSearchItemsException() | |
| 211 | -	{ | |
| 212 | - $object = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Ezpublish' ) | |
| 213 | - ->setConstructorArgs( array( $this->context ) ) | |
| 214 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 215 | - ->getMock(); | |
| 210 | + public function testSearchItemsException() | |
| 211 | +    { | |
| 212 | + $object = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Ezpublish' ) | |
| 213 | + ->setConstructorArgs( array( $this->context ) ) | |
| 214 | + ->setMethods( array( 'searchItemsBase' ) ) | |
| 215 | + ->getMock(); | |
| 216 | 216 | |
| 217 | - $object->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 218 | - ->will( $this->throwException( new \Aimeos\MShop\Exception() ) ); | |
| 217 | + $object->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 218 | + ->will( $this->throwException( new \Aimeos\MShop\Exception() ) ); | |
| 219 | 219 | |
| 220 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 221 | - $object->searchItems( $object->createSearch() ); | |
| 222 | - } | |
| 220 | + $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 221 | + $object->searchItems( $object->createSearch() ); | |
| 222 | + } | |
| 223 | 223 | } | 
| @@ -18,206 +18,206 @@ | ||
| 18 | 18 | |
| 19 | 19 | protected function setUp() | 
| 20 | 20 |  	{ | 
| 21 | -		if( !interface_exists( 'eZ\Publish\API\Repository\UserService' ) ) { | |
| 22 | - $this->markTestSkipped( 'Install ezsystems/ezpublish-api first' ); | |
| 21 | +		if (!interface_exists('eZ\Publish\API\Repository\UserService')) { | |
| 22 | +			$this->markTestSkipped('Install ezsystems/ezpublish-api first'); | |
| 23 | 23 | } | 
| 24 | 24 | |
| 25 | 25 | $this->context = \TestHelper::getContext(); | 
| 26 | 26 | |
| 27 | - $this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context ); | |
| 28 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); | |
| 27 | + $this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish($this->context); | |
| 28 | +		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.'); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | protected function tearDown() | 
| 33 | 33 |  	{ | 
| 34 | - unset( $this->object, $this->context, $this->address ); | |
| 34 | + unset($this->object, $this->context, $this->address); | |
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | public function testCleanup() | 
| 39 | 39 |  	{ | 
| 40 | - $this->object->cleanup( array( -1 ) ); | |
| 40 | + $this->object->cleanup(array( -1 )); | |
| 41 | 41 | } | 
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function testCreateItem() | 
| 45 | 45 |  	{ | 
| 46 | - $this->assertInstanceOf( 'Aimeos\MShop\Customer\Item\Iface', $this->object->createItem() ); | |
| 46 | +		$this->assertInstanceOf('Aimeos\MShop\Customer\Item\Iface', $this->object->createItem()); | |
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | public function testDeleteItems() | 
| 51 | 51 |  	{ | 
| 52 | - $mock = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 53 | - $user = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\User' )->getMock(); | |
| 52 | +		$mock = $this->getMockBuilder('eZ\Publish\API\Repository\UserService')->getMock(); | |
| 53 | +		$user = $this->getMockBuilder('eZ\Publish\API\Repository\Values\User\User')->getMock(); | |
| 54 | 54 | |
| 55 | - $mock->expects( $this->once() )->method( 'loadUser' )->will( $this->returnValue( $user ) ); | |
| 56 | - $mock->expects( $this->once() )->method( 'deleteUser' ); | |
| 55 | +		$mock->expects($this->once())->method('loadUser')->will($this->returnValue($user)); | |
| 56 | +		$mock->expects($this->once())->method('deleteUser'); | |
| 57 | 57 | |
| 58 | - $this->context->setEzUserService( $mock ); | |
| 59 | - $this->object->deleteItems( array( -1 ) ); | |
| 58 | + $this->context->setEzUserService($mock); | |
| 59 | + $this->object->deleteItems(array( -1 )); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | public function testGetSearchAttributes() | 
| 64 | 64 |  	{ | 
| 65 | 65 | $attributes = $this->object->getSearchAttributes(); | 
| 66 | - $this->assertGreaterThan( 0, count( $attributes ) ); | |
| 66 | + $this->assertGreaterThan(0, count($attributes)); | |
| 67 | 67 | |
| 68 | -		foreach( $attributes as $attribute ) { | |
| 69 | - $this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute ); | |
| 68 | +		foreach ($attributes as $attribute) { | |
| 69 | +			$this->assertInstanceOf('\Aimeos\MW\Criteria\Attribute\Iface', $attribute); | |
| 70 | 70 | } | 
| 71 | 71 | } | 
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | public function testGetSubManager() | 
| 75 | 75 |  	{ | 
| 76 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager( 'address' ) ); | |
| 77 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); | |
| 76 | +		$this->assertInstanceOf('\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager('address')); | |
| 77 | +		$this->assertInstanceOf('\Aimeos\MShop\Common\Manager\Iface', $this->object->getSubManager('address', 'Standard')); | |
| 78 | 78 | |
| 79 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 80 | - $this->object->getSubManager( 'unknown' ); | |
| 79 | +		$this->setExpectedException('\Aimeos\MShop\Exception'); | |
| 80 | +		$this->object->getSubManager('unknown'); | |
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | public function testGetSubManagerInvalidName() | 
| 85 | 85 |  	{ | 
| 86 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 87 | - $this->object->getSubManager( 'address', 'unknown' ); | |
| 86 | +		$this->setExpectedException('\Aimeos\MShop\Exception'); | |
| 87 | +		$this->object->getSubManager('address', 'unknown'); | |
| 88 | 88 | } | 
| 89 | 89 | |
| 90 | 90 | |
| 91 | 91 | public function testSaveItemInsert() | 
| 92 | 92 |  	{ | 
| 93 | - $service = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 94 | - $struct = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\UserCreateStruct' )->getMock(); | |
| 95 | - $user = $this->getMockBuilder( '\eZ\Publish\API\Repository\Values\User\User' ) | |
| 96 | - ->setMethods( array( 'getUserId', 'getVersionInfo', 'getFieldValue', 'getFields', 'getFieldsByLanguage' ) ) | |
| 93 | +		$service = $this->getMockBuilder('eZ\Publish\API\Repository\UserService')->getMock(); | |
| 94 | +		$struct = $this->getMockBuilder('eZ\Publish\API\Repository\Values\User\UserCreateStruct')->getMock(); | |
| 95 | +		$user = $this->getMockBuilder('\eZ\Publish\API\Repository\Values\User\User') | |
| 96 | +			->setMethods(array('getUserId', 'getVersionInfo', 'getFieldValue', 'getFields', 'getFieldsByLanguage')) | |
| 97 | 97 | ->getMock(); | 
| 98 | 98 | |
| 99 | - $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 100 | - $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 101 | - $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 102 | - $result = $this->getMockBuilder( 'Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 99 | +		$dbm = $this->getMockBuilder('Aimeos\MW\DB\Manager\Iface')->getMock(); | |
| 100 | +		$conn = $this->getMockBuilder('Aimeos\MW\DB\Connection\Iface')->getMock(); | |
| 101 | +		$stmt = $this->getMockBuilder('Aimeos\MW\DB\Statement\Iface')->getMock(); | |
| 102 | +		$result = $this->getMockBuilder('Aimeos\MW\DB\Result\Iface')->getMock(); | |
| 103 | 103 | |
| 104 | - $service->expects( $this->once() )->method( 'newUserCreateStruct' )->will( $this->returnValue( $struct ) ); | |
| 105 | - $service->expects( $this->once() )->method( 'createUser' )->will( $this->returnValue( $user ) ); | |
| 106 | - $user->expects( $this->once() )->method( 'getUserId' )->will( $this->returnValue( 1 ) ); | |
| 107 | - $dbm->expects( $this->once() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 108 | - $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 109 | - $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result ) ); | |
| 104 | +		$service->expects($this->once())->method('newUserCreateStruct')->will($this->returnValue($struct)); | |
| 105 | +		$service->expects($this->once())->method('createUser')->will($this->returnValue($user)); | |
| 106 | +		$user->expects($this->once())->method('getUserId')->will($this->returnValue(1)); | |
| 107 | +		$dbm->expects($this->once())->method('acquire')->will($this->returnValue($conn)); | |
| 108 | +		$conn->expects($this->once())->method('create')->will($this->returnValue($stmt)); | |
| 109 | +		$stmt->expects($this->once())->method('execute')->will($this->returnValue($result)); | |
| 110 | 110 | |
| 111 | 111 | |
| 112 | - $this->context->setDatabaseManager( $dbm ); | |
| 113 | - $this->context->setEzUserService( $service ); | |
| 112 | + $this->context->setDatabaseManager($dbm); | |
| 113 | + $this->context->setEzUserService($service); | |
| 114 | 114 | |
| 115 | - $this->object->saveItem( new \Aimeos\MShop\Customer\Item\Standard( $this->address ) ); | |
| 115 | + $this->object->saveItem(new \Aimeos\MShop\Customer\Item\Standard($this->address)); | |
| 116 | 116 | } | 
| 117 | 117 | |
| 118 | 118 | |
| 119 | 119 | public function testSaveItemUpdate() | 
| 120 | 120 |  	{ | 
| 121 | - $service = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock(); | |
| 122 | - $user = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\User' )->getMock(); | |
| 123 | - $struct = $this->getMockBuilder( 'eZ\Publish\API\Repository\Values\User\UserUpdateStruct' )->getMock(); | |
| 124 | - $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 125 | - $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 126 | - $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 127 | - $result = $this->getMockBuilder( 'Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 128 | - | |
| 129 | - $service->expects( $this->once() )->method( 'updateUser' ); | |
| 130 | - $service->expects( $this->once() )->method( 'loadUser' )->will( $this->returnValue( $user ) ); | |
| 131 | - $service->expects( $this->once() )->method( 'newUserUpdateStruct' )->will( $this->returnValue( $struct ) ); | |
| 132 | - $dbm->expects( $this->once() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 133 | - $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 134 | - $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result ) ); | |
| 135 | - $result->expects( $this->once() )->method( 'finish' ); | |
| 136 | - $dbm->expects( $this->once() )->method( 'release' ); | |
| 137 | - | |
| 138 | - | |
| 139 | - $item = new \Aimeos\MShop\Customer\Item\Standard( $this->address, array( 'customer.id' => 1 ) ); | |
| 140 | - $item->setStatus( 1 ); | |
| 141 | - | |
| 142 | - $this->context->setDatabaseManager( $dbm ); | |
| 143 | - $this->context->setEzUserService( $service ); | |
| 144 | - $this->object->saveItem( $item ); | |
| 121 | +		$service = $this->getMockBuilder('eZ\Publish\API\Repository\UserService')->getMock(); | |
| 122 | +		$user = $this->getMockBuilder('eZ\Publish\API\Repository\Values\User\User')->getMock(); | |
| 123 | +		$struct = $this->getMockBuilder('eZ\Publish\API\Repository\Values\User\UserUpdateStruct')->getMock(); | |
| 124 | +		$dbm = $this->getMockBuilder('Aimeos\MW\DB\Manager\Iface')->getMock(); | |
| 125 | +		$conn = $this->getMockBuilder('Aimeos\MW\DB\Connection\Iface')->getMock(); | |
| 126 | +		$stmt = $this->getMockBuilder('Aimeos\MW\DB\Statement\Iface')->getMock(); | |
| 127 | +		$result = $this->getMockBuilder('Aimeos\MW\DB\Result\Iface')->getMock(); | |
| 128 | + | |
| 129 | +		$service->expects($this->once())->method('updateUser'); | |
| 130 | +		$service->expects($this->once())->method('loadUser')->will($this->returnValue($user)); | |
| 131 | +		$service->expects($this->once())->method('newUserUpdateStruct')->will($this->returnValue($struct)); | |
| 132 | +		$dbm->expects($this->once())->method('acquire')->will($this->returnValue($conn)); | |
| 133 | +		$conn->expects($this->once())->method('create')->will($this->returnValue($stmt)); | |
| 134 | +		$stmt->expects($this->once())->method('execute')->will($this->returnValue($result)); | |
| 135 | +		$result->expects($this->once())->method('finish'); | |
| 136 | +		$dbm->expects($this->once())->method('release'); | |
| 137 | + | |
| 138 | + | |
| 139 | +		$item = new \Aimeos\MShop\Customer\Item\Standard($this->address, array('customer.id' => 1)); | |
| 140 | + $item->setStatus(1); | |
| 141 | + | |
| 142 | + $this->context->setDatabaseManager($dbm); | |
| 143 | + $this->context->setEzUserService($service); | |
| 144 | + $this->object->saveItem($item); | |
| 145 | 145 | } | 
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | public function testSaveItemInvalidItem() | 
| 149 | 149 |  	{ | 
| 150 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 151 | - $this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) ); | |
| 150 | +		$this->setExpectedException('\Aimeos\MShop\Exception'); | |
| 151 | +		$this->object->saveItem(new \Aimeos\MShop\Common\Item\Lists\Standard('common.lists.')); | |
| 152 | 152 | } | 
| 153 | 153 | |
| 154 | 154 | |
| 155 | 155 | public function testSaveItemNotModified() | 
| 156 | 156 |  	{ | 
| 157 | - $item = new \Aimeos\MShop\Customer\Item\Standard( $this->address, array( 'customer.id' => 1 ) ); | |
| 158 | - $this->object->saveItem( $item ); | |
| 157 | +		$item = new \Aimeos\MShop\Customer\Item\Standard($this->address, array('customer.id' => 1)); | |
| 158 | + $this->object->saveItem($item); | |
| 159 | 159 | } | 
| 160 | 160 | |
| 161 | 161 | |
| 162 | 162 | public function testSaveItemInvalidContext() | 
| 163 | 163 |  	{ | 
| 164 | 164 | $context = new \Aimeos\MShop\Context\Item\Standard(); | 
| 165 | - $context->setConfig( $this->context->getConfig() ); | |
| 165 | + $context->setConfig($this->context->getConfig()); | |
| 166 | 166 | |
| 167 | - $object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context ); | |
| 167 | + $object = new \Aimeos\MShop\Customer\Manager\Ezpublish($context); | |
| 168 | 168 | |
| 169 | - $this->setExpectedException( '\Aimeos\MShop\Customer\Exception' ); | |
| 170 | - $object->saveItem( new \Aimeos\MShop\Customer\Item\Standard( $this->address ) ); | |
| 169 | +		$this->setExpectedException('\Aimeos\MShop\Customer\Exception'); | |
| 170 | + $object->saveItem(new \Aimeos\MShop\Customer\Item\Standard($this->address)); | |
| 171 | 171 | } | 
| 172 | 172 | |
| 173 | 173 | |
| 174 | 174 | public function testSearchItems() | 
| 175 | 175 |  	{ | 
| 176 | - $mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Ezpublish' ) | |
| 177 | - ->setConstructorArgs( array( $this->context ) ) | |
| 178 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 176 | +		$mock = $this->getMockBuilder('\Aimeos\MShop\Customer\Manager\Ezpublish') | |
| 177 | + ->setConstructorArgs(array($this->context)) | |
| 178 | +			->setMethods(array('searchItemsBase')) | |
| 179 | 179 | ->getMock(); | 
| 180 | 180 | |
| 181 | - $result1 = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 181 | +		$result1 = $this->getMockBuilder('\Aimeos\MW\DB\Result\Iface')->getMock(); | |
| 182 | 182 | |
| 183 | - $mock->expects( $this->once() )->method( 'searchItemsBase' )->will( $this->returnValue( $result1 ) ); | |
| 184 | - $result1->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 185 | - ->will( $this->onConsecutiveCalls( array( 'customer.id' => -1 ), false ) ); | |
| 183 | +		$mock->expects($this->once())->method('searchItemsBase')->will($this->returnValue($result1)); | |
| 184 | +		$result1->expects($this->exactly(2))->method('fetch') | |
| 185 | +			->will($this->onConsecutiveCalls(array('customer.id' => -1), false)); | |
| 186 | 186 | |
| 187 | 187 | |
| 188 | - $dbm = $this->getMockBuilder( 'Aimeos\MW\DB\Manager\Iface' )->getMock(); | |
| 189 | - $conn = $this->getMockBuilder( 'Aimeos\MW\DB\Connection\Iface' )->getMock(); | |
| 190 | - $stmt = $this->getMockBuilder( 'Aimeos\MW\DB\Statement\Iface' )->getMock(); | |
| 191 | - $result2 = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )->getMock(); | |
| 188 | +		$dbm = $this->getMockBuilder('Aimeos\MW\DB\Manager\Iface')->getMock(); | |
| 189 | +		$conn = $this->getMockBuilder('Aimeos\MW\DB\Connection\Iface')->getMock(); | |
| 190 | +		$stmt = $this->getMockBuilder('Aimeos\MW\DB\Statement\Iface')->getMock(); | |
| 191 | +		$result2 = $this->getMockBuilder('\Aimeos\MW\DB\Result\Iface')->getMock(); | |
| 192 | 192 | |
| 193 | - $dbm->expects( $this->any() )->method( 'acquire' )->will( $this->returnValue( $conn ) ); | |
| 194 | - $conn->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $stmt ) ); | |
| 195 | - $stmt->expects( $this->once() )->method( 'execute' )->will( $this->returnValue( $result2 ) ); | |
| 196 | - $result2->expects( $this->exactly( 2 ) )->method( 'fetch' ) | |
| 197 | - ->will( $this->onConsecutiveCalls( array( 'contentobject_id' => -1, 'role_id' => -2 ), false ) ); | |
| 193 | +		$dbm->expects($this->any())->method('acquire')->will($this->returnValue($conn)); | |
| 194 | +		$conn->expects($this->once())->method('create')->will($this->returnValue($stmt)); | |
| 195 | +		$stmt->expects($this->once())->method('execute')->will($this->returnValue($result2)); | |
| 196 | +		$result2->expects($this->exactly(2))->method('fetch') | |
| 197 | +			->will($this->onConsecutiveCalls(array('contentobject_id' => -1, 'role_id' => -2), false)); | |
| 198 | 198 | |
| 199 | - $dbm->expects( $this->any() )->method( 'release' ); | |
| 199 | +		$dbm->expects($this->any())->method('release'); | |
| 200 | 200 | |
| 201 | 201 | |
| 202 | - $this->context->setDatabaseManager( $dbm ); | |
| 203 | - $list = $mock->searchItems( $mock->createSearch() ); | |
| 202 | + $this->context->setDatabaseManager($dbm); | |
| 203 | + $list = $mock->searchItems($mock->createSearch()); | |
| 204 | 204 | |
| 205 | - $this->assertEquals( 1, count( $list ) ); | |
| 206 | - $this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $list[-1] ); | |
| 205 | + $this->assertEquals(1, count($list)); | |
| 206 | +		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $list[-1]); | |
| 207 | 207 | } | 
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | public function testSearchItemsException() | 
| 211 | 211 |  	{ | 
| 212 | - $object = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Ezpublish' ) | |
| 213 | - ->setConstructorArgs( array( $this->context ) ) | |
| 214 | - ->setMethods( array( 'searchItemsBase' ) ) | |
| 212 | +		$object = $this->getMockBuilder('\Aimeos\MShop\Customer\Manager\Ezpublish') | |
| 213 | + ->setConstructorArgs(array($this->context)) | |
| 214 | +			->setMethods(array('searchItemsBase')) | |
| 215 | 215 | ->getMock(); | 
| 216 | 216 | |
| 217 | - $object->expects( $this->once() )->method( 'searchItemsBase' ) | |
| 218 | - ->will( $this->throwException( new \Aimeos\MShop\Exception() ) ); | |
| 217 | +		$object->expects($this->once())->method('searchItemsBase') | |
| 218 | + ->will($this->throwException(new \Aimeos\MShop\Exception())); | |
| 219 | 219 | |
| 220 | - $this->setExpectedException( '\Aimeos\MShop\Exception' ); | |
| 221 | - $object->searchItems( $object->createSearch() ); | |
| 220 | +		$this->setExpectedException('\Aimeos\MShop\Exception'); | |
| 221 | + $object->searchItems($object->createSearch()); | |
| 222 | 222 | } | 
| 223 | 223 | } |