0a1,15
> From 3d251fef981336cfe89502285a558fc02ccea117 Mon Sep 17 00:00:00 2001
> From: Bram Goffings <bramgoffings@gmail.com>
> Date: Fri, 10 Aug 2012 15:35:31 +0200
> Subject: [PATCH] config override
> 
> ---
>  core/includes/config.inc                           |  9 +--
>  core/lib/Drupal/Core/Config/Config.php             | 81 ++++++++++++++++----
>  core/lib/Drupal/Core/Config/ConfigFactory.php      | 11 ++-
>  .../lib/Drupal/config/Tests/ConfOverrideTest.php   | 38 ----------
>  .../lib/Drupal/config/Tests/ConfigOverrideTest.php | 88 ++++++++++++++++++++++
>  5 files changed, 166 insertions(+), 61 deletions(-)
>  delete mode 100644 core/modules/config/lib/Drupal/config/Tests/ConfOverrideTest.php
>  create mode 100644 core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php
> 
2c17
< index c143dd4..ab1d544 100644
---
> index f2fcd39..347bf85 100644
5c20
< @@ -197,14 +197,11 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou
---
> @@ -194,14 +194,11 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou
9c24
< -        $old_config = new Config($storage_dispatcher);
---
> -        $old_config = new Config($target_storage);
13c28
< +        $old_config = new Config($name, $storage_dispatcher);
---
> +        $old_config = new Config($name, $target_storage);
17c32
< -        $new_config = new Config($storage_dispatcher);
---
> -        $new_config = new Config($target_storage);
19c34
< +        $new_config = new Config($name, $storage_dispatcher);
---
> +        $new_config = new Config($name, $target_storage);
24c39
< index ffddd61..a2ed297 100644
---
> index 2f4d14a..10bf925 100644
49c64
<     * The injected storage dispatcher object.
---
>     * The storage used for reading and writing.
56,57c71,72
<     * @param Drupal\Core\Config\StorageDispatcher $storageDispatcher
<     *   A storage dispatcher object to use for reading and writing the
---
>     * @param Drupal\Core\Config\StorageInterface $storage
>     *   A storage controller object to use for reading and writing the
60,61c75,76
< -  public function __construct(StorageDispatcher $storageDispatcher) {
< +  public function __construct($name, StorageDispatcher $storageDispatcher) {
---
> -  public function __construct(StorageInterface $storage) {
> +  public function __construct($name, StorageInterface $storage) {
63c78
<      $this->storageDispatcher = $storageDispatcher;
---
>      $this->storage = $storage;
163c178
<      $this->storageDispatcher->selectStorage('write', $this->name)->delete($this->name);
---
>      $this->storage->delete($this->name);
170c185
< index 1fbca62..79de47e 100644
---
> index 7c26b6e..4bf5b62 100644
182c197
< @@ -68,7 +70,12 @@ class ConfigFactory {
---
> @@ -68,8 +70,13 @@ class ConfigFactory {
186c201
< -    $config = new Config($this->storageDispatcher);
---
> -    $config = new Config($this->storage);
188c203
< +    $config = new Config($name, $this->storageDispatcher);
---
> +    $config = new Config($name, $this->storage);
195a211
>  
334a351,353
> -- 
> 1.7.11.msysgit.1
>