Revert "Merge pull request zfcampus#25 from webimpress/hotfix/21"

This reverts commit 8e14178, reversing changes made to 09f5af9. Fixes zfcampus#28
weierophinney · Nov 14, 2017 · 974facf · 974facf
1 parent 63eae0a
commit 974facf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 130 deletions.
diff --git a/src/ConfigResource.php b/src/ConfigResource.php
@@ -110,9 +110,25 @@ public function patch($data, $tree = false)
      */
     public function patchKey($key, $value)
     {
-        $this->patch([$key => $value]);
+        // Get local config file
+        $config = [];
+        if (file_exists($this->fileName)) {
+            $config = include $this->fileName;
+            if (! is_array($config)) {
+                $config = [];
+            }
+        }
+        $config = $this->replaceKey($key, $value, $config);
 
-        return $this->config;
+        // Write to configuration file
+        $this->writer->toFile($this->fileName, $config);
+        $this->invalidateCache($this->fileName);
+
+        // Reseed configuration
+        $this->config = $config;
+
+        // Return written values
+        return $config;
     }
 
     /**

diff --git a/test/ConfigResourceTest.php b/test/ConfigResourceTest.php
@@ -9,7 +9,6 @@
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use Zend\Config\Writer\PhpArray;
-use Zend\Stdlib\ArrayUtils;
 use ZF\Configuration\ConfigResource;
 
 class ConfigResourceTest extends TestCase
@@ -87,8 +86,6 @@ public function testPatchListUpdatesFileWithMergedConfig()
             ],
             'baz' => 'not what you think',
         ];
-        $writer = new PhpArray();
-        $writer->toFile($this->file, $config);
         $configResource = new ConfigResource($config, $this->file, $this->writer);
 
         $patch = [
@@ -100,10 +97,8 @@ public function testPatchListUpdatesFileWithMergedConfig()
         $this->assertEquals($patch, $response);
 
         $expected = [
-            'foo' => 'bar',
             'bar' => [
                 'baz' => 'UPDATED',
-                'bat' => 'bogus',
             ],
             'baz' => 'what you think',
         ];
@@ -407,127 +402,4 @@ public function testDeleteNonexistentKeyShouldDoNothing()
         $test = include $this->file;
         $this->assertEquals($expected, $test);
     }
-
-    public function patchKey()
-    {
-        return [
-            'scalar-top-level' => [
-                'top',
-                'updated',
-                ['top' => 'updated']
-            ],
-
-            'overwrite-hash' => [
-                'sub',
-                'updated',
-                ['sub' => 'updated'],
-            ],
-
-            'nested-scalar' => [
-                'sub.level',
-                'updated',
-                [
-                    'sub' => [
-                        'level' => 'updated',
-                    ],
-                ],
-            ],
-            'nested-list' => [
-                'sub.list',
-                ['three', 'four'],
-                [
-                    'sub' => [
-                        'list' => ['three', 'four'],
-                    ],
-                ],
-            ],
-            'nested-hash' => [
-                'sub.hash.two',
-                'updated',
-                [
-                    'sub' => [
-                        'hash' => [
-                            'two' => 'updated',
-                        ],
-                    ],
-                ],
-            ],
-            'overwrite-nested-null' => [
-                'sub.null',
-                'updated',
-                [
-                    'sub' => [
-                        'null' => 'updated',
-                    ],
-                ],
-            ],
-            'overwrite-nested-object' => [
-                'sub.object',
-                'updated',
-                [
-                    'sub' => [
-                        'object' => 'updated',
-                    ],
-                ],
-            ],
-            'merge-nested' => [
-                'sub.hash',
-                [
-                    'two' => 'two-updated',
-                    'three' => 'three-updated',
-                ],
-                [
-                    'sub' => [
-                        'hash' => [
-                            'one' => 1,
-                            'two' => 'two-updated',
-                            'three' => 'three-updated',
-                        ],
-                    ],
-                ],
-            ],
-            'add-new' => [
-                'sub',
-                ['new' => 'added'],
-                [
-                    'sub' => [
-                        'new' => 'added',
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider patchKey
-     *
-     * @param string $key
-     * @param mixed $value
-     * @param mixed $expected
-     */
-    public function testPatchKey($key, $value, $expected)
-    {
-        $config = [
-            'top' => 'level',
-            'sub' => [
-                'level' => 2,
-                'list' => [
-                    'one',
-                    'two',
-                ],
-                'hash' => [
-                    'one' => 1,
-                    'two' => 2,
-                ],
-                'null' => null,
-                'object' => stdClass::class,
-            ],
-        ];
-        $writer = new PhpArray();
-        $writer->toFile($this->file, $config);
-
-        $updated = $this->configResource->patchKey($key, $value);
-        $expected = ArrayUtils::merge($config, $expected);
-        $this->assertEquals($expected, $updated);
-    }
 }