Finished Opcache optimizations & short array fixes

Author: Geolim4

composer.json

@@ -31,7 +31,9 @@
         "symfony/console": "^3.4|^4.0",
         "symfony/dependency-injection": "^3.4|^4.0",
         "phpfastcache/phpfastcache": "^7.0",
-        "php": "^7.0"
+        "php": "^7.0",
+        "ext-mbstring": "*",
+        "ext-json": "*"
     },
     "suggest": {
         "symfony/web-profiler-bundle": "To use the data collector."

composer.lock

@@ -29,7 +29,7 @@ class CacheCollector extends DataCollector
     /**
      * @var \Phpfastcache\Bundle\Service\Phpfastcache
      */
-    private $cache;
+    private $phpfastcache;
 
     /**
      * @var array
@@ -39,11 +39,11 @@ class CacheCollector extends DataCollector
     /**
      * CacheCollector constructor.
      *
-     * @param \Phpfastcache\Bundle\Service\Phpfastcache $cache
+     * @param \Phpfastcache\Bundle\Service\Phpfastcache $phpfastcache
      */
-    public function __construct(Phpfastcache $cache)
+    public function __construct(Phpfastcache $phpfastcache)
     {
-        $this->cache = $cache;
+        $this->phpfastcache = $phpfastcache;
     }
 
     /**
@@ -59,7 +59,7 @@ public function collect(Request $request, Response $response, \Exception $except
         $driverUsed = [];
 
         /** @var  $cache */
-        foreach ($this->cache->getInstances() as $instanceName => $cache) {
+        foreach ($this->phpfastcache->getInstances() as $instanceName => $cache) {
             if ($cache->getStats()->getSize()) {
                 $size += $cache->getStats()->getSize();
             }
@@ -91,109 +91,109 @@ public function collect(Request $request, Response $response, \Exception $except
             'namespacePath (deprecated)' => CacheManager::getNamespacePath(),
           ],
           'projectConfig' => [
-            'twig_driver' => $this->cache->getConfig()['twig_driver'],
-            'twig_block_debug' => $this->cache->getConfig()['twig_block_debug'],
+            'twig_driver' => $this->phpfastcache->getConfig()['twig_driver'],
+            'twig_block_debug' => $this->phpfastcache->getConfig()['twig_block_debug'],
           ],
         ];
     }
 
     /**
-     * @return mixed
+     * @return array
      */
-    public function getStats()
+    public function getStats(): array
     {
-        return $this->data[ 'stats' ];
+        return $this->data[ 'stats' ] ?? [];
     }
 
     /**
-     * @return mixed
+     * @return array
      */
-    public function getInstances()
+    public function getInstances(): array
     {
         return $this->data[ 'instances' ];
     }
 
     /**
-     * @return mixed
+     * @return array
      */
-    public function getDriverUsed()
+    public function getDriverUsed(): array
     {
-        return $this->data[ 'driverUsed' ];
+        return $this->data[ 'driverUsed' ] ?? [];
     }
 
     /**
-     * @return mixed
+     * @return array
      */
-    public function getHits()
+    public function getHits(): array
     {
-        return $this->data[ 'hits' ];
+        return $this->data[ 'hits' ] ?? [];
     }
 
     /**
-     * @return mixed
+     * @return int
      */
-    public function getSize()
+    public function getSize(): int
     {
-        return $this->data[ 'size' ];
+        return $this->data[ 'size' ] ?? 0;
     }
 
     /**
-     * @return mixed
+     * @return array
      */
-    public function getCoreConfig()
+    public function getCoreConfig(): array
     {
-        return $this->data[ 'coreConfig' ];
+        return $this->data[ 'coreConfig' ] ?? [];
     }
 
     /**
-     * @return mixed
+     * @return array
      */
-    public function getProjectConfig()
+    public function getProjectConfig(): array
     {
-        return $this->data[ 'projectConfig' ];
+        return $this->data[ 'projectConfig' ] ?? [];
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getApiVersion()
+    public function getApiVersion(): string
     {
         return $this->data[ 'apiVersion' ];
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getPfcVersion()
+    public function getPfcVersion(): string
     {
         return $this->data[ 'pfcVersion' ];
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getBundleVersion()
+    public function getBundleVersion(): string
     {
         return $this->data[ 'bundleVersion' ];
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getApiChangelog()
+    public function getApiChangelog(): string
     {
-        return $this->data[ 'apiChangelog' ];
+        return $this->data[ 'apiChangelog' ] ?? '';
     }
 
     /**
      * @param string $blockName
      * @param array $cacheBlock
      * @return $this
      */
-    public function setTwigCacheBlock($blockName, array $cacheBlock)
+    public function setTwigCacheBlock($blockName, array $cacheBlock): self
     {
         if(isset($this->twig_cache_blocks[$blockName])){
-            $this->twig_cache_blocks[$blockName] = array_merge($this->twig_cache_blocks[$blockName], $cacheBlock);
+            $this->twig_cache_blocks[$blockName] = \array_merge($this->twig_cache_blocks[$blockName], $cacheBlock);
         }else{
             $this->twig_cache_blocks[$blockName] = $cacheBlock;
         }
@@ -205,21 +205,25 @@ public function setTwigCacheBlock($blockName, array $cacheBlock)
     /**
      * @return array
      */
-    public function getTwigCacheBlocks()
+    public function getTwigCacheBlocks(): array
     {
-        return $this->data[ 'twigCacheBlocks' ];
+        return $this->data[ 'twigCacheBlocks' ] ?? [];
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
-    public function getName()
+    public function getName(): string
     {
         return 'phpfastcache';
     }
 
+    /**
+     * @inheritdoc
+     */
     public function reset()
     {
-        // TODO: Implement reset() method.
+        $this->data = [];
+        $this->twig_cache_blocks = [];
     }
 }

src/DataCollector/CacheCollector.php

@@ -52,9 +52,9 @@ class Phpfastcache
      *
      * @throws \Phpfastcache\Exceptions\phpFastCacheDriverException
      */
-    public function __construct($config, Stopwatch $stopwatch = null)
+    public function __construct(array $config, Stopwatch $stopwatch = null)
     {
-        $this->config = (array) $config;
+        $this->config = $config;
         $this->stopwatch = $stopwatch;
     }
 
@@ -66,7 +66,7 @@ public function __construct($config, Stopwatch $stopwatch = null)
      *
      * @throws \Phpfastcache\Exceptions\phpFastCacheDriverException
      */
-    public function createInstance($name, ExtendedCacheItemPoolInterface $instance)
+    public function createInstance(string $name, ExtendedCacheItemPoolInterface $instance)
     {
         if (\array_key_exists($name, $this->cacheInstances) && $this->cacheInstances[ $name ] instanceof ExtendedCacheItemPoolInterface) {
             throw new PhpfastcacheDriverException("Cache instance '{$name}' already exists");
@@ -84,7 +84,7 @@ public function createInstance($name, ExtendedCacheItemPoolInterface $instance)
      * @throws \Phpfastcache\Exceptions\phpFastCacheDriverException
      * @throws \Phpfastcache\Exceptions\PhpfastcacheInvalidConfigurationException
      */
-    public function get($name): ExtendedCacheItemPoolInterface
+    public function get(string $name): ExtendedCacheItemPoolInterface
     {
         if ($this->stopwatch) {
             $this->stopwatch->start(__METHOD__ . "('{$name}')");