Lots of fixes

Author: Nyholm

src/DependencyInjection/AequasiCacheExtension.php

@@ -43,7 +43,6 @@ public function load(array $configs, ContainerBuilder $container)
 
         if ($config['router']['enabled']) {
             $container->setParameter($this->getAlias() . '.router', $config['router']);
-            //new Builder\RouterBuilder($container);
         }
 
         if ($config['session']['enabled']) {

src/DependencyInjection/Compiler/RouterCompilerPass.php

@@ -19,7 +19,7 @@
 class RouterCompilerPass extends BaseCompilerPass
 {
     /**
-     * @return mixed|void
+     * @return void
      */
     protected function prepare()
     {
@@ -28,9 +28,7 @@ protected function prepare()
         if (!$router['enabled']) {
             return;
         }
-
-        $config   = $this->container->getParameter('aequasi_cache.router');
-        $instance = $config['instance'];
+        $instance = $router['instance'];
 
         $def = $this->container->findDefinition('router');
         $def->setClass('Aequasi\Bundle\CacheBundle\Routing\Router');

src/Routing/Matcher/CacheUrlMatcher.php

@@ -19,8 +19,10 @@
  */
 class CacheUrlMatcher extends UrlMatcher
 {
+    const CACHE_LIFETIME = 604800; // a week
+
     /**
-     * @var CachePool
+     * @var CacheItemPoolInterface
      */
     protected $cache;
 
@@ -40,7 +42,9 @@ public function match($pathInfo)
         }
 
         $match = parent::match($pathInfo);
-        $this->cache->saveItem($key, $match, 60 * 60 * 24 * 7);
+        $item = $this->cache->getItem($key);
+            $item->set($match)
+                ->expiresAfter(self::CACHE_LIFETIME);
 
         return $match;
     }

src/Session/SessionHandler.php

@@ -89,7 +89,6 @@ public function write($sessionId, $data)
     {
         $item = $this->cache->getItem($this->prefix . $sessionId);
         $item->set($data)
-            // TODO is this the correct function?
             ->expiresAfter($this->ttl);
 
         return $this->cache->save($item);