Merge remote-tracking branch 'origin/V2'

# Conflicts:
#	Resources/views/data_collector/template.html.twig
#	Service/Cache.php
#	Twig/CacheExtension/Node/CacheNode.php
#	composer.lock
#	phpFastCacheBundle.php
#	tests/SyntaxChecker.test.php

Author: Geolim4

CHANGELOG.md

@@ -0,0 +1,11 @@
+## 2.0.1
+##### 16 february 2018
+- __Global__
+    - Updated **@phpfastcache** service to be provided by a service factory to avoid multiprocessor issues with PhpUnit (@geolim4)
+- __Data collector__
+    - Fixed critical Symfony 3.4 issue (@geolim4)
+
+## 2.0.0
+##### 01 july 2017
+- __Global__
+    - First 2.x release, yay !

Command/phpFastCacheCommand.php

@@ -16,7 +16,6 @@
 
 namespace phpFastCache\Bundle\Command;
 
-use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
 use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;

DataCollector/CacheCollector.php

@@ -58,7 +58,7 @@ public function collect(Request $request, Response $response, \Exception $except
         $instances = [];
         $driverUsed = [];
 
-        /** @var  $cache */
+        /** @var \phpFastCache\Cache\ExtendedCacheItemPoolInterface $cache */
         foreach ($this->cache->getInstances() as $instanceName => $cache) {
             if ($cache->getStats()->getSize()) {
                 $size += $cache->getStats()->getSize();

Resources/config/services.yml

@@ -7,6 +7,7 @@ parameters:
 
 services:
     phpfastcache:
+        factory: ['%php_fast_cache.cache.class%', 'getInstance']
         class: "%php_fast_cache.cache.class%"
         arguments:
             - "%phpfastcache%"

Resources/views/data_collector/template.html.twig

@@ -10,7 +10,7 @@
  * @author Khoa Bui (khoaofgod)  <[email protected]> http://www.phpfastcache.com
 #}
 
-{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
     {% set icon %}

Service/Cache.php

@@ -15,7 +15,7 @@
 
 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;
@@ -26,10 +26,15 @@
  */
 class Cache
 {
+    /**
+     * @var self
+     */
+    protected static $selfInstance;
+
     /**
      * @var array
      */
-    private $config = [];
+    protected $config = [];
 
     /**
      * @var Stopwatch
@@ -39,9 +44,9 @@ class Cache
     /**
      * Contains all cache instances
      *
-     * @var \phpFastCache\Cache\ExtendedCacheItemPoolInterface[]
+     * @var \phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface[]
      */
-    private $cacheInstances = [];
+    protected $cacheInstances = [];
 
     /**
      * Cache constructor.
@@ -51,12 +56,26 @@ class Cache
      *
      * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
      */
-    public function __construct($config, Stopwatch $stopwatch = null)
+    protected function __construct($config, Stopwatch $stopwatch = null)
     {
         $this->config = (array) $config;
         $this->stopwatch = $stopwatch;
     }
 
+    /**
+     * Factory instance provider
+     *
+     * @param array $config
+     * @param Stopwatch $stopwatch
+     *
+     * @throws \phpFastCache\Exceptions\phpFastCacheDriverException
+     * @return self
+     */
+    public static function getInstance($config, Stopwatch $stopwatch = null)
+    {
+        return self::$selfInstance ?: self::$selfInstance = new self($config, $stopwatch);
+    }
+
     /**
      * Set a new cache instance
      *
@@ -65,7 +84,7 @@ public function __construct($config, 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");
@@ -78,7 +97,7 @@ 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
      */
@@ -106,7 +125,7 @@ public function get($name)
     }
 
     /**
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface
+     * @return \phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface
      */
     public function getTwigCacheInstance()
     {
@@ -126,7 +145,7 @@ public function getConfig()
     /**
      * Return all cache instances
      *
-     * @return \phpFastCache\Cache\ExtendedCacheItemPoolInterface[]
+     * @return \phpFastCache\Core\Pool\ExtendedCacheItemPoolInterface[]
      */
     public function getInstances()
     {

Twig/CacheExtension/Node/CacheNode.php

@@ -29,7 +29,7 @@ class CacheNode extends \Twig_Node
     /**
      * @param \Twig_Node_Expression $annotation
      * @param \Twig_Node_Expression $keyInfo
-     * @param \Twig_NodeInterface   $body
+     * @param \Twig_Node            $body
      * @param integer               $lineno
      * @param string                $tag
      */

Twig/HumanReadableExtension.php

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

composer.json

@@ -23,5 +23,5 @@
  */
 class phpFastCacheBundle extends Bundle
 {
-    const VERSION = '1.0.4';
+    const VERSION = '2.0.0';
 }

composer.lock

@@ -38,7 +38,10 @@ function read_dir($dir, $ext = null)
     /**
      * @todo Make the exclusions much cleaner
      */
-    if (strpos($file, '/vendor/') === false
+    if (strpos($file, '/vendor/composer') === false
+      && strpos($file, '/vendor/symfony') === false
+      && strpos($file, '/vendor/doctrine') === false
+      && strpos($file, '/vendor/paragonie/random_compat') === false //random_int() patch
       && strpos($file, '/bin/stubs') === false
     ) {
         exec('php -l "' . $file . '"', $output, $status);