Load application configuration files from <basePath>/config by default

Author: lkrms

src/Util/Container/Application.php

@@ -9,6 +9,7 @@
 use Lkrms\Exception\FilesystemErrorException;
 use Lkrms\Exception\InvalidEnvironmentException;
 use Lkrms\Facade\Cache;
+use Lkrms\Facade\Config;
 use Lkrms\Facade\Console;
 use Lkrms\Facade\Err;
 use Lkrms\Facade\Profile;
@@ -264,15 +265,21 @@ final public function getTempPath(bool $create = true): string
      * is used after removing common PHP file extensions and recognised version
      * numbers.
      *
+     * If `$configDir` exists and is a directory, it is passed to
+     * {@see Config::loadDirectory()} after `.env` files are loaded and applied.
+     *
      * @api
      *
      * @param int-mask-of<EnvFlag::*> $envFlags Values to apply from the
      * environment to the running script.
+     * @param string|null $configDir A path relative to the application's base
+     * path, or `null` if configuration files should not be loaded.
      */
     public function __construct(
         ?string $basePath = null,
         ?string $appName = null,
-        int $envFlags = EnvFlag::ALL
+        int $envFlags = EnvFlag::ALL,
+        ?string $configDir = 'config'
     ) {
         if (!isset(self::$StartTime)) {
             self::$StartTime = hrtime(true);
@@ -345,6 +352,15 @@ public function __construct(
         if ($adodb !== null) {
             Err::silencePath($adodb);
         }
+
+        if ((string) $configDir !== '') {
+            if (!File::isAbsolute($configDir)) {
+                $configDir = "{$this->BasePath}/{$configDir}";
+            }
+            if (is_dir($configDir)) {
+                Config::loadDirectory($configDir);
+            }
+        }
     }
 
     /**

src/Util/Container/ApplicationInterface.php

@@ -50,7 +50,8 @@ public function getBasePath(): string;
     public function getCachePath(): string;
 
     /**
-     * Get a writable directory for the application's configuration files
+     * Get a writable directory for configuration files created by the
+     * application
      */
     public function getConfigPath(): string;
 

tests/unit/Util/Container/ApplicationTest.php

@@ -6,13 +6,22 @@
 use Lkrms\Container\ApplicationInterface;
 use Lkrms\Container\Container;
 use Lkrms\Container\ContainerInterface;
+use Lkrms\Facade\Config;
 use Lkrms\Tests\TestCase;
+use Lkrms\Utility\Catalog\EnvFlag;
 use Lkrms\Utility\Env;
 use Lkrms\Utility\File;
 use Psr\Container\ContainerInterface as PsrContainerInterface;
 
 final class ApplicationTest extends TestCase
 {
+    private const CONFIG = [
+        'app' => [
+            'name' => 'My App',
+        ],
+        'services' => [],
+    ];
+
     public function testBindContainer(): void
     {
         $app = new Application();
@@ -29,6 +38,34 @@ public function testBindContainer(): void
         $app->unload();
     }
 
+    public function testConfigDir(): void
+    {
+        $this->assertSame([], Config::all());
+
+        $basePath = File::createTempDir();
+        $configDir = $basePath . '/config';
+        File::createDir($configDir);
+        foreach (self::CONFIG as $name => $data) {
+            $data = sprintf(
+                '<?php return %s;' . \PHP_EOL,
+                var_export($data, true),
+            );
+            File::putContents("{$configDir}/{$name}.php", $data);
+        }
+
+        $app = new Application($basePath, null, EnvFlag::ALL, null);
+        $this->assertSame([], Config::all());
+
+        $app = new Application($basePath);
+        $this->assertSame(self::CONFIG, Config::all());
+
+        $app->unload();
+        Config::unload();
+
+        File::pruneDir($basePath);
+        rmdir($basePath);
+    }
+
     /**
      * @backupGlobals enabled
      */