Fix site relative partial paths failing in 1.2 #587
Merged
Conversation
This file contains 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
Matches the behavior of the ViewMaker in the 1.1 branch more closely by checking if the partial path is a local reference first, returning that path if it is. Only if this check fails will it then run through the view paths. Fixes #571
Fixes the ViewMaker tests by emulating the same behaviour as a web request and having the current directory be the base path of the site, not the directory of the current module or plugin being tested.
bennothommo
added
maintenance
|
@bennothommo you have added a submodule for the winter/test plugin, needs to be removed. |
LukeTowers
added
Status: Revision Needed
and removed
needs review
LukeTowers
added a commit
that referenced
this pull request
Jun 29, 2022
* wip/1.2: (21 commits) Added fix to ensure correct normalization and return (#588) Outputs time respecting backend preferences (#572) Bump minimum Laravel version to 9.1 Fix site relative partial paths failing in 1.2 (#587) Switch back to using Laravel CacheServiceProvider Rebuild Snowboard agian Revert "Rebuild Snowboard" Rebuild Snowboard Allow a string selector for the form in a request Allow a string selector for the form in a request Use correct line breaks for Windows tests Backport ViewMaker tests from 1.2 branch Add additional testMakePartial cases to ViewMaker unit tests (#586) Added replaced plugins to the normalize map to ensure classloader namespace aliasing detects replacements (#585) Split tests into relevant module folders [FIX] Fix plugin flags not loading from cache correctly (#582) farsi spelling correction (#579) Moved plugin replacement namespace aliasing into register replacement method (#580) fix typo Add Winter 1.2 as version option in bug report ...
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.
Fixes #571
This PR changes the behaviour in the
ViewMakertrait to more closely match theViewMakerin 1.1, while still retaining the multiple extension support introduced in 643a581#diff-47d4d0a41b9809a09c2b0c209309cd6b776645682610fa2c1906ed66d6ef1b4b.If a path that is relative the base path is encountered in the
getViewPathmethod, and with one of the allowed extensions matches a valid file, this will be accepted as a partial path. If not, then the ViewMaker will attempt to same within the view paths added at that point. Previously, the base relative paths would only be checked if the path was symbolized in some fashion.This PR also introduces a fix to the
winter:testcommand by ensuring that the current working directory is always the base path. This matches the behaviour of a web request which would presume the same, and thus ensures that the changes above work in the tests as well.