Merge pull request #63 from garak/inject-router

inject router instead of whole container
henrikbjorn · Feb 1, 2018 · 5a4e361 · 5a4e361
2 parents 34d3302 + d3691f2
commit 5a4e361
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
@@ -16,7 +16,7 @@
         <service id="templating.helper.gravatar" class="%templating.helper.gravatar.class%">
             <tag name="templating.helper" alias="gravatar" />
             <argument type="service" id="gravatar.api" />
-            <argument type="service" id="service_container" />
+            <argument type="service" id="router" />
         </service>
 
         <service id="twig.extension.gravatar" class="%twig.extension.gravatar.class%">

diff --git a/Templating/Helper/GravatarHelper.php b/Templating/Helper/GravatarHelper.php
@@ -3,7 +3,7 @@
 namespace Ornicar\GravatarBundle\Templating\Helper;
 
 use Ornicar\GravatarBundle\GravatarApi;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
@@ -20,19 +20,20 @@ class GravatarHelper extends Helper implements GravatarHelperInterface
     protected $api;
 
     /**
-     * @var ContainerInterface
+     * @var RouterInterface
      */
-    protected $container;
+    protected $router;
 
     /**
      * Constructor.
      *
-     * @param Ornicar\GravatarBundle\GravatarApi $api
+     * @param GravatarApi $api
+     * @param RouterInterface|null $router
      */
-    public function __construct(GravatarApi $api, ContainerInterface $container = null)
+    public function __construct(GravatarApi $api, RouterInterface $router = null)
     {
         $this->api = $api;
-        $this->container = $container;
+        $this->router = $router;
     }
 
     /**
@@ -108,10 +109,10 @@ protected function isSecure($preset = true)
             return (bool) $preset;
         }
 
-        if (!$this->container || !$this->container->has('router')) {
+        if (null === $this->router) {
             return false;
         }
 
-        return 'https' == strtolower($this->container->get('router')->getContext()->getScheme());
+        return 'https' == strtolower($this->router->getContext()->getScheme());
     }
 }