support array of file path

zarv1k · May 29, 2016 · 5a7a1c9 · 5a7a1c9
1 parent e341b63
commit 5a7a1c9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/components/Params.php b/components/Params.php
@@ -75,17 +75,27 @@ protected function loadParams()
      * @return array
      * @throws InvalidConfigException
      */
-    protected function getFileParams()
+    public function getFileParams()
     {
         if (is_null($this->getFilePath())) {
             return [];
         }
 
-        $file = \Yii::getAlias($this->getFilePath());
-        if (!is_file($file)) {
-            throw new InvalidConfigException("Params file {$file} not found");
+        $fileParams = [];
+        $filePaths = $this->getFilePath();
+        if (!is_array($filePaths)) {
+            $filePaths = [$filePaths];
         }
-        return require($file);
+
+        foreach ($filePaths as $filePath) {
+            $file = \Yii::getAlias($filePath);
+            if (!is_file($file)) {
+                throw new InvalidConfigException("Params file {$file} not found");
+            }
+            ArrayHelper::merge($fileParams, require($file));
+        }
+
+        return $fileParams;
     }
 
     /**
@@ -259,15 +269,15 @@ public function setDb($db)
     }
 
     /**
-     * @return array
+     * @return string|array
      */
     public function getFilePath()
     {
         return $this->_filePath;
     }
 
     /**
-     * @param string $filePath
+     * @param string|attay $filePath
      */
     public function setFilePath($filePath)
     {

diff --git a/modules/params/controllers/ManageController.php b/modules/params/controllers/ManageController.php
@@ -10,8 +10,7 @@ class ManageController extends Controller
     public function actionIndex()
     {
         // prepare file params data provider
-        $filePath = \Yii::getAlias(\Yii::$app->params->getFilePath());
-        $fileParams = is_file($filePath) ? require($filePath) : [];
+        $fileParams = \Yii::$app->params->getFileParams();
 
         $fileParamKeys   = array_keys($fileParams);
         $fileParamsArray = array_map(