Merge branch '2.5'

* 2.5:
  fix typos
  [HttpKernel] add use statement for phpdoc
  fixed DateComparator if file does not exist
  Disabled the PHPUnit self-update on Travis
  fix mustRun() in sigchild environments
  [ClassLoader] simplified phpdoc
  [ClassLoader] Add a __call() method to XcacheClassLoader
  fix some minor typos in tests
  [Yaml] fixed mapping keys containing a quoted #
  Added fixture to test parsing of hash keys ending with a space and #
  [Validator] Pass strict argument into the strict email validator
  [Filesystem Component] mkdir race condition fix #11626
  [Validator] reverted permissions change on translation files
  Fixed Factory services not within the ServiceReferenceGraph.
  [CssSelector] Fix URL to SimonSapin/cssselect repo
  [Validator] Fixed wrong translation keys/messages for Collection constraint. The error messages for a missing field and an unexpected field did not match the Contraint class
  Remove hard dependency of RequestContext in AssetsExtension
  added useful reminder about form.vars.errors into UPGRADE-2.5 notes
  [YAML] resolve variables in inlined YAML
  Disallow abstract definitions from doctrine event listener registration

Conflicts:
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php

Author: fabpot

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;
         }

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">