merged branch jfsimon/issue-7375 (PR #7394)

This PR was merged into the master branch.

Commits
-------

6021873 [TwigBundle] fixed wrong rebase in #7373

Discussion
----------

[TwigBundle] fixed wrong rebase in #7375

When rebasing on master, `twig.loader` has not been renamed to `twig.loader.filesystem`.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7375

---------------------------------------------------------------------------

by stof at 2013-03-15T16:48:44Z

👍
This commit is contained in:
Fabien Potencier 2013-03-16 10:27:59 +01:00
commit 3a11efefcf
1 changed files with 1 additions and 1 deletions

View File

@ -24,7 +24,7 @@ class ExtensionPass implements CompilerPassInterface
if ($container->has('form.extension')) {
$container->getDefinition('twig.extension.form')->addTag('twig.extension');
$reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
$container->getDefinition('twig.loader')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
$container->getDefinition('twig.loader.filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
}
if ($container->has('translator')) {