[6.x] Fix @nocache TypeError when rendered outside a matched route - #15215
Open
lazerg wants to merge 2 commits into
Open
[6.x] Fix @nocache TypeError when rendered outside a matched route#15215lazerg wants to merge 2 commits into
lazerg wants to merge 2 commits into
Conversation
Rename BladeDirectiveTest to NocacheBladeTest to match the NocacheRouteTest/ NocacheTagsTest naming pattern in this directory, and use the existing bladeViewPaths DefineEnvironment pattern (from HalfMeasureStaticCachingTest) instead of an inline View::addLocation() call, which was the only such call in the test suite.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@nocachethrows aTypeErrorinstead of rendering when the enclosing view has no matched route.Cache::isBeingUsedOnCurrentRoute()passesrequest()->route()straight intoRouter::gatherRouteMiddleware(), which is typed to require aRoute. When nothing has matched a route yet, that argument isnulland the call fatals beforeBladeDirective::handle()ever reaches its existing fallback for routes where static caching isn't active.This adds a null check so a routeless render is treated the same as any other route without the cache middleware: the region renders inline instead of crashing.
Fixes #15214