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

Browse filesBrowse files
committed
minor #14941 [FrameworkBundle][SecurityBundle] Fix security tests (dosten)
This PR was merged into the 3.0-dev branch. Discussion ---------- [FrameworkBundle][SecurityBundle] Fix security tests | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | License | MIT Since `templating.helper.assets` is only available when the `php` engine is enabled, this piece of code only makes sense when the `php` engine is enabled. This PR also fixes the `SecurityBundle` tests, for the 3 remaining failing tests see doctrine/DoctrineBundle#435 Commits ------- 67994d6 Fixed tests
2 parents 282ea41 + 67994d6 commit 0e64108
Copy full SHA for 0e64108

File tree

Expand file treeCollapse file tree

1 file changed

+5
-5
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-5
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,12 +557,12 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
557557
'Symfony\\Bundle\\FrameworkBundle\\Templating\\PhpEngine',
558558
'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
559559
));
560-
}
561560

562-
if ($container->hasDefinition('assets.packages')) {
563-
$container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
564-
} else {
565-
$container->removeDefinition('templating.helper.assets');
561+
if ($container->hasDefinition('assets.packages')) {
562+
$container->getDefinition('templating.helper.assets')->replaceArgument(0, new Reference('assets.packages'));
563+
} else {
564+
$container->removeDefinition('templating.helper.assets');
565+
}
566566
}
567567
}
568568

0 commit comments

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