Adding TTL to router config

Author: cryptiklemur

src/DependencyInjection/Compiler/RouterCompilerPass.php

@@ -32,6 +32,7 @@ protected function prepare()
         $def = clone $this->container->findDefinition('router');
         $def->setClass('Cache\CacheBundle\Routing\Router');
         $def->addMethodCall('setCache', [new Reference(sprintf('cache.instance.%s', $router['instance']))]);
+        $def->addMethodCall('setTtl', [$router['ttl']]);
 
         $this->container->setDefinition('cache.router', $def);
         $this->container->setAlias('router.alias', 'cache.router');

src/DependencyInjection/Configuration.php

@@ -141,6 +141,9 @@ private function addRouterSection()
                 ->booleanNode('enabled')
                     ->defaultFalse()
                 ->end()
+                ->integerNode('ttl')
+                    ->isRequired()
+                ->end()
                 ->booleanNode('auto-register')
                     ->defaultTrue()
                 ->end()

src/Resources/views/Collector/cache.html.twig

@@ -11,7 +11,7 @@
 
 {% block toolbar %}
     {% set icon %}
-    <img width="20" height="28" alt="AequasiCache"
+    <img width="20" height="28" alt="Cache"
          src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DGRcHJGLuAHcAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAACrUlEQVRIx+2UO0xTYRTHz3d7b6FIeUmhviZauaCgpQkIPoIRXyBIEZISJonI04DEGNDFhBBICNrBKJjSmrhonAzKAA7appoymaglTXBoL9gXBQr2Yu9t+7lYINjGxcSl//Hkl99w/icHIJ54/n9Q+/VWkmVZVTAYdEil2bOjGg0XDVQ3NNSLxWKfw+kyvJ56E4glFOTl0pkLDDPrdrma13xrUqWiiPk6Z3Fuh3q7e/bMz397abPbuygBqVAqi2yWuTkmmpCgD+WnUBQFHM/Dktfb4nQ6pivPnR+cnJxMjkDJqSkHMnZnZOEwhuWVlapFZmGqovz0Q712QvKHEAAQxnhz4GdZidvj6R8ZGv7U0dZ+CgBASFEUArTJBDguZdXn6xwfH7M0qRubdwq3FooQIIQAAJCfZXNmzeb3ly5W6kKhUHoUBng+mGm1WicuVJx923qtRQYAQMZsCyHAGIPD4bhqMhivkEKKjMW4PZ4zAZ77WF1ZJSP/egYIQW4eLbLZ7ChmswICaJoW0/n5oqhCjDFgjCFTIoGeW73AB4PmZzp9MQAIdnIJQiG0dnXCQZp+F+ACa0Q0UWJCAlRfroERzf31H35/reXzlzsYQzjCAAAQBAElpcfgsU4b3Lt/3w2j0aAqP3GSJQG2GhYQBBQcKYRqVS2XJZW+6OjobDMZDOzAwMBx+C1CCIFcLoeaOlU4Ry436vW6Js3og8WIgyQIQRgAIDs7C+rVajhcWGD2epeHyopLXkWgtPS0jXA4DLuSkqC+UQ1HixRWjuOHi5XKpzvXRSqUytWSslJOJBKth0Khex9Mpuc3u3uWtkMbPzmmt++2jSRJOcfzgy63W9ugqrNHLfHR2BhBEEiWmprm101ov89Mz+Bo4BOtNjdRlOhnGMZxt68/FH+D8fzD/AKVShqzbU52jQAAAABJRU5ErkJggg==" />
     <span class="sf-toolbar-status">{{ collector.totals.calls }}</span>
     {% if collector.totals.calls > 0 %}
@@ -43,7 +43,7 @@
 {% block menu %}
     <span class="label">
     <span class="icon">
-        <img width="32" height="33" alt="AequasiCache"
+        <img width="32" height="33" alt="Cache"
              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DGRcLOjRUchgAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAEM0lEQVRYw+1Wa0ybZRR+3q8tY1gwmshGvBGW/ViEBqfSghpgFzdmNhaQy4bZsoEbRcCNIQtEsoTb3Bj9AVWgILDF0UksJNKIl0gQ0RUolFvnmEhSpixeKKATOno5/mAlGyu23S9/9Pn55X3OeZ5zznu+F/DAAw/+DyAiobK5Ob+vry/l5tSU0B2ubmBQVFtdXTw+Pi4mIt5DCZBXVpaGBofQS89vpbjY/breH67ucZWbduSobmuIiF4Jj7hz7Giqkog2uZObIyLOYJg6yBiDjQgGgyFUKpWq3y8tqxseGnraSeV85+fngxmPB5PJ5KUdGEjevWNnf1tr6xGbjXxcEqBQKHje3useBxEYY2BgYIyxlpaWtNyTOf1XlMocIhI4IstkMj/GcStl5zgOf87MPHa2pLQ+MT7+69m52XCnAqanpxmBGMCWvzAsC2EMxtnZDWdLSisypRnfqNvbXyAidi95YWGBWx3wbiW5ycnJiJgdr3VXlJefnzJMbVxLAH8lq4NAACDw8oJGo3lVNzjYPaDV1hPRe4yxv5064ziYLRa+sln57hcdHUm9Gk2BWCK5/MC55WY61HAflsxmnzZVa3ZyQuJAU0NjPBHxFxcXbctkx7CbMBpnn5EeS//4RHZ2W69GE/qggP8Icm8gvkCAiYmJzfKqqk/SUtPUsbGxAYzI6aAxxsA4hp7veva/k5nV81F9fZG9nWu2wIkYnk6r3VUPBDEe3x0ezBbLIx9UyQtvTU97A8jjnPtfIyDHYWR4eDPPHtk9AxjU6Q4QEY97mMVls1rh47Me52QVZLZY3OJaLRaIRCKczM2dYYzZh5BcXdngOIYwiRhNzZfNKpWq3JUCEhGICHwBH8czpHgrM+PXM4WFmQCsnDuuAwI24kxxMR04dOhGqEi0c4O/f6Wr3Oht0aiqrrYQj1O9LJaIOzs7e1aGkJyo9xIIsH3PHiS/mfLPFaWyrKSoqAaAkc/nP+XM+aN+fpBmZWK9UDgql1flX2xs6gBgu28RsVUS6O5atlmtCBGJkJ71tnXGaPw+eMuWLAAj9nNms5k5SrrcazOSD6Zg997XF9rV6qbC/ILTAG473ITkIIivUIi4hDfwokR8S1GryGtsaPgUgMmBz9VkBAYGIud0Hn6a/Lm7IL8g53O1enCtQvO7urpsUZGRK6NsXlpCZHQUDqel3tHr9Z9FiCWnANx0RNbr9UsCr3UEgBERrBYLTuSewnOikN/r6urKFNU1cgBWp1fz4qVLQ9sjoyghLp5a29qo46svb+zdty8KgLMHhresQrawLSqapMfTaezaNTp3oVwpCZc869bdTExKOjw8Nmq62t/32/mKC6UAfF3lflhboxoaHTF1fts1tismJtnthWb/J4SFhQXZiP7S9vf/4c5yDNoU5PuEv/+T83Nzv1z/8fptzwPXAw/cxb9BRtmu8GHExgAAAABJRU5ErkJggg==" />
     </span>
     <strong>Cache</strong>

src/Routing/Router.php

@@ -12,11 +12,9 @@
 namespace Cache\CacheBundle\Routing;
 
 use Cache\CacheBundle\Routing\Matcher\CacheUrlMatcher;
-use Aequasi\Cache\CachePool;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Bundle\FrameworkBundle\Routing\Router as BaseRouter;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Routing\RequestContext;
 
 /**
  * Class Router
@@ -37,6 +35,11 @@ class Router extends BaseRouter
      */
     protected $cache;
 
+    /**
+     * @type int
+     */
+    protected $ttl;
+
     /**
      * @return CacheUrlMatcher|null|\Symfony\Component\Routing\Matcher\UrlMatcherInterface
      */
@@ -60,19 +63,16 @@ public function getRouteCollection()
         $key = 'route_collection';
 
         if (null === $this->collection) {
-            if ($this->cache->hasItem($key)) {
-                $collection = $this->cache->getItem($key)->get();
-                if ($collection !== null) {
-                    $this->collection = $collection;
-
-                    return $this->collection;
-                }
+            $cacheItem = $this->cache->getItem($key);
+            if ($cacheItem->isHit()) {
+                $this->collection = $cacheItem->get();
+            } else {
+                $this->collection = parent::getRouteCollection();
+                $cacheItem->set($this->collection);
+                $cacheItem->expiresAfter($this->getTtl());
+
+                $this->cache->save($cacheItem);
             }
-
-            $this->collection = parent::getRouteCollection();
-            $item = $this->cache->getItem($key);
-            $item->set($this->collection)
-                ->expiresAfter(self::CACHE_LIFETIME);
         }
 
         return $this->collection;
@@ -89,4 +89,12 @@ public function setCache(CacheItemPoolInterface $cache)
 
         return $this;
     }
+
+    /**
+     * @return int
+     */
+    public function getTtl()
+    {
+        return $this->ttl;
+    }
 }