Pre-release 4.2.103 → 4.2.102 — task 4.3 config swap (illuminate/config v13)

composer.json

@@ -17,6 +17,7 @@
         "illuminate/cache": "^13",
         "illuminate/collections": "^13",
         "illuminate/conditionable": "^13",
+        "illuminate/config": "^13",
         "illuminate/console": "^13",
         "illuminate/container": "^13",
         "illuminate/contracts": "^13",
@@ -59,7 +60,6 @@
     },
     "replace": {
         "illuminate/auth": "self.version",
-        "illuminate/config": "self.version",
         "illuminate/exception": "self.version",
         "illuminate/foundation": "self.version",
         "illuminate/hashing": "self.version",

src/Illuminate/Foundation/start.php

@@ -130,11 +130,23 @@
 |
 */
 
-$app->instance('config', $config = new Config(
+// v13 Config\Repository takes a pre-loaded array (no loader/env-cascade). Keep the
+// fork FileLoader for the L4.2 env-cascade + eagerly load every group into the array.
+$loader = $app->getConfigLoader();
+
+$groups = [];
+foreach (array_merge(
+	glob($app['path'].'/config/*.php'),
+	glob($app['path'].'/config/'.$env.'/*.php')
+) as $file)
+{
+	$groups[basename($file, '.php')] = true;
+}
 
-	$app->getConfigLoader(), $env
+$items = array();
+foreach (array_keys($groups) as $group) $items[$group] = $loader->load($env, $group);
 
-));
+$app->instance('config', $config = new Config($items));
 
 /*
 |--------------------------------------------------------------------------

tests/CachedRouting/RoutingIntegrationTest.php

@@ -84,14 +84,7 @@ protected function refreshApplication(): void
 
         $this->app['path.storage'] = __DIR__;
 
-        $loader = $this->createMock('Illuminate\Config\LoaderInterface');
-
-        $loader->method('load')->willReturn([]);
-        $loader->method('exists')->willReturn(true);
-        $loader->method('getNamespaces')->willReturn([]);
-        $loader->method('cascadePackage')->willReturn([]);
-
-        $this->app['config'] = new Repository($loader, $this->app['env']);
+        $this->app['config'] = new Repository();
 
         $this->app['files'] = new Filesystem;
         $this->app['cache'] = new CacheManager($this->app);