Adding more tests and better errors for PhpReader.

cakephp · Dec 3, 2010 · bbb15c2 · bbb15c2
1 parent ae328ff
commit bbb15c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/cake/libs/config/php_reader.php b/cake/libs/config/php_reader.php
@@ -65,7 +65,9 @@ public function read($key) {
 		}
 		include $file;
 		if (!isset($config)) {
-			return array();
+			throw new RuntimeException(
+				sprintf(__('No variable $config found in %s.php'), $file)
+			);
 		}
 		return $config;
 	}

diff --git a/cake/tests/cases/libs/config/php_reader.test.php b/cake/tests/cases/libs/config/php_reader.test.php
@@ -38,6 +38,7 @@ function testRead() {
 		$reader = new PhpReader($this->path);
 		$values = $reader->read('var_test');
 		$this->assertEquals('value', $values['Read']);
+		$this->assertEquals('buried', $values['Deep']['Deeper']['Deepest']);
 	}
 
 /**
@@ -51,6 +52,17 @@ function testReadWithNonExistantFile() {
 		$reader->read('fake_values');
 	}
 
+/**
+ * test reading an empty file.
+ *
+ * @expectedException RuntimeException
+ * @return void
+ */
+	function testReadEmptyFile() {
+		$reader = new PhpReader($this->path);
+		$reader->read('empty');
+	}
+
 /**
  * test reading from plugins
  *