reverted: --- b/core/modules/statistics/config/schema/statistics.schema.yml +++ a/core/modules/statistics/config/schema/statistics.schema.yml @@ -25,9 +25,6 @@ type: block_settings label: 'Popular content block settings' mapping: - langcode: - type: string - label: 'Language code' top_day_num: type: integer label: 'Number of day\s top views to display' diff -u b/core/modules/statistics/migration_templates/statistics_settings.yml b/core/modules/statistics/migration_templates/statistics_settings.yml --- b/core/modules/statistics/migration_templates/statistics_settings.yml +++ b/core/modules/statistics/migration_templates/statistics_settings.yml @@ -8,0 +9,17 @@ + - statistics_enable_access_log + - statistics_flush_accesslog_timer + - statistics_count_content_views +process: + 'access_log/enabled': statistics_enable_access_log + 'access_log/max_lifetime': statistics_flush_accesslog_timer + 'count_content_views': statistics_count_content_views +destination: + plugin: config + config_name: statistics.settings +id: d6_statistics_settings +label: Statistics configuration +migration_tags: + - Drupal 6 +source: + plugin: variable + variables: reverted: --- b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsConfigsTest.php +++ a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php @@ -2,10 +2,10 @@ /** * @file + * Contains \Drupal\statistics\Tests\Migrate\d6\MigrateStatisticsConfigsTest. - * Contains \Drupal\statistics\Tests\Migrate\MigrateStatisticsConfigsTest. */ +namespace Drupal\statistics\Tests\Migrate\d6; -namespace Drupal\statistics\Tests\Migrate; use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; @@ -29,7 +29,7 @@ */ protected function setUp() { parent::setUp(); + $this->executeMigration('d6_statistics_settings'); - $this->executeMigration('statistics_settings'); } /** only in patch2: unchanged: --- a/core/modules/statistics/migration_templates/d6_statistics_settings.yml +++ /dev/null @@ -1,17 +0,0 @@ -id: d6_statistics_settings -label: Statistics configuration -migration_tags: - - Drupal 6 -source: - plugin: variable - variables: - - statistics_enable_access_log - - statistics_flush_accesslog_timer - - statistics_count_content_views -process: - 'access_log/enabled': statistics_enable_access_log - 'access_log/max_lifetime': statistics_flush_accesslog_timer - 'count_content_views': statistics_count_content_views -destination: - plugin: config - config_name: statistics.settings only in patch2: unchanged: --- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php +++ b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php @@ -29,7 +29,7 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->executeMigration('d6_statistics_settings'); + $this->executeMigration('statistics_settings'); } /** only in patch2: unchanged: --- /dev/null +++ b/core/modules/statistics/src/Tests/Migrate/d7/MigrateStatisticsConfigsTest.php @@ -0,0 +1,46 @@ +executeMigration('statistics_settings'); + } + + /** + * Tests migration of statistics variables to statistics.settings.yml. + */ + public function testStatisticsSettings() { + $config = $this->config('statistics.settings'); + $this->assertIdentical(TRUE, $config->get('access_log.enabled')); + $this->assertIdentical(3600, $config->get('access_log.max_lifetime')); + $this->assertIdentical(1, $config->get('count_content_views')); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get()); + } + +}