From 1f86ba60da745c73d159f62915ea07293f505a46 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 26 Sep 2012 17:44:46 +0100
Subject: [PATCH] Issue #1785974 by tim.plunkett, alexpott, sun: Move
ConfigEntity into a Core component.
---
core/includes/module.inc | 4 +++-
.../Drupal/Core/Config/Entity}/ConfigEntityBase.php | 4 ++--
.../Drupal/Core/Config/Entity}/ConfigEntityInterface.php | 4 ++--
.../Drupal/Core/Config/Entity}/ConfigStorageController.php | 6 +++---
core/modules/config/tests/config_test/config_test.info | 1 -
core/modules/config/tests/config_test/config_test.module | 4 ++--
.../tests/config_test/lib/Drupal/config_test/ConfigTest.php | 2 +-
7 files changed, 13 insertions(+), 12 deletions(-)
rename core/{modules/config/lib/Drupal/config => lib/Drupal/Core/Config/Entity}/ConfigEntityBase.php (96%)
rename core/{modules/config/lib/Drupal/config => lib/Drupal/Core/Config/Entity}/ConfigEntityInterface.php (76%)
rename core/{modules/config/lib/Drupal/config => lib/Drupal/Core/Config/Entity}/ConfigStorageController.php (98%)
diff --git a/core/includes/module.inc b/core/includes/module.inc
index 432ed1ce4dca..215d165b5daf 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -468,6 +468,9 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
// Allow modules to react prior to the installation of a module.
module_invoke_all('modules_preinstall', array($module));
+ // Clear the entity info cache before importing new configuration.
+ entity_info_cache_clear();
+
// Now install the module if necessary.
if (drupal_get_installed_schema_version($module, TRUE) == SCHEMA_UNINSTALLED) {
drupal_install_schema($module);
@@ -494,7 +497,6 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
watchdog('system', '%module module installed.', array('%module' => $module), WATCHDOG_INFO);
}
- entity_info_cache_clear();
// Allow modules to react prior to the enabling of a module.
module_invoke_all('modules_preenable', array($module));
diff --git a/core/modules/config/lib/Drupal/config/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
similarity index 96%
rename from core/modules/config/lib/Drupal/config/ConfigEntityBase.php
rename to core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index dabc121ba0e6..216b459c77d8 100644
--- a/core/modules/config/lib/Drupal/config/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\config\ConfigEntityBase.
+ * Definition of Drupal\Core\Config\Entity\ConfigEntityBase.
*/
-namespace Drupal\config;
+namespace Drupal\Core\Config\Entity;
use Drupal\Core\Entity\Entity;
diff --git a/core/modules/config/lib/Drupal/config/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
similarity index 76%
rename from core/modules/config/lib/Drupal/config/ConfigEntityInterface.php
rename to core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
index 8d6c57ce51fd..a8b78e179ea4 100644
--- a/core/modules/config/lib/Drupal/config/ConfigEntityInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\config\ConfigEntityInterface.
+ * Definition of Drupal\Core\Config\Entity\ConfigEntityInterface.
*/
-namespace Drupal\config;
+namespace Drupal\Core\Config\Entity;
use Drupal\Core\Entity\EntityInterface;
diff --git a/core/modules/config/lib/Drupal/config/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
similarity index 98%
rename from core/modules/config/lib/Drupal/config/ConfigStorageController.php
rename to core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 67fe50a02881..36abe681af8a 100644
--- a/core/modules/config/lib/Drupal/config/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -2,10 +2,10 @@
/**
* @file
- * Definition of Drupal\config\ConfigStorageController.
+ * Definition of Drupal\Core\Config\Entity\ConfigStorageController.
*/
-namespace Drupal\config;
+namespace Drupal\Core\Config\Entity;
use Drupal\Component\Uuid\Uuid;
use Drupal\Core\Entity\EntityInterface;
@@ -35,7 +35,7 @@ class ConfigStorageController implements EntityStorageControllerInterface {
/**
* Additional arguments to pass to hook_TYPE_load().
*
- * Set before calling Drupal\config\ConfigStorageController::attachLoad().
+ * Set before calling Drupal\Core\Config\Entity\ConfigStorageController::attachLoad().
*
* @var array
*/
diff --git a/core/modules/config/tests/config_test/config_test.info b/core/modules/config/tests/config_test/config_test.info
index 8735450dec40..3c0ca6bdcb5b 100644
--- a/core/modules/config/tests/config_test/config_test.info
+++ b/core/modules/config/tests/config_test/config_test.info
@@ -2,5 +2,4 @@ name = Configuration test module
package = Core
version = VERSION
core = 8.x
-dependencies[] = config
hidden = TRUE
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index 44d4087f36b4..61d92dff43cf 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -80,7 +80,7 @@ function config_test_config_import_delete($name, $new_config, $old_config) {
function config_test_entity_info() {
$types['config_test'] = array(
'label' => 'Test configuration',
- 'controller class' => 'Drupal\config\ConfigStorageController',
+ 'controller class' => 'Drupal\Core\Config\Entity\ConfigStorageController',
'entity class' => 'Drupal\config_test\ConfigTest',
'uri callback' => 'config_test_uri',
'config prefix' => 'config_test.dynamic',
@@ -177,7 +177,7 @@ function config_test_delete($id) {
*/
function config_test_list_page() {
$entities = entity_load_multiple('config_test');
- uasort($entities, 'Drupal\config\ConfigEntityBase::sort');
+ uasort($entities, 'Drupal\Core\Config\Entity\ConfigEntityBase::sort');
$rows = array();
foreach ($entities as $config_test) {
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php
index 3f6b86ae1176..e1df5c490640 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config_test;
-use Drupal\config\ConfigEntityBase;
+use Drupal\Core\Config\Entity\ConfigEntityBase;
/**
* Defines the ConfigTest configuration entity.
--
GitLab