reverted: --- b/core/modules/user/migration_templates/d6_user.yml +++ a/core/modules/user/migration_templates/d6_user.yml @@ -31,7 +31,6 @@ migration_dependencies: required: - d6_user_role - - d6_system_date optional: - d6_user_picture_file - d6_user_picture_entity_display diff -u b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php --- b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php @@ -12,7 +12,6 @@ use Drupal\Core\Database\Database; use Drupal\user\RoleInterface; use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; -use Drupal\migrate\Entity\MigrationInterface; /** * Users migration. @@ -123,12 +122,6 @@ $this->prepareMigrations($id_mappings); - $config = \Drupal::configFactory()->getEditable('system.date'); - $config->set('timezone.default', 'America/New York'); - $config->save(); - $migration = entity_load('migration', 'd6_system_date'); - $migration->setMigrationResult(MigrationInterface::RESULT_COMPLETED); - $this->executeMigration('d6_user'); } @@ -171,9 +164,8 @@ // user preferred language is not configured on the site. We just want to // test if the value was imported correctly. $this->assertIdentical($source->language, $user->preferred_langcode->value); - - $expected_timezone = $source->timezone_name ?: $this->config('system.date')->get('timezone.default'); - $this->assertIdentical($expected_timezone, $user->getTimeZone()); + $expected_timezone_name = $source->timezone_name ?: $this->config('system.date')->get('timezone.default'); + $this->assertIdentical($expected_timezone_name, $user->getTimeZone()); $this->assertIdentical($source->init, $user->getInitialEmail()); $this->assertIdentical($roles, $user->getRoles()); only in patch2: unchanged: --- a/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d6/Users.php @@ -251,12 +251,12 @@ public function load() { 'access' => '1391259674', 'login' => '1391152255', 'status' => '1', - 'timezone' => '3600', + 'timezone' => '-28800', 'language' => 'en', 'picture' => '', 'init' => 'bloggs@example.com', 'data' => 'a:0:{}', - 'timezone_name' => NULL, + 'timezone_name' => 'America/Anchorage', 'pass_plain' => 'joe.bloggs_pass', 'expected_timezone' => NULL, 'timezone_id' => '0', @@ -275,12 +275,12 @@ public function load() { 'access' => '1391259574', 'login' => '1391162255', 'status' => '1', - 'timezone' => '3600', + 'timezone' => '0', 'language' => 'en', 'picture' => '', 'init' => 'sal.saraniti@example.com', 'data' => 'a:0:{}', - 'timezone_name' => NULL, + 'timezone_name' => 'UTC', 'pass_plain' => 'sal.saraniti', 'expected_timezone' => NULL, 'timezone_id' => '0', @@ -299,7 +299,7 @@ public function load() { 'access' => '1390259574', 'login' => '1390162255', 'status' => '1', - 'timezone' => '3600', + 'timezone' => NULL, 'language' => 'en', 'picture' => '', 'init' => 'terry.saraniti@example.com', @@ -312,4 +312,4 @@ public function load() { } } -#ce6d7264b7ef5ed1ffe854326893e1e0 +#4a42570fa3c819b0b84e9552d689e2e7 only in patch2: unchanged: --- a/core/modules/user/src/Plugin/migrate/process/d6/UserUpdate7002.php +++ b/core/modules/user/src/Plugin/migrate/process/d6/UserUpdate7002.php @@ -54,6 +54,9 @@ public function transform($value, MigrateExecutableInterface $migrate_executable } } + if ($timezone === NULL) { + $timezone = \Drupal::config('system.date')->get('timezone.default'); + } return $timezone; }