diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed test and fixture

Browse Source
This commit is contained in:
Diego Saint Esteben 2015-05-05 21:54:25 -03:00
parent 3be0923d25
commit 92e8799d76
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
View File

@ -47,6 +47,9 @@ $container->loadFromExtension('framework', array(
),
'hinclude_default_template' => 'global_hinclude_template',
),
'assets' => array(
'version' => 'v1',
),
'translator' => array(
'enabled' => true,
'fallback' => 'fr',

1
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
View File

@ -34,6 +34,7 @@
<framework:resource>theme2</framework:resource>
</framework:form>
</framework:templating>
<framework:assets version="v1" />
<framework:translator enabled="true" fallback="fr" logging="true" />
<framework:validation enabled="true" cache="apc" />
<framework:annotations cache="file" debug="true" file-cache-dir="%kernel.cache_dir%/annotations" />

2
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
View File

@ -36,6 +36,8 @@ framework:
form:
resources: [theme1, theme2]
hinclude_default_template: global_hinclude_template
assets:
version: v1
translator:
enabled: true
fallback: fr

3
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View File

@ -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())