Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 4e253da

Browse filesBrowse files
fabpotfabpot
committed
bug #17865 [FrameworkBundle] disable the assets helper when assets are disabled (xabbuh)
This PR was merged into the 3.0 branch. Discussion ---------- [FrameworkBundle] disable the assets helper when assets are disabled | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17846 | License | MIT | Doc PR | Commits ------- c18f781 disable the assets helper when assets are disabled
2 parents b88f031 + c18f781 commit 4e253da
Copy full SHA for 4e253da

File tree

Expand file treeCollapse file tree

8 files changed

+55
-3
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+55
-3
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,11 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
547547
'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
548548
));
549549

550-
$container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
550+
if ($container->has('assets.packages')) {
551+
$container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
552+
} else {
553+
$container->removeDefinition('templating.helper.assets');
554+
}
551555
}
552556
}
553557

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

Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'templating' => array(
5+
'engines' => array('php', 'twig'),
6+
),
7+
));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_php_assets_disabled.php

Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'assets' => false,
5+
'templating' => array(
6+
'engines' => array('php'),
7+
),
8+
));

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

Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:templating>
10+
<framework:engine>php</framework:engine>
11+
<framework:engine>twig</framework:engine>
12+
</framework:templating>
13+
</framework:config>
14+
</container>

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

Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
templating:
3+
engines: [php, twig]

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

Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
framework:
2+
assets: false
3+
templating:
4+
engines: [php]

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+9-2Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,14 +436,21 @@ public function testAssetHelperWhenAssetsAreEnabled()
436436
$this->assertSame('assets.packages', (string) $packages);
437437
}
438438

439-
public function testAssetHelperWhenTemplatesAreEnabledAndAssetsAreDisabled()
439+
public function testAssetHelperWhenTemplatesAreEnabledAndNoAssetsConfiguration()
440440
{
441-
$container = $this->createContainerFromFile('full');
441+
$container = $this->createContainerFromFile('templating_no_assets');
442442
$packages = $container->getDefinition('templating.helper.assets')->getArgument(0);
443443

444444
$this->assertSame('assets.packages', (string) $packages);
445445
}
446446

447+
public function testAssetsHelperIsRemovedWhenPhpTemplatingEngineIsEnabledAndAssetsAreDisabled()
448+
{
449+
$container = $this->createContainerFromFile('templating_php_assets_disabled');
450+
451+
$this->assertTrue(!$container->has('templating.helper.assets'), 'The templating.helper.assets helper service is removed when assets are disabled.');
452+
}
453+
447454
public function testAssetHelperWhenAssetsAndTemplatesAreDisabled()
448455
{
449456
$container = $this->createContainerFromFile('default_config');

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ protected function loadFromFile(ContainerBuilder $container, $file)
2222
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/Fixtures/xml'));
2323
$loader->load($file.'.xml');
2424
}
25+
26+
public function testAssetsHelperIsRemovedWhenPhpTemplatingEngineIsEnabledAndAssetsAreDisabled()
27+
{
28+
$this->markTestSkipped('The assets key cannot be set to false using the XML configuration format.');
29+
}
2530
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.