[10.x] Config path customization (#46053)

* Config path customization

Signed-off-by: Roger Vilà <[email protected]>

* add tests

Signed-off-by: Roger Vilà <[email protected]>

* apply styleci fixes

Signed-off-by: Roger Vilà <[email protected]>

* formatting

---------

Signed-off-by: Roger Vilà <[email protected]>
Co-authored-by: Taylor Otwell <[email protected]>

Author: rogervila

src/Illuminate/Foundation/Application.php

@@ -117,6 +117,13 @@ class Application extends Container implements ApplicationContract, CachesConfig
      */
     protected $appPath;
 
+    /**
+     * The custom configuration path defined by the developer.
+     *
+     * @var string
+     */
+    protected $configPath;
+
     /**
      * The custom database path defined by the developer.
      *
@@ -357,9 +364,7 @@ protected function bindPathsInContainer()
      */
     public function path($path = '')
     {
-        $appPath = $this->appPath ?: $this->basePath('app');
-
-        return $this->joinPaths($appPath, $path);
+        return $this->joinPaths($this->appPath ?: $this->basePath('app'), $path);
     }
 
     /**
@@ -422,7 +427,22 @@ public function useBootstrapPath($path)
      */
     public function configPath($path = '')
     {
-        return $this->joinPaths($this->basePath('config'), $path);
+        return $this->joinPaths($this->configPath ?: $this->basePath('config'), $path);
+    }
+
+    /**
+     * Set the configuration directory.
+     *
+     * @param  string  $path
+     * @return $this
+     */
+    public function useConfigPath($path)
+    {
+        $this->configPath = $path;
+
+        $this->instance('path.config', $path);
+
+        return $this;
     }
 
     /**
@@ -433,9 +453,7 @@ public function configPath($path = '')
      */
     public function databasePath($path = '')
     {
-        $databasePath = $this->databasePath ?: $this->basePath('database');
-
-        return $this->joinPaths($databasePath, $path);
+        return $this->joinPaths($this->databasePath ?: $this->basePath('database'), $path);
     }
 
     /**
@@ -487,9 +505,7 @@ public function useLangPath($path)
      */
     public function publicPath($path = '')
     {
-        $publicPath = $this->publicPath ?: $this->basePath('public');
-
-        return $this->joinPaths($publicPath, $path);
+        return $this->joinPaths($this->publicPath ?: $this->basePath('public'), $path);
     }
 
     /**
@@ -515,9 +531,7 @@ public function usePublicPath($path)
      */
     public function storagePath($path = '')
     {
-        $storagePath = $this->storagePath ?: $this->basePath('storage');
-
-        return $this->joinPaths($storagePath, $path);
+        return $this->joinPaths($this->storagePath ?: $this->basePath('storage'), $path);
     }
 
     /**

tests/Foundation/FoundationApplicationTest.php

@@ -516,6 +516,16 @@ public function testMacroable(): void
 
         $this->assertFalse($app->foo());
     }
+
+    /** @test */
+    public function testUseConfigPath(): void
+    {
+        $app = new Application;
+        $app->useConfigPath(__DIR__.'/fixtures/config');
+        $app->bootstrapWith([\Illuminate\Foundation\Bootstrap\LoadConfiguration::class]);
+
+        $this->assertSame('bar', $app->make('config')->get('app.foo'));
+    }
 }
 
 class ApplicationBasicServiceProviderStub extends ServiceProvider

tests/Foundation/fixtures/config/app.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'foo' => 'bar',
+];