diff --git a/core/modules/statistics/config/install/statistics.settings.yml b/core/modules/statistics/config/install/statistics.settings.yml index f788bece3faa..66860629238c 100644 --- a/core/modules/statistics/config/install/statistics.settings.yml +++ b/core/modules/statistics/config/install/statistics.settings.yml @@ -1,5 +1,2 @@ -access_log: - enabled: false - max_lifetime: 259200 count_content_views: 0 display_max_age: 3600 diff --git a/core/modules/statistics/config/schema/statistics.schema.yml b/core/modules/statistics/config/schema/statistics.schema.yml index d5e62008b570..c72a227264f7 100644 --- a/core/modules/statistics/config/schema/statistics.schema.yml +++ b/core/modules/statistics/config/schema/statistics.schema.yml @@ -4,16 +4,6 @@ statistics.settings: type: config_object label: 'Statistics settings' mapping: - access_log: - type: mapping - label: 'Access log settings' - mapping: - enabled: - type: boolean - label: 'Enable' - max_lifetime: - type: integer - label: 'Maximum lifetime' count_content_views: type: integer label: 'Count content views' diff --git a/core/modules/statistics/migration_templates/statistics_settings.yml b/core/modules/statistics/migration_templates/statistics_settings.yml index 62c2c0612a00..1f5b5bbd0e12 100644 --- a/core/modules/statistics/migration_templates/statistics_settings.yml +++ b/core/modules/statistics/migration_templates/statistics_settings.yml @@ -10,8 +10,6 @@ source: - 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 diff --git a/core/modules/statistics/src/Tests/Views/IntegrationTest.php b/core/modules/statistics/src/Tests/Views/IntegrationTest.php index 7fe99f93ef26..601aa6cc38b4 100644 --- a/core/modules/statistics/src/Tests/Views/IntegrationTest.php +++ b/core/modules/statistics/src/Tests/Views/IntegrationTest.php @@ -56,9 +56,8 @@ class IntegrationTest extends ViewTestBase { $this->drupalCreateContentType(array('type' => 'page')); $this->node = $this->drupalCreateNode(array('type' => 'page')); - // Enable access logging. + // Enable counting of content views. $this->config('statistics.settings') - ->set('access_log.enabled', 1) ->set('count_content_views', 1) ->save(); diff --git a/core/modules/statistics/statistics.install b/core/modules/statistics/statistics.install index 11c72f4af2e2..f232e1d376ab 100644 --- a/core/modules/statistics/statistics.install +++ b/core/modules/statistics/statistics.install @@ -79,3 +79,10 @@ function statistics_update_8002() { // Set the new configuration setting for max age to the initial value. \Drupal::configFactory()->getEditable('statistics.settings')->set('display_max_age', 3600)->save(); } + +/** + * Remove access_log settings. + */ +function statistics_update_8300() { + \Drupal::configFactory()->getEditable('statistics.settings')->clear('access_log')->save(); +} diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php index 5313eb3309ee..6bd53948a09e 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php @@ -32,8 +32,6 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase { */ public function testStatisticsSettings() { $config = $this->config('statistics.settings'); - $this->assertIdentical(FALSE, $config->get('access_log.enabled')); - $this->assertIdentical(259200, $config->get('access_log.max_lifetime')); $this->assertIdentical(0, $config->get('count_content_views')); $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get()); } diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php index c35f3dc4bba5..e5f915b14487 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php @@ -32,8 +32,6 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal7TestBase { */ 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()); }