phpcs fixes

and add a test for when deleting should fail
cakephp · Mar 25, 2014 · 26b7d3d · 26b7d3d
1 parent 680be10
commit 26b7d3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Core/InstanceConfigTrait.php b/src/Core/InstanceConfigTrait.php
@@ -150,6 +150,7 @@ protected function _configWrite($key, $value = null) {
 /**
  * Delete a single config key
  *
+ * @throws Cake\Error\Exception if attempting to clobber existing config
  * @param string $key
  * @return void
  */

diff --git a/tests/TestCase/Core/InstanceConfigTrait.php b/tests/TestCase/Core/InstanceConfigTrait.php
@@ -310,7 +310,6 @@ public function testDeleteSimple() {
 			$this->object->config(),
 			'deleted keys should not be present'
 		);
-
 	}
 
 /**
@@ -340,4 +339,15 @@ public function testDeleteNested() {
 		);
 	}
 
+/**
+ * testSetClobber
+ *
+ * @expectedException \Exception
+ * @expectedExceptionMessage Cannot unset a.nested.value.whoops
+ * @return void
+ */
+	public function testDeleteClobber() {
+		$this->object->config('a.nested.value.whoops', null);
+	}
+
 }