Commit 1e5452b1 authored by Fabien Potencier's avatar Fabien Potencier

merged branch stof/twig_provider_length (PR #360)

Commits
-------

8ccf2172 Removed the aliases for classes

Discussion
----------

Removed the aliases for classes

They are no longer needed as there is no conflict anymore with the
silex providers since their renaming. And changing the length of the
file fixes #359
parents 550dbbe0 8ccf2172
...@@ -14,10 +14,10 @@ namespace Silex\Provider; ...@@ -14,10 +14,10 @@ namespace Silex\Provider;
use Silex\Application; use Silex\Application;
use Silex\ServiceProviderInterface; use Silex\ServiceProviderInterface;
use Symfony\Bridge\Twig\Extension\RoutingExtension as TwigRoutingExtension; use Symfony\Bridge\Twig\Extension\RoutingExtension;
use Symfony\Bridge\Twig\Extension\TranslationExtension as TwigTranslationExtension; use Symfony\Bridge\Twig\Extension\TranslationExtension;
use Symfony\Bridge\Twig\Extension\FormExtension as TwigFormExtension; use Symfony\Bridge\Twig\Extension\FormExtension;
use Symfony\Bridge\Twig\Extension\SecurityExtension as TwigSecurityExtension; use Symfony\Bridge\Twig\Extension\SecurityExtension;
/** /**
* Twig integration for Silex. * Twig integration for Silex.
...@@ -48,15 +48,15 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -48,15 +48,15 @@ class TwigServiceProvider implements ServiceProviderInterface
if (class_exists('Symfony\Bridge\Twig\Extension\RoutingExtension')) { if (class_exists('Symfony\Bridge\Twig\Extension\RoutingExtension')) {
if (isset($app['url_generator'])) { if (isset($app['url_generator'])) {
$twig->addExtension(new TwigRoutingExtension($app['url_generator'])); $twig->addExtension(new RoutingExtension($app['url_generator']));
} }
if (isset($app['translator'])) { if (isset($app['translator'])) {
$twig->addExtension(new TwigTranslationExtension($app['translator'])); $twig->addExtension(new TranslationExtension($app['translator']));
} }
if (isset($app['security.context'])) { if (isset($app['security.context'])) {
$twig->addExtension(new TwigSecurityExtension($app['security.context'])); $twig->addExtension(new SecurityExtension($app['security.context']));
} }
if (isset($app['form.factory'])) { if (isset($app['form.factory'])) {
...@@ -64,7 +64,7 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -64,7 +64,7 @@ class TwigServiceProvider implements ServiceProviderInterface
$app['twig.form.templates'] = array('form_div_layout.html.twig'); $app['twig.form.templates'] = array('form_div_layout.html.twig');
} }
$twig->addExtension(new TwigFormExtension($app['form.csrf_provider'], $app['twig.form.templates'])); $twig->addExtension(new FormExtension($app['form.csrf_provider'], $app['twig.form.templates']));
// add loader for Symfony built-in form templates // add loader for Symfony built-in form templates
$reflected = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension'); $reflected = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment