From 1cb8f6918f6d34be3a6875479ff083a7bacfcede Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 19 Jan 2018 12:05:40 +0100 Subject: [PATCH] [FrameworkBundle] fix DI extension tests 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. --- .../DependencyInjection/Fixtures/php/templating_no_assets.php | 3 +++ .../DependencyInjection/Fixtures/xml/templating_no_assets.xml | 1 + .../DependencyInjection/Fixtures/yml/templating_no_assets.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php index bf12a8bc47e5..6c924433a520 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_no_assets.php @@ -1,6 +1,9 @@ loadFromExtension('framework', array( + 'assets' => array( + 'enabled' => true, + ), 'templating' => array( 'engines' => array('php', 'twig'), ), diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml index d579ed4c0a18..67eafc5e554e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/templating_no_assets.xml @@ -6,6 +6,7 @@ http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + php twig diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml index 393477aeb49a..9e37c6d76f32 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/templating_no_assets.yml @@ -1,3 +1,5 @@ framework: + assets: + enabled: true templating: engines: [php, twig]