[twig-bundle] uncomment encore_*_tags() when 5.4 is used
#948
Conversation
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
weaverryan
reviewed
May 31, 2021
weaverryan
approved these changes
May 31, 2021
fabpot
added a commit
to symfony/symfony
that referenced
this pull request
Jun 23, 2021
…allableHandler, as no-op (nicolas-grekas) This PR was merged into the 5.4 branch. Discussion ---------- [TwigBridge] Add `encore_entry_*_tags()` to UndefinedCallableHandler, as no-op | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Turning them into no-ops to allow uncommenting them in [the default base.html.twig](https://github.com/symfony/recipes/blob/ce8ee13f217ad077807c2b9b7f9947ee94230ab4/symfony/twig-bundle/3.3/templates/base.html.twig) See symfony/recipes#948 /cc `@weaverryan` Commits ------- f4b71ed [TwigBridge] Add `encore_entry_*_tags()` to UndefinedCallableHandler, as no-op
|
PR ready! |
Diff between recipe versionsThanks for the PR 😍 In order to help with the review stage, I'm in charge of computing the diff between the various versions of patched recipes. symfony/twig-bundle3.3 vs 4.4diff --git a/symfony/twig-bundle/3.3/config/packages/twig.yaml b/symfony/twig-bundle/4.4/config/packages/twig.yaml
index d1582a2..6403e6a 100644
--- a/symfony/twig-bundle/3.3/config/packages/twig.yaml
+++ b/symfony/twig-bundle/4.4/config/packages/twig.yaml
@@ -2,3 +2,4 @@ twig:
default_path: '%kernel.project_dir%/templates'
debug: '%kernel.debug%'
strict_variables: '%kernel.debug%'
+ exception_controller: null
diff --git a/symfony/twig-bundle/3.3/config/routes/dev/twig.yaml b/symfony/twig-bundle/3.3/config/routes/dev/twig.yaml
deleted file mode 100644
index f4ee839..0000000
--- a/symfony/twig-bundle/3.3/config/routes/dev/twig.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-_errors:
- resource: '@TwigBundle/Resources/config/routing/errors.xml'
- prefix: /_error4.4 vs 5.0diff --git a/symfony/twig-bundle/4.4/config/packages/twig.yaml b/symfony/twig-bundle/5.0/config/packages/twig.yaml
index 6403e6a..b3cdf30 100644
--- a/symfony/twig-bundle/4.4/config/packages/twig.yaml
+++ b/symfony/twig-bundle/5.0/config/packages/twig.yaml
@@ -1,5 +1,2 @@
twig:
default_path: '%kernel.project_dir%/templates'
- debug: '%kernel.debug%'
- strict_variables: '%kernel.debug%'
- exception_controller: null5.0 vs 5.3diff --git a/symfony/twig-bundle/5.0/config/packages/test/twig.yaml b/symfony/twig-bundle/5.0/config/packages/test/twig.yaml
deleted file mode 100644
index 8c6e0b4..0000000
--- a/symfony/twig-bundle/5.0/config/packages/test/twig.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-twig:
- strict_variables: true
diff --git a/symfony/twig-bundle/5.0/config/packages/twig.yaml b/symfony/twig-bundle/5.3/config/packages/twig.yaml
index b3cdf30..f9f4cc5 100644
--- a/symfony/twig-bundle/5.0/config/packages/twig.yaml
+++ b/symfony/twig-bundle/5.3/config/packages/twig.yaml
@@ -1,2 +1,6 @@
twig:
default_path: '%kernel.project_dir%/templates'
+
+when@test:
+ twig:
+ strict_variables: true |
chalasr
approved these changes
Jul 9, 2021
|
@nicolas-grekas something looks wrong in the comment of the github-actions-bot. There is no diff between 5.3 and 5.4, while it is the relevant one here as you are adding the 5.4 one. |
dunglas
reviewed
Jul 11, 2021
| <head> | ||
| <meta charset="UTF-8"> | ||
| <title>{% block title %}Welcome!{% endblock %}</title> | ||
| {# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #} |
There was a problem hiding this comment.
Shouldn't this comment be removed?
There was a problem hiding this comment.
we can keep it, it's a nice ad ;)
This pull request was closed.
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.
Needs symfony/symfony#41205