[10.x] Optimize Laravel Configuration Loading Process

src/Illuminate/Config/Repository.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Config;
 
 use ArrayAccess;
+use Exception;
 use Illuminate\Contracts\Config\Repository as ConfigContract;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Traits\Macroable;
@@ -18,15 +19,40 @@ class Repository implements ArrayAccess, ConfigContract
      */
     protected $items = [];
 
+    /**
+     * Configs loaded from cache.
+     *
+     * @var bool
+     */
+    private bool $loadedFromCache = false;
+
+    /**
+     * Path of configuration files.
+     *
+     * @var string
+     */
+    private string $configPath;
+
     /**
      * Create a new configuration repository.
      *
      * @param  array  $items
-     * @return void
+     * @param  string  $configPath
+     *
+     * @throws Exception
      */
-    public function __construct(array $items = [])
+    public function __construct(array $items = [], string $configPath = 'test')
     {
-        $this->items = $items;
+        $this->configPath = $configPath;
+
+        if ($items) {
+            $this->items = $items;
+            $this->loadedFromCache = true;
+        }
+
+        if (! $configPath == 'test' && ! $this->get('app')) {
+            throw new Exception('Unable to load the "app" configuration file.');
+        }
     }
 
     /**
@@ -37,9 +63,34 @@ public function __construct(array $items = [])
      */
     public function has($key)
     {
+        if (is_array($key)) {
+            return $this->hasMany($key);
+        }
+
+        $this->load($key);
+
         return Arr::has($this->items, $key);
     }
 
+    /**
+     * Check many keys has on configuration items.
+     * this added for load file before checking.
+     *
+     * @param  array  $keys
+     * @return bool
+     */
+    public function hasMany(array $keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->load($key);
+            if (! Arr::has($this->items, $key)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Get the specified configuration value.
      *
@@ -53,6 +104,8 @@ public function get($key, $default = null)
             return $this->getMany($key);
         }
 
+        $this->load($key);
+
         return Arr::get($this->items, $key, $default);
     }
 
@@ -71,6 +124,7 @@ public function getMany($keys)
                 [$key, $default] = [$default, null];
             }
 
+            $this->load($key);
             $config[$key] = Arr::get($this->items, $key, $default);
         }
 
@@ -89,6 +143,7 @@ public function set($key, $value = null)
         $keys = is_array($key) ? $key : [$key => $value];
 
         foreach ($keys as $key => $value) {
+            $this->load($key);
             Arr::set($this->items, $key, $value);
         }
     }
@@ -179,4 +234,55 @@ public function offsetUnset($key): void
     {
         $this->set($key, null);
     }
+
+    /**
+     * Load config file when not loaded or cache not loaded.
+     *
+     * @param  string|int  $key
+     * @return void
+     */
+    private function load($key): void
+    {
+        if (! $this->loadedFromCache && (is_string($key) || is_int($key)) && $file = $this->getConfigurationFile(''.$key)) {
+            if (! Arr::has($this->items, $file[0])) {
+                Arr::set($this->items, $file[0], require $file[1]);
+            }
+        }
+    }
+
+    /**
+     * Get config file key and file path.
+     *
+     * @param  string  $key
+     * @param  string  $fileKey
+     * @param  string|null  $configPath
+     * @return array
+     */
+    private function getConfigurationFile(string $key, string $fileKey = '', string $configPath = null): array
+    {
+        $aKey = explode('.', $key, 2);
+
+        if (! $configPath) {
+            $configPath = realpath($this->configPath);
+        }
+
+        $fileKey .= $fileKey ? '.'.$aKey[0] : $aKey[0];
+        $directory = $configPath.DIRECTORY_SEPARATOR.$aKey[0];
+
+        //this for check on nests directories
+        if (count($aKey) > 1 && is_dir($directory) && $file = $this->getConfigurationFile($aKey[1], $fileKey, $directory)) {
+            //This part is for when we have a directory and a file
+            // with the same name, the file is loaded first and
+            // then the files inside the folder are loaded.
+            if (is_file($directory.'.php')) {
+                $this->load($fileKey);
+            }
+
+            return $file;
+        } elseif (is_file($directory.'.php')) {
+            return [$fileKey, $directory.'.php'];
+        }
+
+        return [];
+    }
 }

src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php

@@ -16,6 +16,8 @@ class LoadConfiguration
      *
      * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @return void
+     *
+     * @throws \Exception
      */
     public function bootstrap(Application $app)
     {
@@ -27,17 +29,19 @@ public function bootstrap(Application $app)
         if (file_exists($cached = $app->getCachedConfigPath())) {
             $items = require $cached;
 
-            $loadedFromCache = true;
+//            $loadedFromCache = true;
         }
 
         // Next we will spin through all of the configuration files in the configuration
         // directory and load each one into the repository. This will make all of the
         // options available to the developer for use in various parts of this app.
-        $app->instance('config', $config = new Repository($items));
-
-        if (! isset($loadedFromCache)) {
-            $this->loadConfigurationFiles($app, $config);
-        }
+        // ...
+        // Repository changed for load as needed configs
+        $app->instance('config', $config = new Repository($items, $app->configPath()));
+        // Load all config in boot removed, no need
+//        if (! isset($loadedFromCache)) {
+//            $this->loadConfigurationFiles($app, $config);
+//        }
 
         // Finally, we will set the application's environment based on the configuration
         // values that were loaded. We will pass a callback which will be used to get
@@ -55,20 +59,20 @@ public function bootstrap(Application $app)
      * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @param  \Illuminate\Contracts\Config\Repository  $repository
      * @return void
-     *
-     * @throws \Exception
      */
-    protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)
+    public function loadConfigurationFiles(Application $app, RepositoryContract $repository)
     {
         $files = $this->getConfigurationFiles($app);
 
-        if (! isset($files['app'])) {
-            throw new Exception('Unable to load the "app" configuration file.');
-        }
+//        if (!isset($files['app'])) {
+//            throw new Exception('Unable to load the "app" configuration file.');
+//        }
 
-        foreach ($files as $key => $path) {
-            $repository->set($key, require $path);
-        }
+//        foreach ($files as $key => $path) {
+//            $repository->set($key, require $path);
+//        }
+
+        $repository->get($files);
     }
 
     /**
@@ -86,10 +90,11 @@ protected function getConfigurationFiles(Application $app)
         foreach (Finder::create()->files()->name('*.php')->in($configPath) as $file) {
             $directory = $this->getNestedDirectory($file, $configPath);
 
-            $files[$directory.basename($file->getRealPath(), '.php')] = $file->getRealPath();
+            //$files[$directory . basename($file->getRealPath(), '.php')] = $file->getRealPath();
+            $files[] = $directory.basename($file->getRealPath(), '.php');
         }
 
-        ksort($files, SORT_NATURAL);
+        //ksort($files, SORT_NATURAL);
 
         return $files;
     }

src/Illuminate/Foundation/Console/ConfigCacheCommand.php

@@ -3,8 +3,10 @@
 namespace Illuminate\Foundation\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Config\Repository as RepositoryContract;
 use Illuminate\Contracts\Console\Kernel as ConsoleKernelContract;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\Bootstrap\LoadConfiguration;
 use LogicException;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Throwable;
@@ -77,7 +79,7 @@ public function handle()
     }
 
     /**
-     * Boot a fresh copy of the application configuration.
+     * Boot a fresh copy all of the application configuration.
      *
      * @return array
      */
@@ -89,6 +91,8 @@ protected function getFreshConfiguration()
 
         $app->make(ConsoleKernelContract::class)->bootstrap();
 
+        $app->make(LoadConfiguration::class)->loadConfigurationFiles($app, $app->make(RepositoryContract::class));
+
         return $app['config']->all();
     }
 }