8000 Merge branch '2.7' · symfony/symfony@5e017e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e017e5

Browse files
fabpotfabpot
committed
Merge branch '2.7'
* 2.7: [TwigBundle] always load the exception listener if the templating.engines is not present [TwigBundle] removed the Container dependency on ActionsExtension [Filesystem] keep exec perms when copying fixed typo Fixed minor typo - override [Filesystem] enforce umask while testing [TwigBridge] moved fixtures into their own directory [2.3] Fix lowest deps [TwigBundle] added missing @deprecated tags Use $this->iniSet() in tests Conflicts: src/Symfony/Bundle/TwigBundle/composer.json
2 parents 9c6d315 + 60a97ec commit 5e017e5

File tree

21 files changed

+50
-42
lines changed

21 files changed

+50
-42
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/child_label.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/custom_widgets.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/custom_widgets.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/page_dynamic_extends.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/parent_label.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/parent_label.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/theme.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/theme_extends.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_extends.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/theme_use.html.twig renamed to ‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/templates/form/theme_use.html.twig

File renamed without changes.

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function setUp()
4242

4343
$loader = new StubFilesystemLoader(array(
4444
__DIR__.'/../../Resources/views/Form',
45-
__DIR__,
45+
__DIR__.'/Fixtures/templates/form',
4646
));
4747

4848
$environment = new \Twig_Environment($loader, array('strict_variables' => true));

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function setUp()
4141

4242
$loader = new StubFilesystemLoader(array(
4343
__DIR__.'/../../Resources/views/Form',
44-
__DIR__,
44+
__DIR__.'/Fixtures/templates/form',
4545
));
4646

4747
$environment = new \Twig_Environment($loader, array('strict_variables' => true));

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ public function process(ContainerBuilder $container)
2828
}
2929

3030
// register the exception controller only if Twig is enabled
31-
$engines = $container->getParameter('templating.engines');
32-
if (!in_array('twig', $engines)) {
33-
$container->removeDefinition('twig.exception_listener');
31+
if ($container->hasParameter('templating.engines')) {
32+
$engines = $container->getParameter('templating.engines');
33+
if (!in_array('twig', $engines)) {
34+
$container->removeDefinition('twig.exception_listener');
35+
}
3436
}
3537
}
3638
}

0 commit comments

Comments
 (0)
0