Remove hard dependency of RequestContext in AssetsExtension

pgodel · pgodel · commit 5ad4d8a359cc · 2014-08-26T16:24:52.000-04:00
diff --git a/src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php b/src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
@@ -24,7 +24,7 @@ class AssetsExtension extends \Twig_Extension
     private $container;
     private $context;
 
-    public function __construct(ContainerInterface $container, RequestContext $requestContext)
+    public function __construct(ContainerInterface $container, RequestContext $requestContext = null)
     {
         $this->container = $container;
         $this->context = $requestContext;
@@ -94,13 +94,18 @@ public function getName()
      * @param string $url The URL that has to be absolute
      *
      * @return string The absolute URL
+     * @throws \RuntimeException
      */
     private function ensureUrlIsAbsolute($url)
     {
         if (false !== strpos($url, '://') || 0 === strpos($url, '//')) {
             return $url;
         }
 
+        if (!$this->context) {
+            throw new \RuntimeException('To generate an absolute URL for an asset, the Symfony Routing component is required.');
+        }
+
         if ('' === $host = $this->context->getHost()) {
             return $url;
         }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -66,7 +66,7 @@
         <service id="twig.extension.assets" class="%twig.extension.assets.class%" public="false">
             <tag name="twig.extension" />
             <argument type="service" id="service_container" />
-            <argument type="service" id="router.request_context" />
+            <argument type="service" id="router.request_context" on-invalid="null" />
         </service>
 
         <service id="twig.extension.actions" class="%twig.extension.actions.class%" public="false">

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class AssetsExtension extends \Twig_Extension`
`24`	`24`	`private $container;`
`25`	`25`	`private $context;`
`26`	`26`
`27`		`- public function __construct(ContainerInterface $container, RequestContext $requestContext)`
	`27`	`+ public function __construct(ContainerInterface $container, RequestContext $requestContext = null)`
`28`	`28`	`{`
`29`	`29`	`$this->container = $container;`
`30`	`30`	`$this->context = $requestContext;`
`@@ -94,13 +94,18 @@ public function getName()`
`94`	`94`	`* @param string $url The URL that has to be absolute`
`95`	`95`	`*`
`96`	`96`	`* @return string The absolute URL`
	`97`	`+ * @throws \RuntimeException`
`97`	`98`	`*/`
`98`	`99`	`private function ensureUrlIsAbsolute($url)`
`99`	`100`	`{`
`100`	`101`	`if (false !== strpos($url, '://') \|\| 0 === strpos($url, '//')) {`
`101`	`102`	`return $url;`
`102`	`103`	`}`
`103`	`104`
	`105`	`+ if (!$this->context) {`
	`106`	`+ throw new \RuntimeException('To generate an absolute URL for an asset, the Symfony Routing component is required.');`
	`107`	`+ }`
	`108`	`+`
`104`	`109`	`if ('' === $host = $this->context->getHost()) {`
`105`	`110`	`return $url;`
`106`	`111`	`}`