Skip to content

Commit fb1be51

Browse files
committed
revert useless tests fixtures changes
This will revert #25847. Basically, the changes done in #25847 were not wrong per se. However, those changes were not necessary as the tests were not failing because of the missing "assets" config, but due to an issue introduced in the Config component. Furthermore, removing this part of the config fixtures gives us the benefit that our before normalization logic that enables assets support when the templating integration is enabled is properly tested.
1 parent fa7b760 commit fb1be51

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

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

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

33
$container->loadFromExtension('framework', array(
4-
'assets' => array(
5-
'enabled' => true,
6-
),
74
'templating' => array(
85
'engines' => array('php', 'twig'),
96
),

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
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" />
109
<framework:templating>
1110
<framework:engine>php</framework:engine>
1211
<framework:engine>twig</framework:engine>
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
framework:
2-
assets:
3-
enabled: true
42
templating:
53
engines: [php, twig]

0 commit comments

Comments
 (0)