Use locator to find routerCacheFile

userfrosting · Jan 27, 2019 · 0e29f17 · 0e29f17
1 parent 1d2d5d1
commit 0e29f17
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Sprinkle list in the bakery `debug` command to uses the new `sprinkle:list` table
+- `routerCacheFile` config now only contains filename. Locator is used to find the full path
 
 ### Fix
 - Fix for `Test` Bakery command

diff --git a/app/sprinkles/core/config/production.php b/app/sprinkles/core/config/production.php
@@ -35,7 +35,7 @@
      * Use router cache, disable full error details
      */
     'settings' => [
-        'routerCacheFile'     => \UserFrosting\ROOT_DIR . '/' . \UserFrosting\APP_DIR_NAME . '/' . \UserFrosting\CACHE_DIR_NAME . '/' . 'routes.cache',
+        'routerCacheFile'     => 'routes.cache',
         'displayErrorDetails' => false
     ],
     /*

diff --git a/app/sprinkles/core/src/Bakery/ClearCacheCommand.php b/app/sprinkles/core/src/Bakery/ClearCacheCommand.php
@@ -51,7 +51,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Clear router cache
         $this->io->writeln('<info> > Clearing Router cache file</info>', OutputInterface::VERBOSITY_VERBOSE);
         if (!$this->clearRouterCache()) {
-            $file = $this->ci->config['settings.routerCacheFile'];
+            $filename = $this->ci->config['settings.routerCacheFile'];
+            $file = $this->ci->locator->findResource("cache://$filename", true, true);
             $this->io->error("Failed to delete Router cache file. Make sure you have write access to the `$file` file.");
             exit(1);
         }

diff --git a/app/sprinkles/core/src/ServicesProvider/ServicesProvider.php b/app/sprinkles/core/src/ServicesProvider/ServicesProvider.php
@@ -593,7 +593,8 @@ public function register(ContainerInterface $container)
         $container['router'] = function ($c) {
             $routerCacheFile = false;
             if (isset($c->config['settings.routerCacheFile'])) {
-                $routerCacheFile = $c->config['settings.routerCacheFile'];
+                $filename = $c->config['settings.routerCacheFile'];
+                $routerCacheFile = $c->locator->findResource("cache://$filename", true, true);
             }
 
             return (new Router())->setCacheFile($routerCacheFile);