Update php config files to return array insetad of setting $config var.

cakephp · Jan 13, 2015 · c3962ba · c3962ba
1 parent 1f66598
commit c3962ba
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/src/Core/Configure/Engine/PhpConfig.php b/src/Core/Configure/Engine/PhpConfig.php
@@ -67,10 +67,15 @@ public function read($key)
     {
         $file = $this->_getFilePath($key, true);
 
-        include $file;
+        $return = include $file;
+        if (is_array($return)) {
+            return $return;
+        }
+
         if (!isset($config)) {
-            throw new Exception(sprintf('No variable $config found in %s', $file));
+            throw new Exception(sprintf('Config file "%s" did not return an array', $key . '.php'));
         }
+
         return $config;
     }
 

diff --git a/tests/test_app/Plugin/TestPlugin/config/load.php b/tests/test_app/Plugin/TestPlugin/config/load.php
@@ -13,4 +13,4 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-$config['plugin_load'] = '/test_app/Plugin/TestPlugin/Config/load.php';
+return ['plugin_load' => '/test_app/Plugin/TestPlugin/Config/load.php'];
diff --git a/tests/test_app/Plugin/TestPlugin/config/more.load.php b/tests/test_app/Plugin/TestPlugin/config/more.load.php
@@ -12,5 +12,4 @@
  * @since         1.3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-
-$config['plugin_more_load'] = '/test_app/Plugin/TestPlugin/Config/more.load.php';
+return ['plugin_more_load' => '/test_app/Plugin/TestPlugin/Config/more.load.php'];
diff --git a/tests/test_app/Plugin/TestPlugin/config/test_templates.php b/tests/test_app/Plugin/TestPlugin/config/test_templates.php
@@ -1,4 +1,4 @@
 <?php
-$config = [
+return [
     'italic' => '<em>{{text}}</em>',
 ];
diff --git a/tests/test_app/Plugin/TestPlugin/config/test_widgets.php b/tests/test_app/Plugin/TestPlugin/config/test_widgets.php
@@ -2,6 +2,6 @@
 /**
  * Widgets list for testing.
  */
-$config = [
+return [
     'text' => ['Cake\View\Widget\LabelWidget'],
 ];
diff --git a/tests/test_app/config/htmlhelper_tags.php b/tests/test_app/config/htmlhelper_tags.php
@@ -1,6 +1,5 @@
 <?php
-
-$config = [
+return [
     'formStart' => 'start form',
     'formEnd' => 'finish form',
     'hiddenBlock' => '<div class="hidden">{{content}}</div>',

diff --git a/tests/test_app/config/test_templates.php b/tests/test_app/config/test_templates.php
@@ -2,6 +2,6 @@
 /**
  * Template strings for testing.
  */
-$config = [
+return [
     'link' => '<a href="{{url}}">{{text}}</a>',
 ];
diff --git a/tests/test_app/config/test_widgets.php b/tests/test_app/config/test_widgets.php
@@ -2,6 +2,6 @@
 /**
  * Widgets list for testing.
  */
-$config = [
+return [
     'text' => ['Cake\View\Widget\LabelWidget'],
 ];
diff --git a/tests/test_app/config/var_test.php b/tests/test_app/config/var_test.php
@@ -1,5 +1,5 @@
 <?php
-$config = [
+return [
     'Read' => 'value',
     'Deep' => [
         'Deeper' => [

diff --git a/tests/test_app/config/var_test2.php b/tests/test_app/config/var_test2.php
@@ -1,5 +1,5 @@
 <?php
-$config = [
+return [
     'Read' => 'value2',
     'Deep' => [
         'Second' => [