From 0e4742c53629ca80d51bbcca03d39a67848057d3 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Fri, 27 Jul 2012 15:29:21 -0500
Subject: [PATCH] Issue #1503224 by catch, sun, chx, bojanz, tim.plunkett:
Cleanup module_list().
---
core/includes/install.inc | 2 +-
core/includes/schema.inc | 2 +-
core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php | 2 +-
.../system/lib/Drupal/system/Tests/Module/ModuleTestBase.php | 2 +-
.../Drupal/system/Tests/System/MainContentFallbackTest.php | 4 ++--
.../lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php | 3 ++-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/core/includes/install.inc b/core/includes/install.inc
index d0a28bc18863..91e10a1d5a42 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -380,7 +380,7 @@ function drupal_install_system() {
// Clear out module list and hook implementation statics before calling
// system_rebuild_theme_data().
- drupal_static_reset('system_list');
+ system_list_reset();
module_list_reset();
module_implements_reset();
diff --git a/core/includes/schema.inc b/core/includes/schema.inc
index 448ce844278a..7b0c69029e98 100644
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -73,7 +73,7 @@ function drupal_get_complete_schema($rebuild = FALSE) {
// we force the system_list() static cache to be refreshed to ensure
// that it contains the complete list of modules before we go on to call
// module_load_all_includes().
- drupal_static_reset('system_list');
+ system_list_reset();
module_load_all_includes('install');
}
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index b006cdd2022e..73afaa6ea166 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -789,7 +789,7 @@ protected function tearDown() {
// Reload module list and implementations to ensure that test module hooks
// aren't called after tests.
- drupal_static_reset('system_list');
+ system_list_reset();
module_list_reset();
module_implements_reset();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
index ea71fe77f2b5..1eeba4e366f3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
@@ -132,7 +132,7 @@ function assertNoModuleConfig($module) {
* Expected module state.
*/
function assertModules(array $modules, $enabled) {
- drupal_static_reset('system_list');
+ system_list_reset();
foreach ($modules as $module) {
if ($enabled) {
$message = 'Module "@module" is enabled.';
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
index 4709cdc44e4c..7fd3090c3b72 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
@@ -48,7 +48,7 @@ function testMainContentFallback() {
$edit['modules[Core][block][enable]'] = FALSE;
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
- drupal_static_reset('system_list');
+ system_list_reset();
$this->assertFalse(module_exists('block'), t('Block module disabled.'));
// At this point, no region is filled and fallback should be triggered.
@@ -82,7 +82,7 @@ function testMainContentFallback() {
$edit['modules[Core][block][enable]'] = 'block';
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
- drupal_static_reset('system_list');
+ system_list_reset();
$this->assertTrue(module_exists('block'), t('Block module re-enabled.'));
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
index 4d0d00226f49..d97d7ae6d950 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
@@ -253,7 +253,8 @@ protected function performUpgrade($register_errors = TRUE) {
// Reload module list. For modules that are enabled in the test database,
// but not on the test client, we need to load the code here.
- $new_modules = array_diff(module_list(TRUE), $this->loadedModules);
+ system_list_reset();
+ $new_modules = array_diff(module_list(), $this->loadedModules);
foreach ($new_modules as $module) {
drupal_load('module', $module);
}
--
GitLab