Fix general config not being loaded

Author: riasvdv

src/Config/ConfigServiceProvider.php

@@ -22,7 +22,9 @@ public function register(): void
     {
         Env::extend(fn () => ConstAdapter::class);
 
-        $this->app->bind(GeneralConfig::class, fn () => Config::get('craft.general'));
+        $this->app->singleton(GeneralConfig::class, function () {
+            return $this->app['config']->get('craft.general');
+        });
     }
 
     public function boot(): void

src/Config/GeneralConfig.php

@@ -14,6 +14,7 @@
 use Illuminate\Http\Middleware\TrustProxies;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Traits\Conditionable;
 use yii\base\InvalidArgumentException;
 use yii\base\InvalidConfigException;
 
@@ -22,6 +23,8 @@
  */
 class GeneralConfig extends BaseConfig
 {
+    use Conditionable;
+
     public const IMAGE_DRIVER_AUTO = 'auto';
 
     public const IMAGE_DRIVER_GD = 'gd';

yii2-adapter/src/Yii2ServiceProvider.php

@@ -13,6 +13,7 @@
 use craft\utilities\AssetIndexes;
 use craft\utilities\ClearCaches;
 use CraftCms\Aliases\Aliases;
+use CraftCms\Cms\Config\BaseConfig;
 use CraftCms\Cms\Config\GeneralConfig;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Edition\Events\EditionChanged;
@@ -61,6 +62,10 @@ protected function registerMultiEnvironmentConfigs(): void
             $key = "craft.{$file->getFilenameWithoutExtension()}";
             $config = Config::get($key);
 
+            if ($config instanceof BaseConfig) {
+                continue;
+            }
+
             if (!is_array($config)) {
                 Config::set($key, []);
                 continue;