diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php index 09d81cf..573799c 100644 --- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php @@ -41488,6 +41488,18 @@ 'value' => 's:10:"The Slogan";', )) ->values(array( + 'name' => 'statistics_block_top_all_num', + 'value' => 'i:55;', +)) +->values(array( + 'name' => 'statistics_block_top_day_num', + 'value' => 'i:30;', +)) +->values(array( + 'name' => 'statistics_block_top_last_num', + 'value' => 'i:9;', +)) +->values(array( 'name' => 'statistics_count_content_views', 'value' => 'i:1;', )) diff --git a/core/modules/statistics/config/schema/statistics.schema.yml b/core/modules/statistics/config/schema/statistics.schema.yml index d5e6200..fea7135 100644 --- a/core/modules/statistics/config/schema/statistics.schema.yml +++ b/core/modules/statistics/config/schema/statistics.schema.yml @@ -25,6 +25,9 @@ block.settings.statistics_popular_block: 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 --git a/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml new file mode 100644 index 0000000..46a9ab2 --- /dev/null +++ b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml @@ -0,0 +1,18 @@ +id: statistics_popular_block_settings +label: Statistics popular block configuration +migration_tags: + - Drupal 6 + - Drupal 7 +source: + plugin: variable + variables: + - statistics_block_top_day_num + - statistics_block_top_all_num + - statistics_block_top_last_num +process: + top_day_num: statistics_block_top_day_num + top_all_num: statistics_block_top_all_num + top_last_num: statistics_block_top_last_num +destination: + plugin: config + config_name: block.settings.statistics_popular_block diff --git a/core/modules/statistics/migration_templates/d6_statistics_settings.yml b/core/modules/statistics/migration_templates/statistics_settings.yml similarity index 92% rename from core/modules/statistics/migration_templates/d6_statistics_settings.yml rename to core/modules/statistics/migration_templates/statistics_settings.yml index 348ad38..62c2c06 100644 --- a/core/modules/statistics/migration_templates/d6_statistics_settings.yml +++ b/core/modules/statistics/migration_templates/statistics_settings.yml @@ -1,7 +1,8 @@ -id: d6_statistics_settings +id: statistics_settings label: Statistics configuration migration_tags: - Drupal 6 + - Drupal 7 source: plugin: variable variables: diff --git a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsConfigsTest.php similarity index 84% rename from core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php rename to core/modules/statistics/src/Tests/Migrate/MigrateStatisticsConfigsTest.php index 7fe673c..8d3fd31 100644 --- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php +++ b/core/modules/statistics/src/Tests/Migrate/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 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->executeMigration('d6_statistics_settings'); + $this->executeMigration('statistics_settings'); } /** diff --git a/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php new file mode 100644 index 0000000..c4dfc81 --- /dev/null +++ b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php @@ -0,0 +1,44 @@ +installConfig(['statistics']); + $this->executeMigration('statistics_popular_block_settings'); + } + + /** + * Tests migration of Popular block settings into configuration. + */ + public function testMigration() { + $config = \Drupal::config('block.settings.statistics_popular_block')->get(); + $this->assertIdentical(55, $config['top_all_num']); + $this->assertIdentical(30, $config['top_day_num']); + $this->assertIdentical(9, $config['top_last_num']); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'block.settings.statistics_popular_block', $config); + } + +}