8000 minor #25847 [FrameworkBundle] fix DI extension tests (xabbuh) · symfony/symfony@38abc7b · GitHub
[go: up one dir, main page]
Skip to content

Commit 38abc7b

Browse files
chalasrchalasr
committed
minor #25847 [FrameworkBundle] fix DI extension tests (xabbuh)
This PR was merged into the 3.3 branch. Discussion ---------- [FrameworkBundle] fix DI extension tests | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The failing tests relied on the assets integration being enabled. Since we never did enable this explicitly, the assets related definitions are removed now that #25789 was merged which fixed #25760. Commits ------- 1cb8f69 [FrameworkBundle] fix DI extension tests
2 parents 00621d4 + 1cb8f69 commit 38abc7b

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?php
22

33
$container->loadFromExtension('framework', array(
4+
'assets' => array(
5+
'enabled' => true,
6+
),
47
'templating' => array(
58
'engines' => array('php', 'twig'),
69
),

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9+
<framework:assets enabled="true" />
910
<framework:templating>
1011
<framework:engine>php</framework:engine>
1112
<framework:engine>twig</framework:engine>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
framework:
2+
assets:
3+
enabled: true
24
templating:
35
engines: [php, tw 32CB ig]

0 commit comments

Comments
 (0)
0