[TwigBundle] fix broken FilesystemLoader::exists() with Twig 3 #34878
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
dpesch
changed the title
nicolas-grekas
changed the title
nicolas-grekas
approved these changes
Dec 10, 2019
|
@dpesch can you please squash your PR? I cannot do it as you did allow pushing on your fork. |
Twig3 FilesystemLoader::findTemplate() should return `string|null` instead of Twig2 `string|null|false`: see <https://github.com/twigphp/Twig/blob/3.x/src/Loader/FilesystemLoader.php#L167> Returning `null` fixes `exists()` of Twig 3 FilesystemLoader without breaking Twig 2 (which expected `null` or `false` for not found templates). Change the test to assert `null` instead of `false`.
|
@nicolas-grekas Thank you for your message. Is it better now? And how could/should I make it better? Should Allow edits from maintainers. be turned off? |
|
Thanks. It should be turned on actually. |
fabpot
approved these changes
Dec 11, 2019
|
Thank you @dpesch. |
fabpot
added a commit
that referenced
this pull request
Dec 11, 2019
…ig 3 (dpesch) This PR was merged into the 4.4 branch. Discussion ---------- [TwigBundle] fix broken FilesystemLoader::exists() with Twig 3 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34877 | License | MIT | Doc PR | This fix adapts the declaration of Twig 3 `\Twig\Loader\FilesystemLoader::findTemplate()` which expects to return `string|null` and returns `null` instead of `false`. Returning `false` breaks `\Twig\Loader\FilesystemLoader::exists()` which returns `true` if `findTemplate()` does not return `null`. Twig 2 should not be affected by this patch. The `exists()` method expects `null` or `false` for not found templates: <https://github.com/twigphp/Twig/blob/fdb691a424682a524555f73b2c665c06971c4ed5/src/Loader/FilesystemLoader.php#L169> Commits ------- ff1d77e bug #34877 [TwigBundle] fix findTemplate() to return `null`
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.
This fix adapts the declaration of Twig 3
\Twig\Loader\FilesystemLoader::findTemplate()which expects to returnstring|nulland returnsnullinstead offalse.Returning
falsebreaks\Twig\Loader\FilesystemLoader::exists()which returnstrueiffindTemplate()does not returnnull.Twig 2 should not be affected by this patch. The
exists()method expectsnullorfalsefor not found templates: https://github.com/twigphp/Twig/blob/fdb691a424682a524555f73b2c665c06971c4ed5/src/Loader/FilesystemLoader.php#L169