refactoring Configure::load() to load config files from plugins, test…

…s and config files added Signed-off-by: Mark Story <mark@mark-story.com>
cakephp · Nov 15, 2009 · 7a4793a · 7a4793a
1 parent e1d6036
commit 7a4793a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
@@ -201,8 +201,16 @@ function delete($var = null) {
  */
 	function load($fileName) {
 		$found = false;
+		$pluginPath = false;
+		if(strpos($fileName, '.') !== false) {
+			$plugin = explode('.', $fileName, 2);
+			$pluginPath = App::pluginPath($plugin[0]);
+		}
 
-		if (file_exists(CONFIGS . $fileName . '.php')) {
+		if ($pluginPath && file_exists($pluginPath . 'config' . DS . $plugin[1] . '.php')) {
+		include($pluginPath . 'config' . DS . $plugin[1] . '.php');
+			$found = true;
+		} elseif (file_exists(CONFIGS . $fileName . '.php')) {
 			include(CONFIGS . $fileName . '.php');
 			$found = true;
 		} elseif (file_exists(CACHE . 'persistent' . DS . $fileName . '.php')) {

diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
@@ -224,6 +224,27 @@ function testLoad() {
 		$this->assertTrue($result === null);
 	}
 
+/**
+ * testLoad method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadPlugin() {
+		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
+		$result = Configure::load('test_plugin.load');
+		$this->assertTrue($result === null);
+		$expected = '/test_app/plugins/test_plugin/config/load.php';
+		$config = Configure::read('plugin_load');
+		$this->assertEqual($config, $expected);
+
+		$result = Configure::load('test_plugin.more.load');
+		$this->assertTrue($result === null);
+		$expected = '/test_app/plugins/test_plugin/config/more.load.php';
+		$config = Configure::read('plugin_more_load');
+		$this->assertEqual($config, $expected);
+	}
+
 /**
  * testStore method
  *

diff --git a/cake/tests/test_app/plugins/test_plugin/config/load.php b/cake/tests/test_app/plugins/test_plugin/config/load.php
@@ -0,0 +1,3 @@
+<?php
+$config['plugin_load'] = '/test_app/plugins/test_plugin/config/load.php';
+?>
diff --git a/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/cake/tests/test_app/plugins/test_plugin/config/more.load.php
@@ -0,0 +1,3 @@
+<?php
+$config['plugin_more_load'] = '/test_app/plugins/test_plugin/config/more.load.php';
+?>