Merge pull request laravel#269 from phanan/feature-1

[5.1] Allow getting path to configuration directory
Hydrane · Oct 19, 2015 · 3079aab · 3079aab
2 parents 3855466 + 8800a2e
commit 3079aab
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -844,19 +844,30 @@ public function configure($name)
     }
 
     /**
-     * Get the path to the given configuration file.
+     * Get the path to the given configuration file, or to the directory if the argument is 
+     * empty.
      *
      * @param  string  $name
      * @return string
      */
-    protected function getConfigurationPath($name)
+    public function getConfigurationPath($name = null)
     {
-        $appConfigPath = ($this->configPath ?: $this->basePath('config')).'/'.$name.'.php';
+        if (! $name) {
+            $appConfigDir = ($this->configPath ?: $this->basePath('config')).'/';
 
-        if (file_exists($appConfigPath)) {
-            return $appConfigPath;
-        } elseif (file_exists($path = __DIR__.'/../config/'.$name.'.php')) {
-            return $path;
+            if (file_exists($appConfigDir)) {
+                return $appConfigDir;
+            } elseif (file_exists($path = __DIR__.'/../config/')) {
+                return $path;
+            }
+        } else {
+            $appConfigPath = ($this->configPath ?: $this->basePath('config')).'/'.$name.'.php';
+
+            if (file_exists($appConfigPath)) {
+                return $appConfigPath;
+            } elseif (file_exists($path = __DIR__.'/../config/'.$name.'.php')) {
+                return $path;
+            }
         }
     }