diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php index 5022aeaf9f..eaac84cd24 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php @@ -47,6 +47,9 @@ $container->loadFromExtension('framework', array( ), 'hinclude_default_template' => 'global_hinclude_template', ), + 'assets' => array( + 'version' => 'v1', + ), 'translator' => array( 'enabled' => true, 'fallback' => 'fr', diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml index 5b16a59796..56259c2ab6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml @@ -34,6 +34,7 @@ theme2 + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml index be1b41e25f..00a60858c6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml @@ -36,6 +36,8 @@ framework: form: resources: [theme1, theme2] hinclude_default_template: global_hinclude_template + assets: + version: v1 translator: enabled: true fallback: fr diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 9ee0aab66a..617821100d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -467,9 +467,8 @@ abstract class FrameworkExtensionTest extends TestCase public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled() { $container = $this->createContainerFromFile('assets_disabled'); - $packages = $container->getDefinition('templating.helper.assets')->getArgument(0); - $this->assertSame('assets.packages', (string) $packages); + $this->assertFalse($container->hasDefinition('templating.helper.assets')); } protected function createContainer(array $data = array())