Adding TTL to CacheUrlMatcher

Author: cryptiklemur

src/DependencyInjection/Compiler/RouterCompilerPass.php

@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
+ * @author Aaron Scherer <[email protected]>
  * @author Tobias Nyholm <[email protected]>
  */
 class RouterCompilerPass extends BaseCompilerPass
@@ -23,7 +24,7 @@ class RouterCompilerPass extends BaseCompilerPass
      */
     protected function prepare()
     {
-        $router = $this->container->getParameter($this->getAlias() . '.router');
+        $router = $this->container->getParameter($this->getAlias().'.router');
 
         if (!$router['enabled']) {
             return;

src/Routing/Matcher/CacheUrlMatcher.php

@@ -11,9 +11,10 @@
 
 namespace Cache\CacheBundle\Routing\Matcher;
 
-use Aequasi\Cache\CachePool;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * Class CacheUrlMatcher
@@ -22,12 +23,34 @@
  */
 class CacheUrlMatcher extends UrlMatcher
 {
-    const CACHE_LIFETIME = 604800; // a week
-
     /**
      * @var CacheItemPoolInterface
      */
-    protected $cache;
+    protected $cachePool;
+
+    /**
+     * @type int
+     */
+    protected $ttl;
+
+    /**
+     * CacheUrlMatcher constructor.
+     *
+     * @param CacheItemPoolInterface $cachePool
+     * @param int                    $ttl
+     * @param RouteCollection        $routes
+     * @param RequestContext         $context
+     */
+    public function __construct(
+        CacheItemPoolInterface $cachePool,
+        $ttl,
+        RouteCollection $routes,
+        RequestContext $context
+    ) {
+        $this->cachePool = $cachePool;
+        $this->ttl       = $ttl;
+        parent::__construct($routes, $context);
+    }
 
     /**
      * @param string $pathInfo
@@ -38,33 +61,17 @@ public function match($pathInfo)
     {
         $host   = strtr($this->context->getHost(), '.', '_');
         $method = strtolower($this->context->getMethod());
-        $key    = 'route_' . $method . '_' . $host . '_' . $pathInfo;
+        $key    = 'route_'.$method.'_'.$host.'_'.$pathInfo;
 
-        if ($this->cache->hasItem($key)) {
-            return $this->cache->getItem($key)->get();
+        if ($this->cachePool->hasItem($key)) {
+            return $this->cachePool->getItem($key)->get();
         }
 
         $match = parent::match($pathInfo);
-        $item = $this->cache->getItem($key);
-            $item->set($match)
-                ->expiresAfter(self::CACHE_LIFETIME);
+        $item  = $this->cachePool->getItem($key);
+        $item->set($match)
+            ->expiresAfter($this->ttl);
 
         return $match;
     }
-
-    /**
-     * @param CacheItemPoolInterface $cache
-     */
-    public function setCache(CacheItemPoolInterface $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * @return CacheItemPoolInterface
-     */
-    public function getCache()
-    {
-        return $this->cache;
-    }
 }

src/Routing/Router.php

@@ -49,8 +49,7 @@ public function getMatcher()
             return $this->matcher;
         }
 
-        $matcher = new CacheUrlMatcher($this->getRouteCollection(), $this->context);
-        $matcher->setCache($this->cache);
+        $matcher = new CacheUrlMatcher($this->cache, $this->ttl, $this->getRouteCollection(), $this->context);
 
         return $this->matcher = $matcher;
     }

src/Session/SessionHandler.php

@@ -11,7 +11,6 @@
 
 namespace Cache\CacheBundle\Session;
 
-use Doctrine\Common\Cache\Cache;
 use Psr\Cache\CacheItemPoolInterface;
 
 /**