[FrameworkBundle] fix assets and templating tests #17658
Merged
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
| @@ -547,11 +547,7 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB | |||
| 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader', | |||
| )); | |||
|
|
|||
| if ($container->hasDefinition('assets.packages')) { | |||
There was a problem hiding this comment.
isn't it still possible to disable the asset system if we don't need it ?
There was a problem hiding this comment.
That would mean to revert #17506.
3 tasks
| @@ -438,7 +438,15 @@ public function testAssetHelperWhenAssetsAreEnabled() | |||
|
|
|||
| public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled() | |||
| { | |||
| $container = $this->createContainerFromFile('assets_disabled'); | |||
There was a problem hiding this comment.
shouldn't we remove also src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/assets_disabled.*?
Now that the `assets` section is automatically enabled when `templating` is enabled (see symfony#17506), the `templating.helper.assets` will also be present as soon as the `templating` section is activated.
|
Thank you @xabbuh. |
fabpot
added a commit
that referenced
this pull request
Feb 3, 2016
This PR was merged into the 3.0 branch. Discussion ---------- [FrameworkBundle] fix assets and templating tests | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17506 | License | MIT | Doc PR | Now that the `assets` section is automatically enabled when `templating` is enabled (see #17506), the `templating.helper.assets` will also be present as soon as the `templating` section is activated. Commits ------- 293df5d [FrameworkBundle] fix assets and templating tests
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.
Now that the
assetssection is automatically enabled whentemplatingis enabled (see #17506), the
templating.helper.assetswill also bepresent as soon as the
templatingsection is activated.