diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php index e14c767..03eb4aa 100644 --- a/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Users.php @@ -140,8 +140,25 @@ public function load() { 'init', 'data', )) - ->execute(); + ->values(array( + 'uid' => '2', + 'name' => 'Odo', + 'pass' => '$S$DwNxkEAljElEHziE84ou59zp1jaSRrRmYYOwjDMCL2u8yHLkwDtO', + 'mail' => 'odo@local.host', + 'theme' => '', + 'signature' => '', + 'signature_format' => 'filtered_html', + 'created' => '1438027199', + 'access' => '0', + 'login' => '0', + 'status' => '1', + 'timezone' => 'America/Chicago', + 'language' => '', + 'picture' => '0', + 'init' => 'odo@local.host', + 'data' => 'a:1:{s:7:"contact";i:1;}', + ))->execute(); } } -#c4f52bf31f5fe27b4742639dea21039a +#e5dcc4cf9125b32fffbabbe8b45498d8 diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php index 9f3482c..c05d335 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php @@ -147,10 +147,10 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase { 'd6_user_profile_entity_display', 'd6_user_profile_entity_form_display', 'd6_user_profile_field', - 'd6_user_picture_entity_display', - 'd6_user_picture_entity_form_display', - 'd6_user_picture_field_instance', - 'd6_user_picture_field', + 'user_picture_entity_display', + 'user_picture_entity_form_display', + 'user_picture_field_instance', + 'user_picture_field', 'd6_user_picture_file', 'd6_user_role', 'd6_user_settings', diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml index 05ff4a0..e36c7f3 100644 --- a/core/modules/user/migration_templates/d6_user.yml +++ b/core/modules/user/migration_templates/d6_user.yml @@ -32,6 +32,6 @@ migration_dependencies: required: - d6_user_role optional: - - d6_user_picture_file - - d6_user_picture_entity_display - - d6_user_picture_entity_form_display + - d6_user_picture_file + - user_picture_entity_display + - user_picture_entity_form_display diff --git a/core/modules/user/migration_templates/d6_user_picture_entity_display.yml b/core/modules/user/migration_templates/d6_user_picture_entity_display.yml deleted file mode 100644 index f38bc36..0000000 --- a/core/modules/user/migration_templates/d6_user_picture_entity_display.yml +++ /dev/null @@ -1,30 +0,0 @@ -id: d6_user_picture_entity_display -label: Drupal 6 user picture display configuration -migration_tags: - - Drupal 6 -source: - plugin: d6_user_picture_instance - constants: - entity_type: user - bundle: user - view_mode: default - name: user_picture - type: image - options: - label: hidden - settings: - image_style: '' - image_link: content -process: - entity_type: 'constants/entity_type' - bundle: 'constants/bundle' - view_mode: 'constants/view_mode' - field_name: 'constants/name' - type: 'constants/type' - options: 'constants/options' - 'options/type': @type -destination: - plugin: component_entity_display -migration_dependencies: - required: - - d6_user_picture_field_instance diff --git a/core/modules/user/migration_templates/d6_user_picture_entity_form_display.yml b/core/modules/user/migration_templates/d6_user_picture_entity_form_display.yml deleted file mode 100644 index 4e42228..0000000 --- a/core/modules/user/migration_templates/d6_user_picture_entity_form_display.yml +++ /dev/null @@ -1,29 +0,0 @@ -id: d6_user_picture_entity_form_display -label: Drupal 6 user picture form display configuration -migration_tags: - - Drupal 6 -source: - plugin: d6_user_picture_instance - constants: - entity_type: user - bundle: user - form_mode: default - name: user_picture - type: image_image - options: - settings: - progress_indicator: throbber - preview_image_style: thumbnail -process: - entity_type: 'constants/entity_type' - bundle: 'constants/bundle' - field_name: 'constants/name' - form_mode: 'constants/form_mode' - type: 'constants/type' - options: 'constants/options' - 'options/type': @type -destination: - plugin: component_entity_form_display -migration_dependencies: - required: - - d6_user_picture_field_instance diff --git a/core/modules/user/migration_templates/d6_user_picture_field.yml b/core/modules/user/migration_templates/d6_user_picture_field.yml deleted file mode 100644 index 27a39a2..0000000 --- a/core/modules/user/migration_templates/d6_user_picture_field.yml +++ /dev/null @@ -1,20 +0,0 @@ -id: d6_user_picture_field -label: Drupal 6 user picture field configuration -migration_tags: - - Drupal 6 -source: - # We do an empty source and a proper destination to have an idmap for - # dependencies. - plugin: md_empty - constants: - entity_type: user - type: image - name: user_picture - cardinality: 1 -process: - entity_type: 'constants/entity_type' - field_name: 'constants/name' - type: 'constants/type' - cardinality: 'constants/cardinality' -destination: - plugin: md_entity:field_storage_config diff --git a/core/modules/user/migration_templates/d6_user_picture_field_instance.yml b/core/modules/user/migration_templates/d6_user_picture_field_instance.yml deleted file mode 100644 index 7dc83b1..0000000 --- a/core/modules/user/migration_templates/d6_user_picture_field_instance.yml +++ /dev/null @@ -1,30 +0,0 @@ -id: d6_user_picture_field_instance -label: Drupal 6 user picture field instance configuration -migration_tags: - - Drupal 6 -source: - plugin: d6_user_picture_instance - constants: - entity_type: user - bundle: user - name: user_picture - settings: - file_extensions: 'png gif jpg jpeg' - alt_field: false - title_field: false - min_resolution: '' - alt_field_required: false - title_field_required: false -process: - entity_type: 'constants/entity_type' - bundle: 'constants/bundle' - field_name: 'constants/name' - settings: 'constants/settings' - 'settings/file_directory': file_directory - 'settings/max_filesize': max_filesize - 'settings/max_resolution': max_resolution -destination: - plugin: entity:field_config -migration_dependencies: - required: - - d6_user_picture_field diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml new file mode 100755 index 0000000..13c85bb --- /dev/null +++ b/core/modules/user/migration_templates/d7_user.yml @@ -0,0 +1,34 @@ +id: d7_user +migration_tags: + - Drupal 7 +source: + plugin: d7_user +destination: + plugin: entity:user +process: + uid: uid + name: name + pass: pass + mail: mail + status: status + created: created + changed: changed + access: access + login: login + timezone: timezone + langcode: language + preferred_langcode: language + preferred_admin_langcode: language + picture: picture + init: init + roles: + plugin: migration + migration: d7_user_role + source: roles +migration_dependencies: + required: + - d7_user_role + optional: + # User pictures are references to file_managed, so if the d7_file migration + # (which migrates the entire file_managed table) exists, run it first. + - d7_file diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migration_templates/d7_user_flood.yml new file mode 100755 index 0000000..016acec --- /dev/null +++ b/core/modules/user/migration_templates/d7_user_flood.yml @@ -0,0 +1,20 @@ +id: d7_user_flood +migration_tags: + - Drupal 7 +source: + plugin: variable + variables: + - user_failed_login_identifier_uid_only + - user_failed_login_ip_limit + - user_failed_login_ip_window + - user_failed_login_user_window + - user_failed_login_user_limit +process: + uid_only: user_failed_login_identifier_uid_only + ip_limit: user_failed_login_ip_limit + ip_window: user_failed_login_ip_window + user_limit: user_failed_login_user_limit + user_window: user_failed_login_user_window +destination: + plugin: config + config_name: user.flood diff --git a/core/modules/user/migration_templates/d7_user_mail.yml b/core/modules/user/migration_templates/d7_user_mail.yml new file mode 100644 index 0000000..246d57c --- /dev/null +++ b/core/modules/user/migration_templates/d7_user_mail.yml @@ -0,0 +1,39 @@ +id: d7_user_mail +label: Drupal 7 user mail configuration +migration_tags: + - Drupal 7 +source: + plugin: variable + variables: + - user_mail_status_activated_subject + - user_mail_status_activated_body + - user_mail_password_reset_subject + - user_mail_password_reset_body + - user_mail_status_deleted_subject + - user_mail_status_deleted_body + - user_mail_register_admin_created_subject + - user_mail_register_admin_created_body + - user_mail_register_no_approval_required_subject + - user_mail_register_no_approval_required_body + - user_mail_user_mail_register_pending_approval_subject + - user_mail_user_mail_register_pending_approval_body + - user_mail_status_blocked_subject + - user_mail_status_blocked_body +process: + 'status_activated/subject': user_mail_status_activated_subject + 'status_activated/body': user_mail_status_activated_body + 'password_reset/subject': user_mail_password_reset_subject + 'password_reset/body': user_mail_password_reset_body + 'cancel_confirm/subject': user_mail_status_deleted_subject + 'cancel_confirm/body': user_mail_status_deleted_body + 'register_admin_created/subject': user_mail_register_admin_created_subject + 'register_admin_created/body': user_mail_register_admin_created_body + 'register_no_approval_required/subject': user_mail_register_no_approval_required_subject + 'register_no_approval_required/body': user_mail_register_no_approval_required_body + 'register_pending_approval/subject': user_mail_user_mail_register_pending_approval_subject + 'register_pending_approval/body': user_mail_user_mail_register_pending_approval_body + 'status_blocked/subject': user_mail_status_blocked_subject + 'status_blocked/body': user_mail_status_blocked_body +destination: + plugin: config + config_name: user.mail diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migration_templates/d7_user_role.yml new file mode 100755 index 0000000..0209b6a --- /dev/null +++ b/core/modules/user/migration_templates/d7_user_role.yml @@ -0,0 +1,43 @@ +id: d7_user_role +label: Drupal 7 user roles +migration_tags: + - Drupal 7 +source: + plugin: d7_user_role +process: + id: + - + plugin: machine_name + source: name + - + plugin: dedupe_entity + entity_type: user_role + field: id + length: 32 + label: name + permissions: + - + plugin: static_map + source: permissions + bypass: true + map: + 'use PHP for block visibility': 'use PHP for settings' + 'administer site-wide contact form': 'administer contact forms' + 'post comments without approval': 'skip comment approval' + 'edit own blog entries' : 'edit own blog content' + 'edit any blog entry' : 'edit any blog content' + 'delete own blog entries' : 'delete own blog content' + 'delete any blog entry' : 'delete any blog content' + 'create forum topics' : 'create forum content' + 'delete any forum topic' : 'delete any forum content' + 'delete own forum topics' : 'delete own forum content' + 'edit any forum topic' : 'edit any forum content' + 'edit own forum topics' : 'edit own forum content' + # - plugin: system_update_7000 + # - plugin: node_update_7008 + - plugin: flatten +destination: + plugin: entity:user_role +migration_dependencies: + optional: + - d7_filter_format diff --git a/core/modules/user/migration_templates/user_picture_entity_display.yml b/core/modules/user/migration_templates/user_picture_entity_display.yml new file mode 100644 index 0000000..78c0ae0 --- /dev/null +++ b/core/modules/user/migration_templates/user_picture_entity_display.yml @@ -0,0 +1,31 @@ +id: user_picture_entity_display +label: User picture display configuration +migration_tags: + - Drupal 6 + - Drupal 7 +source: + plugin: user_picture_instance + constants: + entity_type: user + bundle: user + view_mode: default + name: user_picture + type: image + options: + label: hidden + settings: + image_style: '' + image_link: content +process: + entity_type: 'constants/entity_type' + bundle: 'constants/bundle' + view_mode: 'constants/view_mode' + field_name: 'constants/name' + type: 'constants/type' + options: 'constants/options' + 'options/type': @type +destination: + plugin: component_entity_display +migration_dependencies: + required: + - user_picture_field_instance diff --git a/core/modules/user/migration_templates/user_picture_entity_form_display.yml b/core/modules/user/migration_templates/user_picture_entity_form_display.yml new file mode 100644 index 0000000..60d782f --- /dev/null +++ b/core/modules/user/migration_templates/user_picture_entity_form_display.yml @@ -0,0 +1,30 @@ +id: user_picture_entity_form_display +label: User picture form display configuration +migration_tags: + - Drupal 6 + - Drupal 7 +source: + plugin: user_picture_instance + constants: + entity_type: user + bundle: user + form_mode: default + name: user_picture + type: image_image + options: + settings: + progress_indicator: throbber + preview_image_style: thumbnail +process: + entity_type: 'constants/entity_type' + bundle: 'constants/bundle' + field_name: 'constants/name' + form_mode: 'constants/form_mode' + type: 'constants/type' + options: 'constants/options' + 'options/type': @type +destination: + plugin: component_entity_form_display +migration_dependencies: + required: + - user_picture_field_instance diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml new file mode 100644 index 0000000..a484ab8 --- /dev/null +++ b/core/modules/user/migration_templates/user_picture_field.yml @@ -0,0 +1,21 @@ +id: user_picture_field +label: User picture field configuration +migration_tags: + - Drupal 6 + - Drupal 7 +source: + # We do an empty source and a proper destination to have an idmap for + # dependencies. + plugin: md_empty + constants: + entity_type: user + type: image + name: user_picture + cardinality: 1 +process: + entity_type: 'constants/entity_type' + field_name: 'constants/name' + type: 'constants/type' + cardinality: 'constants/cardinality' +destination: + plugin: md_entity:field_storage_config diff --git a/core/modules/user/migration_templates/user_picture_field_instance.yml b/core/modules/user/migration_templates/user_picture_field_instance.yml new file mode 100644 index 0000000..4332e09 --- /dev/null +++ b/core/modules/user/migration_templates/user_picture_field_instance.yml @@ -0,0 +1,31 @@ +id: user_picture_field_instance +label: User picture field instance configuration +migration_tags: + - Drupal 6 + - Drupal 7 +source: + plugin: user_picture_instance + constants: + entity_type: user + bundle: user + name: user_picture + settings: + file_extensions: 'png gif jpg jpeg' + alt_field: false + title_field: false + min_resolution: '' + alt_field_required: false + title_field_required: false +process: + entity_type: 'constants/entity_type' + bundle: 'constants/bundle' + field_name: 'constants/name' + settings: 'constants/settings' + 'settings/file_directory': file_directory + 'settings/max_filesize': max_filesize + 'settings/max_resolution': max_resolution +destination: + plugin: entity:field_config +migration_dependencies: + required: + - user_picture_field diff --git a/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php b/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php new file mode 100644 index 0000000..99099e3 --- /dev/null +++ b/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php @@ -0,0 +1,67 @@ + '', + 'file_directory' => $this->variableGet('user_picture_path', 'pictures'), + 'max_filesize' => $this->variableGet('user_picture_file_size', '30') . 'KB', + 'max_resolution' => $this->variableGet('user_picture_dimensions', '85x85'), + ))); + } + + /** + * {@inheritdoc} + */ + public function count() { + // This source provides a single row, corresponding to a single picture + // field to be added to the user entity. + return 1; + } + + /** + * {@inheritdoc} + */ + public function fields() { + return array( + 'file_directory' => 'The directory to store images..', + 'max_filesize' => 'The maximum allowed file size in KBs.', + 'max_resolution' => "The maximum resolution.", + ); + } + + /** + * {@inheritdoc} + */ + public function getIds() { + $ids['id']['type'] = 'string'; + return $ids; + } + +} diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureInstance.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureInstance.php deleted file mode 100644 index 48e409b..0000000 --- a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureInstance.php +++ /dev/null @@ -1,67 +0,0 @@ - '', - 'file_directory' => $this->variableGet('user_picture_path', 'pictures'), - 'max_filesize' => $this->variableGet('user_picture_file_size', '30') . 'KB', - 'max_resolution' => $this->variableGet('user_picture_dimensions', '85x85'), - ))); - } - - /** - * {@inheritdoc} - */ - public function count() { - // This source provides a single row, corresponding to a single picture - // field to be added to the user entity. - return 1; - } - - /** - * {@inheritdoc} - */ - public function fields() { - return array( - 'file_directory' => 'The directory to store images..', - 'max_filesize' => 'The maximum allowed file size in KBs.', - 'max_resolution' => "The maximum resolution.", - ); - } - - /** - * {@inheritdoc} - */ - public function getIds() { - $ids['id']['type'] = 'string'; - return $ids; - } - -} diff --git a/core/modules/user/src/Plugin/migrate/source/d7/Role.php b/core/modules/user/src/Plugin/migrate/source/d7/Role.php new file mode 100755 index 0000000..8e290a3 --- /dev/null +++ b/core/modules/user/src/Plugin/migrate/source/d7/Role.php @@ -0,0 +1,61 @@ +select('role', 'r') + ->fields('r', array('rid', 'name')); + } + + /** + * {@inheritdoc} + */ + public function fields() { + return array( + 'rid' => $this->t('Role ID.'), + 'name' => $this->t('The name of the user role.'), + ); + } + + /** + * {@inheritdoc} + */ + public function prepareRow(Row $row) { + $permissions = $this->select('role_permission', 'rp') + ->fields('rp', ['permission']) + ->condition('rid', $row->getSourceProperty('rid')) + ->execute() + ->fetchCol(); + $row->setSourceProperty('permissions', $permissions); + + return parent::prepareRow($row); + } + + /** + * {@inheritdoc} + */ + public function getIds() { + return ['rid' => ['type' => 'integer']]; + } + +} diff --git a/core/modules/user/src/Plugin/migrate/source/d7/User.php b/core/modules/user/src/Plugin/migrate/source/d7/User.php new file mode 100755 index 0000000..c2de8fe --- /dev/null +++ b/core/modules/user/src/Plugin/migrate/source/d7/User.php @@ -0,0 +1,91 @@ +select('users', 'u') + ->fields('u', array_keys($this->fields())) + ->condition('uid', 0, '>'); + } + + /** + * {@inheritdoc} + */ + public function prepareRow(Row $row) { + $roles = $this->select('role', 'r') + ->fields('r', ['rid', 'name']); + $roles->join('users_roles', 'ur', 'ur.rid = r.rid'); + $roles->condition('ur.uid', $row->getSourceProperty('uid')); + $row->setSourceProperty('roles', $roles->execute()->fetchAllKeyed()); + } + + /** + * {@inheritdoc} + */ + public function fields() { + return array( + 'uid' => $this->t('User ID'), + 'name' => $this->t('Username'), + 'pass' => $this->t('Password'), + 'mail' => $this->t('Email address'), + 'signature' => $this->t('Signature'), + 'signature_format' => $this->t('Signature format'), + 'created' => $this->t('Registered timestamp'), + 'access' => $this->t('Last access timestamp'), + 'login' => $this->t('Last login timestamp'), + 'status' => $this->t('Status'), + 'timezone' => $this->t('Timezone'), + 'language' => $this->t('Language'), + 'picture' => $this->t('Picture'), + 'init' => $this->t('Init'), + ); + } + + /** + * {@inheritdoc} + */ + public function getIds() { + return array( + 'uid' => array( + 'type' => 'integer', + 'alias' => 'u', + ), + ); + } + + /** + * {@inheritdoc} + */ + public function bundleMigrationRequired() { + return FALSE; + } + + /** + * {@inheritdoc} + */ + public function entityTypeId() { + return 'user'; + } + +} \ No newline at end of file diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php new file mode 100644 index 0000000..b825576 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php @@ -0,0 +1,53 @@ + array( + array(array(1), array('user', 'user', 'user_picture')), + ), + ); + $this->prepareMigrations($id_mappings); + $this->executeMigration('user_picture_entity_display'); + } + + /** + * Tests the Drupal 6 user picture to Drupal 8 entity display migration. + */ + public function testUserPictureEntityDisplay() { + $display = entity_get_display('user', 'user', 'default'); + $component = $display->getComponent('user_picture'); + $this->assertIdentical('image', $component['type']); + $this->assertIdentical('content', $component['settings']['image_link']); + + $this->assertIdentical(array('user', 'user', 'default', 'user_picture'), entity_load('migration', 'user_picture_entity_display')->getIdMap()->lookupDestinationID(array(''))); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php new file mode 100644 index 0000000..f03e3a0 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php @@ -0,0 +1,52 @@ + array( + array(array(1), array('user', 'user', 'user_picture')), + ), + ); + $this->prepareMigrations($id_mappings); + $this->executeMigration('user_picture_entity_form_display'); + } + + /** + * Tests the Drupal 6 user picture to Drupal 8 entity form display migration. + */ + public function testUserPictureEntityFormDisplay() { + $display = entity_get_form_display('user', 'user', 'default'); + $component = $display->getComponent('user_picture'); + $this->assertIdentical('image_image', $component['type']); + $this->assertIdentical('throbber', $component['settings']['progress_indicator']); + + $this->assertIdentical(array('user', 'user', 'default', 'user_picture'), entity_load('migration', 'user_picture_entity_form_display')->getIdMap()->lookupDestinationID(array(''))); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php new file mode 100644 index 0000000..7a1246f --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php @@ -0,0 +1,39 @@ +executeMigration('user_picture_field'); + } + + /** + * Test the user picture field migration. + */ + public function testUserPictureField() { + $field_storage = FieldStorageConfig::load('user.user_picture'); + $this->assertIdentical('user.user_picture', $field_storage->id()); + $this->assertIdentical(array('user', 'user_picture'), entity_load('migration', 'user_picture_field')->getIdMap()->lookupDestinationID(array(''))); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureInstanceTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureInstanceTest.php new file mode 100644 index 0000000..029407d --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/MigrateUserPictureInstanceTest.php @@ -0,0 +1,63 @@ + array( + array(array('user_upload'), array('name', 'bundle')), + ), + ); + $this->prepareMigrations($id_mappings); + entity_create('field_storage_config', array( + 'entity_type' => 'user', + 'field_name' => 'user_picture', + 'type' => 'image', + 'translatable' => '0', + ))->save(); + + $this->executeMigration('user_picture_field_instance'); + } + + /** + * Tests the Drupal 6 user picture to Drupal 8 picture field instance migration. + */ + public function testUserPictureFieldInstance() { + $field = FieldConfig::load('user.user.user_picture'); + $settings = $field->getSettings(); + $this->assertIdentical('png gif jpg jpeg', $settings['file_extensions']); + $this->assertIdentical('pictures', $settings['file_directory']); + $this->assertIdentical('30KB', $settings['max_filesize']); + $this->assertIdentical('85x85', $settings['max_resolution']); + + $this->assertIdentical(array('user', 'user', 'user_picture'), entity_load('migration', 'user_picture_field_instance')->getIdMap()->lookupDestinationID(array(''))); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php deleted file mode 100644 index 4e76357..0000000 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityDisplayTest.php +++ /dev/null @@ -1,53 +0,0 @@ - array( - array(array(1), array('user', 'user', 'user_picture')), - ), - ); - $this->prepareMigrations($id_mappings); - $this->executeMigration('d6_user_picture_entity_display'); - } - - /** - * Tests the Drupal 6 user picture to Drupal 8 entity display migration. - */ - public function testUserPictureEntityDisplay() { - $display = entity_get_display('user', 'user', 'default'); - $component = $display->getComponent('user_picture'); - $this->assertIdentical('image', $component['type']); - $this->assertIdentical('content', $component['settings']['image_link']); - - $this->assertIdentical(array('user', 'user', 'default', 'user_picture'), entity_load('migration', 'd6_user_picture_entity_display')->getIdMap()->lookupDestinationID(array(''))); - } - -} diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php deleted file mode 100644 index 868977b..0000000 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureEntityFormDisplayTest.php +++ /dev/null @@ -1,52 +0,0 @@ - array( - array(array(1), array('user', 'user', 'user_picture')), - ), - ); - $this->prepareMigrations($id_mappings); - $this->executeMigration('d6_user_picture_entity_form_display'); - } - - /** - * Tests the Drupal 6 user picture to Drupal 8 entity form display migration. - */ - public function testUserPictureEntityFormDisplay() { - $display = entity_get_form_display('user', 'user', 'default'); - $component = $display->getComponent('user_picture'); - $this->assertIdentical('image_image', $component['type']); - $this->assertIdentical('throbber', $component['settings']['progress_indicator']); - - $this->assertIdentical(array('user', 'user', 'default', 'user_picture'), entity_load('migration', 'd6_user_picture_entity_form_display')->getIdMap()->lookupDestinationID(array(''))); - } - -} diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php deleted file mode 100644 index d3c1acb..0000000 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFieldTest.php +++ /dev/null @@ -1,39 +0,0 @@ -executeMigration('d6_user_picture_field'); - } - - /** - * Test the user picture field migration. - */ - public function testUserPictureField() { - $field_storage = FieldStorageConfig::load('user.user_picture'); - $this->assertIdentical('user.user_picture', $field_storage->id()); - $this->assertIdentical(array('user', 'user_picture'), entity_load('migration', 'd6_user_picture_field')->getIdMap()->lookupDestinationID(array(''))); - } - -} diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php deleted file mode 100644 index 45813ad..0000000 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureInstanceTest.php +++ /dev/null @@ -1,63 +0,0 @@ - array( - array(array('user_upload'), array('name', 'bundle')), - ), - ); - $this->prepareMigrations($id_mappings); - entity_create('field_storage_config', array( - 'entity_type' => 'user', - 'field_name' => 'user_picture', - 'type' => 'image', - 'translatable' => '0', - ))->save(); - - $this->executeMigration('d6_user_picture_field_instance'); - } - - /** - * Tests the Drupal 6 user picture to Drupal 8 picture field instance migration. - */ - public function testUserPictureFieldInstance() { - $field = FieldConfig::load('user.user.user_picture'); - $settings = $field->getSettings(); - $this->assertIdentical('png gif jpg jpeg', $settings['file_extensions']); - $this->assertIdentical('pictures', $settings['file_directory']); - $this->assertIdentical('30KB', $settings['max_filesize']); - $this->assertIdentical('85x85', $settings['max_resolution']); - - $this->assertIdentical(array('user', 'user', 'user_picture'), entity_load('migration', 'd6_user_picture_field_instance')->getIdMap()->lookupDestinationID(array(''))); - } - -} diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php index 7fa3236..8f07b78 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php @@ -95,10 +95,10 @@ protected function setUp() { array(array(4), array('migrate test role 2')), array(array(5), array('migrate test role 3')), ), - 'd6_user_picture_entity_display' => array( + 'user_picture_entity_display' => array( array(array(1), array('user', 'user', 'default', 'user_picture')), ), - 'd6_user_picture_entity_form_display' => array( + 'user_picture_entity_form_display' => array( array(array(1), array('user', 'user', 'default', 'user_picture')), ), 'd6_user_picture_file' => array( diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php new file mode 100644 index 0000000..0de4049 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php @@ -0,0 +1,49 @@ +installConfig(['user']); + $this->executeMigration('d7_user_flood'); + } + + /** + * Tests the migration. + */ + public function testMigration() { + $expected = [ + 'uid_only' => TRUE, + 'ip_limit' => 30, + 'ip_window' => 7200, + 'user_limit' => 22, + 'user_window' => 86400, + ]; + $this->assertIdentical($expected, \Drupal::config('user.flood')->get()); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php new file mode 100644 index 0000000..5b71409 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php @@ -0,0 +1,42 @@ +installConfig(['user']); + $this->executeMigration('d7_user_mail'); + } + + /** + * Tests the migration. + */ + public function testMigration() { + $config = \Drupal::config('user.mail'); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureEntityDisplayTest.php new file mode 100644 index 0000000..2e441c9 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureEntityDisplayTest.php @@ -0,0 +1,51 @@ + array( + array(array(1), array('user', 'user', 'user_picture')), + ), + ); + $this->prepareMigrations($id_mappings); + $this->executeMigration('user_picture_entity_display'); + } + + /** + * Tests the Drupal 7 user picture to Drupal 8 entity display migration. + */ + public function testUserPictureEntityDisplay() { + $component = entity_get_display('user', 'user', 'default')->getComponent('user_picture'); + $this->assertIdentical('image', $component['type']); + $this->assertIdentical('', $component['settings']['image_style']); + $this->assertIdentical('content', $component['settings']['image_link']); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureEntityFormDisplayTest.php new file mode 100644 index 0000000..d9349cc --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureEntityFormDisplayTest.php @@ -0,0 +1,41 @@ +executeMigration('user_picture_field'); + $this->executeMigration('user_picture_field_instance'); + $this->executeMigration('user_picture_entity_form_display'); + } + + /** + * Tests the field's entity form display settings. + */ + public function testEntityFormDisplaySettings() { + $component = entity_get_form_display('user', 'user', 'default')->getComponent('user_picture'); + $this->assertIdentical('image_image', $component['type']); + $this->assertIdentical('throbber', $component['settings']['progress_indicator']); + $this->assertIdentical('thumbnail', $component['settings']['preview_image_style']); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureFieldInstanceTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureFieldInstanceTest.php new file mode 100644 index 0000000..02b2ca5 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureFieldInstanceTest.php @@ -0,0 +1,44 @@ +executeMigration('user_picture_field'); + $this->executeMigration('user_picture_field_instance'); + } + + /** + * Test the user picture field migration. + */ + public function testUserPictureField() { + /** @var \Drupal\field\FieldConfigInterface $field */ + $field = FieldConfig::load('user.user.user_picture'); + $this->assertTrue($field instanceof FieldConfigInterface); + $this->assertIdentical('user', $field->getTargetEntityTypeId()); + $this->assertIdentical('user', $field->getTargetBundle()); + $this->assertIdentical('user_picture', $field->getName()); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureFieldTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureFieldTest.php new file mode 100644 index 0000000..677de9d --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserPictureFieldTest.php @@ -0,0 +1,43 @@ +executeMigration('user_picture_field'); + } + + /** + * Test the user picture field migration. + */ + public function testUserPictureField() { + /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */ + $field_storage = FieldStorageConfig::load('user.user_picture'); + $this->assertTrue($field_storage instanceof FieldStorageConfigInterface); + $this->assertIdentical('user.user_picture', $field_storage->id()); + $this->assertIdentical('image', $field_storage->getType()); + $this->assertIdentical('user', $field_storage->getTargetEntityTypeId()); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php new file mode 100644 index 0000000..1f6d8c4 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php @@ -0,0 +1,62 @@ +executeMigration('d7_user_role'); + } + + protected function assertEntity($id, $label, $original_rid = NULL) { + /** @var \Drupal\user\RoleInterface $entity */ + $entity = Role::load($id); + $this->assertTrue($entity instanceof RoleInterface); + $this->assertIdentical($label, $entity->label()); + if (isset($original_rid)) { + $permissions = Database::getConnection('default', 'migrate') + ->select('role_permission', 'rp') + ->fields('rp', ['permission']) + ->condition('rid', $original_rid) + ->execute() + ->fetchCol(); + $this->assertIdentical($permissions, $entity->getPermissions()); + } + } + + /** + * Tests user role migration. + */ + public function testUserRole() { + $this->assertEntity('anonymous_user', 'anonymous user', 1); + $this->assertEntity('authenticated_user', 'authenticated user', 2); + $this->assertEntity('administrator', 'administrator', 3); + } + +} diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php new file mode 100644 index 0000000..fb53d16 --- /dev/null +++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php @@ -0,0 +1,64 @@ +executeMigration('d7_user_role'); + $this->executeMigration('d7_user'); + } + + protected function assertEntity($id, $label, $mail, $access, $login, $blocked, $langcode, $init, array $roles = [RoleInterface::AUTHENTICATED_ID]) { + /** @var \Drupal\user\UserInterface $user */ + $user = User::load($id); + $this->assertTrue($user instanceof UserInterface); + $this->assertIdentical($label, $user->label()); + $this->assertIdentical($mail, $user->getEmail()); + $this->assertIdentical($access, $user->getLastAccessedTime()); + $this->assertIdentical($login, $user->getLastLoginTime()); + $this->assertIdentical($blocked, $user->isBlocked()); + // $user->getPreferredLangcode() might fallback to default language if the + // user preferred language is not configured on the site. We just want to + // test if the value was imported correctly. + $this->assertIdentical($langcode, $user->langcode->value); + $this->assertIdentical($langcode, $user->preferred_langcode->value); + $this->assertIdentical($langcode, $user->preferred_admin_langcode->value); + $this->assertIdentical($init, $user->getInitialEmail()); + $this->assertIdentical($roles, $user->getRoles()); + } + + /** + * Tests the Drupal 7 user to Drupal 8 migration. + */ + public function testUser() { + $this->assertEntity(2, 'Odo', 'odo@local.host', '0', '0', FALSE, '', 'odo@local.host'); + } + +} diff --git a/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/RoleTest.php b/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/RoleTest.php new file mode 100644 index 0000000..66fc8ef --- /dev/null +++ b/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/RoleTest.php @@ -0,0 +1,86 @@ + 'test', + // Leave it empty for now. + 'idlist' => array(), + // This needs to be the identifier of the actual key: cid for comment, nid + // for node and so on. + 'source' => array( + 'plugin' => 'd7_user_role', + ), + ); + + protected $expectedResults = array( + array( + 'rid' => 1, + 'name' => 'anonymous user', + 'permissions' => array( + 'access content', + ), + ), + array( + 'rid' => 2, + 'name' => 'authenticated user', + 'permissions' => array( + 'access comments', + 'access content', + 'post comments', + 'post comments without approval', + ), + ), + array( + 'rid' => 3, + 'name' => 'administrator', + 'permissions' => array( + 'access comments', + 'administer comments', + 'post comments', + 'post comments without approval', + 'access content', + 'administer content types', + 'administer nodes', + ), + ), + ); + + /** + * {@inheritdoc} + */ + protected function setUp() { + foreach ($this->expectedResults as $row) { + foreach ($row['permissions'] as $permission) { + $this->databaseContents['role_permission'][] = array( + 'permission' => $permission, + 'rid' => $row['rid'], + ); + } + unset($row['permissions']); + $this->databaseContents['role'][] = $row; + } + parent::setUp(); + } + +} diff --git a/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php b/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php new file mode 100644 index 0000000..135de5e --- /dev/null +++ b/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php @@ -0,0 +1,85 @@ + 'test', + 'idlist' => [], + 'source' => [ + 'plugin' => 'd7_user', + ], + ]; + + protected $expectedResults = [ + [ + 'uid' => '2', + 'name' => 'Odo', + 'pass' => '$S$DVpvPItXvnsmF3giVEe7Jy2lG.SCoEs8uKwpHsyPvdeNAaNZYxZ8', + 'mail' => 'odo@local.host', + 'signature' => '', + 'signature_format' => 'filtered_html', + 'created' => '1432750741', + 'access' => '0', + 'login' => '0', + 'status' => '1', + 'timezone' => 'America/Chicago', + 'language' => '', + 'picture' => '0', + 'init' => 'odo@local.host', + 'roles' => [ + 2 => 'authenticated user', + ], + ], + ]; + + /** + * {@inheritdoc} + */ + protected function setUp() { + $this->databaseContents['users'][] = [ + 'uid' => '2', + 'name' => 'Odo', + 'pass' => '$S$DVpvPItXvnsmF3giVEe7Jy2lG.SCoEs8uKwpHsyPvdeNAaNZYxZ8', + 'mail' => 'odo@local.host', + 'theme' => '', + 'signature' => '', + 'signature_format' => 'filtered_html', + 'created' => '1432750741', + 'access' => '0', + 'login' => '0', + 'status' => '1', + 'timezone' => 'America/Chicago', + 'language' => '', + 'picture' => '0', + 'init' => 'odo@local.host', + 'data' => 'a:1:{s:7:"contact";i:1;}', + ]; + $this->databaseContents['users_roles'][] = [ + 'uid' => 2, + 'rid' => 2, + ]; + $this->databaseContents['role'][] = [ + 'rid' => 2, + 'name' => 'authenticated user', + 'weight' => 0, + ]; + parent::setUp(); + } + +}