[WIP][Routing] Extended Expression Language in a routing component

src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php

@@ -26,6 +26,14 @@ class PhpMatcherDumper extends MatcherDumper
 {
     private $expressionLanguage;
 
+    /**
+     * @param ExpressionLanguage $expressionLanguage
+     */
+    public function setExpressionLanguage(ExpressionLanguage $expressionLanguage = null)
+    {
+        $this->expressionLanguage = $expressionLanguage;
+    }
+
     /**
      * Dumps a set of routes to a PHP class.
      *

src/Symfony/Component/Routing/Matcher/UrlMatcher.php

@@ -80,6 +80,14 @@ public function getContext()
         return $this->context;
     }
 
+    /**
+     * @param ExpressionLanguage $expressionLanguage
+     */
+    public function setExpressionLanguage(ExpressionLanguage $expressionLanguage = null)
+    {
+        $this->expressionLanguage = $expressionLanguage;
+    }
+
     /**
      * {@inheritdoc}
      */

src/Symfony/Component/Routing/Router.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\ConfigCache;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Routing\Generator\ConfigurableRequirementsInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Generator\Dumper\GeneratorDumperInterface;
@@ -70,6 +71,11 @@ class Router implements RouterInterface, RequestMatcherInterface
      */
     protected $logger;
 
+    /**
+     * @var ExpressionLanguage|null
+     */
+    private $expressionLanguage;
+
     /**
      * Constructor.
      *
@@ -150,6 +156,14 @@ public function setOption($key, $value)
         $this->options[$key] = $value;
     }
 
+    /**
+     * @param ExpressionLanguage $expressionLanguage
+     */
+    public function setExpressionLanguage(ExpressionLanguage $expressionLanguage = null)
+    {
+        $this->expressionLanguage = $expressionLanguage;
+    }
+
     /**
      * Gets an option value.
      *
@@ -245,13 +259,21 @@ public function getMatcher()
         }
 
         if (null === $this->options['cache_dir'] || null === $this->options['matcher_cache_class']) {
-            return $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context);
+            $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context);
+            if (method_exists($this->matcher, 'setExpressionLanguage')) {
+                $this->matcher->setExpressionLanguage($this->expressionLanguage);
+            }
+
+            return $this->matcher;
         }
 
         $class = $this->options['matcher_cache_class'];
         $cache = new ConfigCache($this->options['cache_dir'].'/'.$class.'.php', $this->options['debug']);
         if (!$cache->isFresh()) {
             $dumper = $this->getMatcherDumperInstance();
+            if (method_exists($dumper, 'setExpressionLanguage')) {
+                $dumper->setExpressionLanguage($this->expressionLanguage);
+            }
 
             $options = array(
                 'class'      => $class,
@@ -263,7 +285,12 @@ public function getMatcher()
 
         require_once $cache;
 
-        return $this->matcher = new $class($this->context);
+        $this->matcher = new $class($this->context);
+        if (method_exists($this->matcher, 'setExpressionLanguage')) {
+            $this->matcher->setExpressionLanguage($this->expressionLanguage);
+        }
+
+        return $this->matcher;
     }
 
     /**