fixed code as url_generator is now always available

fabpot · Aug 29, 2015 · 53f39cf · 53f39cf
1 parent 2179d54
commit 53f39cf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/doc/services.rst b/doc/services.rst
@@ -245,15 +245,15 @@ Core parameters
 
   Defaults to 80.
 
-  This parameter can be used by the ``UrlGeneratorProvider``.
+  This parameter can be used when generating URLs.
 
 * **request.https_port** (optional): Allows you to override the default port
   for HTTPS URLs. If the current request is HTTPS, it will always use the
   current port.
 
   Defaults to 443.
 
-  This parameter can be used by the ``UrlGeneratorProvider``.
+  This parameter can be used when generating URLs.
 
 * **debug** (optional): Returns whether or not the application is running in
   debug mode.

diff --git a/doc/usage.rst b/doc/usage.rst
@@ -389,9 +389,9 @@ have the value ``index``.
 Named Routes
 ~~~~~~~~~~~~
 
-Some providers (such as ``UrlGeneratorProvider``) can make use of named routes.
-By default Silex will generate an internal route name for you but you can give
-an explicit route name by calling ``bind``::
+Some providers can make use of named routes. By default Silex will generate an
+internal route name for you but you can give an explicit route name by calling
+``bind``::
 
     $app->get('/', function () {
         // ...
@@ -625,7 +625,7 @@ round-trip to the browser (as for a redirect), use an internal sub-request::
 
 .. tip::
 
-    If you are using ``UrlGeneratorProvider``, you can also generate the URI::
+    You can also generate the URI via the built-in URL generator::
 
         $request = Request::create($app['url_generator']->generate('hello'), 'GET');
 

diff --git a/src/Silex/Provider/SecurityServiceProvider.php b/src/Silex/Provider/SecurityServiceProvider.php
@@ -335,7 +335,7 @@ public function register(Container $app)
         };
 
         $app['security.http_utils'] = function ($app) {
-            return new HttpUtils(isset($app['url_generator']) ? $app['url_generator'] : null, $app['request_matcher']);
+            return new HttpUtils($app['url_generator'], $app['request_matcher']);
         };
 
         $app['security.last_error'] = $app->protect(function (Request $request) {

diff --git a/src/Silex/Provider/TwigServiceProvider.php b/src/Silex/Provider/TwigServiceProvider.php
@@ -67,10 +67,7 @@ public function register(Container $app)
 
             if (class_exists('Symfony\Bridge\Twig\Extension\RoutingExtension')) {
                 $twig->addExtension(new HttpFoundationExtension($app['request_stack']));
-
-                if (isset($app['url_generator'])) {
-                    $twig->addExtension(new RoutingExtension($app['url_generator']));
-                }
+                $twig->addExtension(new RoutingExtension($app['url_generator']));
 
                 if (isset($app['translator'])) {
                     $twig->addExtension(new TranslationExtension($app['translator']));

diff --git a/tests/Silex/Tests/Application/UrlGeneratorTraitTest.php b/tests/Silex/Tests/Application/UrlGeneratorTraitTest.php
@@ -21,16 +21,16 @@ class UrlGeneratorTraitTest extends \PHPUnit_Framework_TestCase
     public function testUrl()
     {
         $app = new UrlGeneratorApplication();
-        $app['url_generator'] = $translator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->disableOriginalConstructor()->getMock();
-        $translator->expects($this->once())->method('generate')->with('foo', array(), true);
+        $app['url_generator'] = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->disableOriginalConstructor()->getMock();
+        $app['url_generator']->expects($this->once())->method('generate')->with('foo', array(), true);
         $app->url('foo');
     }
 
     public function testPath()
     {
         $app = new UrlGeneratorApplication();
-        $app['url_generator'] = $translator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->disableOriginalConstructor()->getMock();
-        $translator->expects($this->once())->method('generate')->with('foo', array(), false);
+        $app['url_generator'] = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->disableOriginalConstructor()->getMock();
+        $app['url_generator']->expects($this->once())->method('generate')->with('foo', array(), false);
         $app->path('foo');
     }
 }