[TwigBridge] Fix BC break due required twig environment #24851
Closed
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
derrabus
reviewed
Nov 7, 2017
| @@ -31,7 +31,7 @@ class TwigDataCollector extends DataCollector implements LateDataCollectorInterf | |||
| private $twig; | |||
| private $computed; | |||
|
|
|||
| public function __construct(Profile $profile, Environment $twig) | |||
| public function __construct(Profile $profile, Environment $twig = null) | |||
There was a problem hiding this comment.
Maybe passing null should trigger a deprecation warning, so we can remove the boilerplate below on the 4.0 branch again.
There was a problem hiding this comment.
sounds reasonable :) lets see what others think.
There was a problem hiding this comment.
No need to "deprecate" that as we are talking about an additional feature.
| $template = $this->twig->load($name = $profile->getName()); | ||
| } catch (\Twig_Error_Loader $e) { | ||
| $template = null; | ||
| if (null !== $this->twig) { |
There was a problem hiding this comment.
if (null === $this->twig) {return;}?
about the deprecation, too late IMHO if we want to be strict about the feat freeze
stof
approved these changes
Nov 7, 2017
nicolas-grekas
approved these changes
Nov 7, 2017
|
Thank you @ro0NL. |
nicolas-grekas
added a commit
that referenced
this pull request
Nov 7, 2017
…o0NL) This PR was squashed before being merged into the 3.4 branch (closes #24851). Discussion ---------- [TwigBridge] Fix BC break due required twig environment | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes/no | Fixed tickets | #24236 (comment) | License | MIT | Doc PR | symfony/symfony-docs#... <!--highly recommended for new features--> See ezsystems/ezplatform-design-engine#12 + silexphp/Silex-WebProfiler#126 + bolt/bolt#7154 Sorry for that :) cc @fabpot Commits ------- 243e4b2 [TwigBridge] Fix BC break due required twig environment
|
Much appreciated @ro0NL 👍 |
This was referenced Nov 12, 2017
Merged
Merged
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.
See ezsystems/ezplatform-design-engine#12 + silexphp/Silex-WebProfiler#126 + bolt/bolt#7154
Sorry for that :)
cc @fabpot