diff -u b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php --- b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php +++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php @@ -719 +719 @@ -#3de49527faa2cd3e07401b5d941f1ca7 +#d20a0a7f31645aba285f0ce7505c80a5 diff -u b/core/modules/statistics/config/schema/statistics.schema.yml b/core/modules/statistics/config/schema/statistics.schema.yml --- b/core/modules/statistics/config/schema/statistics.schema.yml +++ b/core/modules/statistics/config/schema/statistics.schema.yml @@ -19,0 +20,17 @@ + +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' + top_all_num: + type: integer + label: 'Number of all time views to display' + top_last_num: + type: integer + label: 'Number of most recent views to display' diff -u b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml --- b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml +++ b/core/modules/statistics/migration_templates/statistics_popular_block_settings.yml @@ -13,8 +13,6 @@ - settings/top_day_num: statistics_block_top_day_num - settings/top_all_num: statistics_block_top_all_num - settings/top_last_num: statistics_block_top_last_num + 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.block.popularcontent -migration_dependences: - - d7_block + config_name: block.settings.statistics_popular_block diff -u b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php --- b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php +++ b/core/modules/statistics/src/Tests/Migrate/MigrateStatisticsPopularBlockSettingsTest.php @@ -7,7 +7,6 @@ namespace Drupal\statistics\Tests\Migrate; -use Drupal\block_content\Entity\BlockContent; use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase; @@ -27,7 +26,7 @@ */ protected function setUp() { parent::setUp(); - $this->installConfig(static::$modules); + $this->installConfig(['statistics']); $this->executeMigration('statistics_popular_block_settings'); } @@ -35,10 +34,11 @@ * Tests migration of Popular block settings into configuration. */ public function testMigration() { - $config = $this->config('block.block.popularcontent'); - $this->assertIdentical(55, $config->get('settings.top_all_num')); - $this->assertIdentical(30, $config->get('settings.top_day_num')); - $this->assertIdentical(9, $config->get('settings.top_last_num')); + $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); } }