10000 minor #25890 [FrameworkBundle] revert useless tests fixtures changes … · symfony/symfony@af4b469 · GitHub
[go: up one dir, main page]
Skip to content

Commit af4b469

Browse files
fabpotfabpot
committed
minor #25890 [FrameworkBundle] revert useless tests fixtures changes (xabbuh)
This PR was merged into the 3.3 branch. Discussion ---------- [FrameworkBundle] revert useless tests fixtures changes | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? |no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | 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. Commits ------- fb1be51 revert useless tests fixtures changes
2 parents fa7b760 + fb1be51 commit af4b469

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>

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

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)
0