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

merged branch stof/composer_install (PR #4380)

Browse Source 
Commits
-------

7a85b43 [TwigBundle] Fixed the path to templates when using composer

Discussion
----------

[TwigBundle] Composer install

When installing the bundle and the bridge from the standalone repositories
the relative path between them is different. This simply backports the
change done in symfony 2.1 to allow using subtree repositories with 2.0.x
too.

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

by travisbot at 2012-05-22T20:54:38Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1404225) (merged 8784dc49 into 836443d6).

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

by travisbot at 2012-05-22T21:01:40Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1404321) (merged 7a85b434 into 836443d6).
This commit is contained in:
Fabien Potencier 2012-05-23 15:15:03 +02:00
commit 6aa4d19213
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
View File

@ -55,7 +55,9 @@ class TwigExtension extends Extension
$container->setParameter('twig.exception_listener.controller', $config['exception_controller']);
$container->setParameter('twig.form.resources', $config['form']['resources']);
$container->getDefinition('twig.loader')->addMethodCall('addPath', array(__DIR__.'/../../../Bridge/Twig/Resources/views/Form'));
$reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
$container->getDefinition('twig.loader')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName()))));
if (!empty($config['globals'])) {
$def = $container->getDefinition('twig');