From e5a896b9f487093813b19e15008f6d6e72630ff3 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Thu, 7 Aug 2014 11:48:11 +0100
Subject: [PATCH] Issue #2315613 by damiankloip, Wim Leers: Add a
services.local.yml for development.
---
core/core.services.yml | 4 ----
core/lib/Drupal/Core/DrupalKernel.php | 4 ++--
sites/development.services.yml | 9 +++++++++
sites/example.settings.local.php | 6 +++++-
4 files changed, 16 insertions(+), 7 deletions(-)
create mode 100644 sites/development.services.yml
diff --git a/core/core.services.yml b/core/core.services.yml
index d8bac8f4be90..6ff5dd54fa3b 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -38,10 +38,6 @@ services:
class: Drupal\Core\Cache\ApcuBackendFactory
cache.backend.php:
class: Drupal\Core\Cache\PhpBackendFactory
- cache.backend.memory:
- class: Drupal\Core\Cache\MemoryBackendFactory
- cache.backend.null:
- class: Drupal\Core\Cache\NullBackendFactory
cache.bootstrap:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index e54cf895163c..2551a4d02048 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -526,8 +526,8 @@ public function discoverServiceProviders() {
}
}
}
- if (!empty($GLOBALS['conf']['container_yamls'])) {
- $this->serviceYamls['site'] = $GLOBALS['conf']['container_yamls'];
+ if ($container_yamls = Settings::get('container_yamls')) {
+ $this->serviceYamls['site'] = $container_yamls;
}
if (file_exists($site_services_yml = $this->getSitePath() . '/services.yml')) {
$this->serviceYamls['site'][] = $site_services_yml;
diff --git a/sites/development.services.yml b/sites/development.services.yml
new file mode 100644
index 000000000000..cc212117dc87
--- /dev/null
+++ b/sites/development.services.yml
@@ -0,0 +1,9 @@
+# Local development services.
+#
+# To activate this feature, follow the instructions at the top of the
+# 'example.settings.local.php' file, which sits next to this file.
+services:
+ cache.backend.memory:
+ class: Drupal\Core\Cache\MemoryBackendFactory
+ cache.backend.null:
+ class: Drupal\Core\Cache\NullBackendFactory
diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php
index 1847f865fe50..19f398ce4c4e 100644
--- a/sites/example.settings.local.php
+++ b/sites/example.settings.local.php
@@ -10,6 +10,9 @@
* mention 'settings.local.php'.
*/
+// Enable local development services.
+$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml';
+
// Show all error messages, with backtrace information.
$config['system.logging']['error_level'] = 'verbose';
@@ -17,7 +20,8 @@
$config['system.performance']['css']['preprocess'] = FALSE;
$config['system.performance']['js']['preprocess'] = FALSE;
-// Disable the render cache, by using the Null cache back-end.
+// Disable the render cache, by using the Null cache back-end defined by the
+// development.services.yml file above.
$settings['cache']['bins']['render'] = 'cache.backend.null';
/**
--
GitLab