Added php7 strict support + Filename in profiler

Author: Geolim4

src/Command/PhpfastcacheCommand.php

@@ -13,6 +13,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\Command;
 

src/DataCollector/CacheCollector.php

@@ -13,6 +13,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\DataCollector;
 

src/DependencyInjection/Configuration.php

@@ -13,6 +13,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\DependencyInjection;
 

src/DependencyInjection/PhpfastcacheExtension.php

@@ -13,6 +13,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\DependencyInjection;
 

src/PhpfastcacheBundle.php

@@ -12,6 +12,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle;
 

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

@@ -231,6 +231,7 @@
         <thead>
         <tr>
             <th class="key" scope="col">Block ID</th>
+            <th scope="col"><abbr title="The Twig file where the CACHE/ENDCACHE tags resides">File</abbr></th>
             <th scope="col"><abbr title="Displays if the data comes from the cache (Yes) or from the template itself (No)">Cache Hit</abbr></th>
             <th scope="col">Size</th>
             <th scope="col"><abbr title="In seconds">Time to Live (ttl)</abbr></th>
@@ -240,7 +241,8 @@
         <tbody>
         {% for key, block in collector.twigCacheBlocks %}
             <tr>
-                <th>{{ key }}</th>
+                <td><strong>{{ key }}</strong></td>
+                <td><span>In </span><abbr><span title="{{ block.cacheFilePath }}">{{ block.cacheFileName }}</span></abbr></td>
                 <th style="background-color: {{ block.cacheHit ? '#BBFEC9' : '#FEBBBB' }}">{{ block.cacheHit ? 'Yes' : 'No' }}</th>
                 <td>{{ block.cacheSize|sizeFormat(1) }}</td>
                 <td title="This cached block will expires at {{ profile.time|date_modify("+" ~ block.cacheTtl  ~ " sec")|date('r') }}"><abbr>{{ block.cacheTtl }}</abbr></td>
@@ -249,7 +251,7 @@
             </tr>
         {% else %}
             <tr>
-                <th colspan="5"><div style="text-align: center">No twig cache block found</div></th>
+                <th colspan="6"><div style="text-align: center">No twig cache block found</div></th>
             </tr>
         {% endfor %}
         </tbody>

src/Service/Phpfastcache.php

@@ -12,6 +12,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\Service;
 

src/Twig/CacheExtension/CacheProvider/PsrCacheAdapter.php

@@ -14,6 +14,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheProvider;
 

src/Twig/CacheExtension/CacheStrategy/LifetimeCacheStrategy.php

@@ -14,6 +14,7 @@
  * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
  *
  */
+declare(strict_types=1);
 
 namespace Phpfastcache\Bundle\Twig\CacheExtension\CacheStrategy;
 
@@ -68,19 +69,21 @@ public function __construct(CacheProviderInterface $cache, CacheCollector $cache
     /**
      * {@inheritDoc}
      */
-    public function fetchBlock($key)
+    public function fetchBlock($key, \Twig_Source $sourceContext)
     {
-        $generationTimeMc = microtime(true);
+        $generationTimeMc = \microtime(true);
         $cacheData = $this->cache->fetch($key[ 'key' ]);
-        $generationTime = microtime(true) - $generationTimeMc;
-        $unprefixedKey = substr($key[ 'key' ], strlen($this->twigCachePrefix));
+        $generationTime = \microtime(true) - $generationTimeMc;
+        $unprefixedKey = \substr($key[ 'key' ], \strlen($this->twigCachePrefix));
 
         if ($this->cacheCollector instanceof CacheCollector) {
             $this->cacheCollector->setTwigCacheBlock($unprefixedKey, [
               'cacheHit' => $cacheData !== null,
               'cacheTtl' => $key[ 'lifetime' ],
               'cacheSize' => mb_strlen((string)$cacheData),
               'cacheGenTime' => $generationTime,
+              'cacheFileName' => $sourceContext->getName(),
+              'cacheFilePath' => $sourceContext->getPath(),
             ]);
         }
 
@@ -109,7 +112,7 @@ public function generateKey($annotation, $value)
     /**
      * {@inheritDoc}
      */
-    public function saveBlock($key, $block, $generationTime)
+    public function saveBlock($key, $block, $generationTime, \Twig_Source $sourceContext)
     {
         $unprefixedKey = \substr($key[ 'key' ], \strlen($this->twigCachePrefix));
 
@@ -119,6 +122,8 @@ public function saveBlock($key, $block, $generationTime)
               'cacheTtl' => $key[ 'lifetime' ],
               'cacheSize' => \mb_strlen((string)$block),
               'cacheGenTime' => $generationTime,
+              'cacheFileName' => $sourceContext->getName(),
+              'cacheFilePath' => $sourceContext->getPath(),
             ]);
         }
 

src/Twig/CacheExtension/CacheStrategyInterface.php

@@ -31,7 +31,7 @@ interface CacheStrategyInterface
      *
      * @return mixed
      */
-    public function fetchBlock($key);
+    public function fetchBlock($key, \Twig_Source $sourceContext);
 
     /**
      * Generate a key for the value.
@@ -52,5 +52,5 @@ public function generateKey($annotation, $value);
      *
      * @return mixed
      */
-    public function saveBlock($key, $block, $generationTime);
+    public function saveBlock($key, $block, $generationTim, \Twig_Source $sourceContext);
 }