Fix default config directory (relative to current class)

marcovtwout · May 21, 2014 · 1144b07 · 1144b07
1 parent 6e02036
commit 1144b07
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/Environment.php b/Environment.php
@@ -31,7 +31,7 @@ class Environment
     /**
      * @var string config dir
      */
-    protected $configDir = '../../../config/';
+    protected $configDir;
 
     /**
      * @var string path to yii.php
@@ -88,12 +88,23 @@ protected function getValidModes()
      * @param string $configDir override default configDir
      */
     public function __construct($mode = null, $configDir = null)
+    {
+        $this->setConfigDir($configDir);
+        $this->setMode($mode);
+        $this->setEnvironment();
+    }
+
+    /**
+     * Set config dir.
+     * @param string $configDir
+     */
+    protected function setConfigDir($configDir)
     {
         if ($configDir !== null) {
             $this->configDir = rtrim($configDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        } else {
+            $this->configDir = __DIR__ . '/../../../config/';
         }
-        $this->setMode($mode);
-        $this->setEnvironment();
     }
 
     /**