Starting V2

Author: Geolim4

DataCollector/CacheCollector.php

@@ -63,7 +63,7 @@ public function collect(Request $request, Response $response, \Exception $except
             'write' => (int) CacheManager::$WriteHits,
           ],
           'coreConfig' => [
-            'namespacePath' => CacheManager::getNamespacePath()
+                'namespacePath' => CacheManager::getNamespacePath()
           ],
         ];
     }

Docs/Example/app/config/phpfastcache-config.yml

@@ -41,7 +41,7 @@ php_fast_cache:
         leveldbcache:
             type: Leveldb
             parameters:
-                path: "%kernel.cache_dir%/phpfastcache_leveldb/"
+                path: %kernel.cache_dir%/phpfastcache_leveldb/
                 securityKey: optionnalSetting
         ssdbcache:
             type: Ssdb

README.md

@@ -17,7 +17,7 @@ php_fast_cache:
         filecache:
             type: Files
             parameters:
-                path: "%kernel.cache_dir%/phpfastcache/"
+                path: %kernel.cache_dir%/phpfastcache/
 ```
 * More examples in Docs/Example/app/config
 

Resources/config/services.yml

@@ -8,7 +8,6 @@ services:
         class: "%php_fast_cache.cache.class%"
         arguments:
             - "%phpfastcache%"
-            - "@?debug.stopwatch"
 
     phpfastcache.request_collector:
         class: "%php_fast_cache.data_collector.class%"

Service/Cache.php

@@ -2,46 +2,35 @@
 
 namespace phpFastCache\Bundle\Service;
 
-use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
+use phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface;
 use phpFastCache\CacheManager;
 use phpFastCache\Exceptions\phpFastCacheDriverException;
-use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * Class Cache
  * @package phpFastCache\Bundle\Service
  */
 class Cache
 {
-    /**
-     * @var array
-     */
     private $drivers = [];
 
-    /**
-     * @var Stopwatch
-     */
-    protected $stopwatch;
-
     /**
      * Contains all cache instances
      *
-     * @var \phpFastCache\Cache\ExtendedCacheItemPoolInterface[]
+     * @var \phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface[]
      */
     private $cacheInstances = [];
 
     /**
      * Cache constructor.
      *
      * @param $drivers
-     * @param Stopwatch $stopwatch
      *
      * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
      */
-    public function __construct($drivers, Stopwatch $stopwatch = null)
+    public function __construct($drivers)
     {
         $this->drivers = (array) $drivers[ 'drivers' ];
-        $this->stopwatch = $stopwatch;
     }
 
     /**
@@ -52,7 +41,7 @@ public function __construct($drivers, Stopwatch $stopwatch = null)
      *
      * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
      */
-    public function createInstance($name, ExtendedCacheItemPoolInterface $instance)
+    public function createInstance($name, $instance)
     {
         if (array_key_exists($name, $this->cacheInstances) && $this->cacheInstances[ $name ] instanceof ExtendedCacheItemPoolInterface) {
             throw new phpFastCacheDriverException("Cache instance '{$name}' already exists");
@@ -65,16 +54,12 @@ public function createInstance($name, ExtendedCacheItemPoolInterface $instance)
      *
      * @param string $name Name of configured driver
      *
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface
+     * @return \phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface
      *
      * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
      */
     public function get($name)
     {
-        if ($this->stopwatch) {
-            $this->stopwatch->start(__METHOD__ . "('{$name}')");
-        }
-
         if (!array_key_exists($name, $this->cacheInstances)) {
             if (array_key_exists($name, $this->drivers)) {
                 $this->createInstance($name, CacheManager::getInstance($this->drivers[ $name ][ 'type' ], $this->drivers[ $name ][ 'parameters' ]));
@@ -86,16 +71,13 @@ public function get($name)
             }
         }
 
-        if ($this->stopwatch) {
-            $this->stopwatch->stop(__METHOD__ . "('{$name}')");
-        }
         return $this->cacheInstances[ $name ];
     }
 
     /**
      * Return all cache instances
      *
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface[]
+     * @return \phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface[]
      */
     public function getInstances()
     {

composer.json

@@ -27,8 +27,8 @@
             }
         ],
     "require": {
-        "symfony/symfony": "^2.8|3.*",
-        "phpFastCache/phpFastCache": "^5.0"
+        "symfony/symfony": "^3.0",
+        "phpFastCache/phpFastCache": "^6.0"
     },
     "autoload": {
         "psr-4": { "phpFastCache\\Bundle\\": "" }