diff --git a/src/StaticCaching/Middleware/Cache.php b/src/StaticCaching/Middleware/Cache.php index a30938912c9..85816471a82 100644 --- a/src/StaticCaching/Middleware/Cache.php +++ b/src/StaticCaching/Middleware/Cache.php @@ -265,7 +265,11 @@ private function createLock($request): Lock public static function isBeingUsedOnCurrentRoute() { - return in_array(static::class, app('router')->gatherRouteMiddleware(request()->route())); + if (! $route = request()->route()) { + return false; + } + + return in_array(static::class, app('router')->gatherRouteMiddleware($route)); } private function outputRefreshResponse($request) diff --git a/tests/StaticCaching/NocacheBladeTest.php b/tests/StaticCaching/NocacheBladeTest.php new file mode 100644 index 00000000000..7309d48166a --- /dev/null +++ b/tests/StaticCaching/NocacheBladeTest.php @@ -0,0 +1,28 @@ + 'half']); + + $this->assertSame('

region

', trim(Blade::render('@nocache("nocache-probe")'))); + } + + public function bladeViewPaths($app) + { + $app['config']->set('view.paths', [ + __DIR__.'/blade', + ...$app['config']->get('view.paths'), + ]); + } +} diff --git a/tests/StaticCaching/blade/nocache-probe.blade.php b/tests/StaticCaching/blade/nocache-probe.blade.php new file mode 100644 index 00000000000..d298ee89038 --- /dev/null +++ b/tests/StaticCaching/blade/nocache-probe.blade.php @@ -0,0 +1 @@ +

region