Merge pull request #387 from kaidesu/cached-config

Properly load configuration files when cached

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this package adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Cached config is now properly returned
+- Properly reference default location when seeding modules
 
 ## [5.0.0] - 2018-11-30
 ### Added

src/Support/ServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace Caffeinated\Modules\Support;
 
+use SplFileInfo;
+use Symfony\Component\Finder\Finder;
 use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
 
 class ServiceProvider extends IlluminateServiceProvider
@@ -45,12 +47,11 @@ protected function addMiddleware($middleware)
      */
     protected function loadConfigsFrom($path)
     {
-        // skip config if cache
-        if (file_exists($this->app->getCachedConfigPath())) {
-            foreach (glob($path.'/*.php') as $file) {
-                $fileName = str_replace($path.'/', '', $file);
-                $key = substr($fileName, 0, -4);
-                $this->app['config']->set($key, array_merge_recursive(config($key, []), require $file));
+        if (! $this->app->configurationIsCached()) {
+            $files = $this->getConfigurationFiles($path);
+
+            foreach ($files as $key => $path) {
+                config()->set($key, require $path);
             }
         }
     }
@@ -68,4 +69,43 @@ protected function loadFactoriesFrom($path)
             require $file;
         }
     }
+
+    /**
+     * Get all of the configuration files for the application.
+     *
+     * @param  string  $path
+     * @return array
+     */
+    private function getConfigurationFiles($path) {
+        $files      = [];
+        $configPath = realpath($path);
+
+        foreach (Finder::create()->files()->name('*.php')->in($configPath) as $file) {
+            $directory = $this->getNestedDirectory($file, $configPath);
+
+            $files[$directory.basename($file->getRealPath(), '.php')] = $file->getRealPath();
+        }
+
+        ksort($files, SORT_NATURAL);
+
+        return $files;
+    }
+
+    /**
+     * Get the configuration file nesting path.
+     *
+     * @param  \SplFileInfo  $file
+     * @param  string  $configPath
+     * @return string
+     */
+    protected function getNestedDirectory(SplFileInfo $file, $configPath)
+    {
+        $directory = $file->getPath();
+
+        if ($nested = trim(str_replace($configPath, '', $directory), DIRECTORY_SEPARATOR)) {
+            $nested = str_replace(DIRECTORY_SEPARATOR, '.', $nested).'.';
+        }
+
+        return $nested;
+    }
 }