Merge pull request #490 from Geolim4/final

Staticized driverName

Author: Geolim4

src/phpFastCache/Core/Pool/CacheItemPoolTrait.php

@@ -228,8 +228,6 @@ public function getItems(array $keys = [])
      */
     public function hasItem($key)
     {
-        CacheManager::$ReadHits++;
-
         return $this->getItem($key)->isHit();
     }
 
@@ -259,7 +257,7 @@ public function clear()
     public function deleteItem($key)
     {
         $item = $this->getItem($key);
-        if ($this->hasItem($key) && $this->driverDelete($item)) {
+        if ($item->isHit() && $this->driverDelete($item)) {
             $item->setHit(false);
             CacheManager::$WriteHits++;
 

src/phpFastCache/Core/Pool/DriverBaseTrait.php

@@ -42,6 +42,11 @@ trait DriverBaseTrait
      */
     protected $instance;
 
+    /**
+     * @var string
+     */
+    protected $driverName;
+
     /**
      * @param $config_name
      * @param string $value
@@ -211,9 +216,10 @@ public function driverUnwrapMdate(array $wrapper)
      */
     public function getDriverName()
     {
-        static $driverName;
-
-        return ($driverName ?: $driverName = ucfirst(substr(strrchr((new \ReflectionObject($this))->getNamespaceName(), '\\'), 1)));
+        if(!$this->driverName){
+            $this->driverName = ucfirst(substr(strrchr((new \ReflectionObject($this))->getNamespaceName(), '\\'), 1));
+        }
+        return $this->driverName;
     }
 
     /**
@@ -232,6 +238,11 @@ public function driverWriteTags(ExtendedCacheItemInterface $item)
             throw new phpFastCacheLogicException('Trying to set tag(s) to an Tag item index: ' . $item->getKey());
         }
 
+        if(!$item->getTags() && !$item->getRemovedTags())
+        {
+            return true;
+        }
+
         /**
          * @var $tagsItems ExtendedCacheItemInterface[]
          */

src/phpFastCache/Drivers/Files/Driver.php

@@ -94,7 +94,7 @@ protected function driverRead(CacheItemInterface $item)
         /**
          * Check for Cross-Driver type confusion
          */
-        $file_path = $this->getFilePath($item->getKey());
+        $file_path = $this->getFilePath($item->getKey(), true);
         if (!file_exists($file_path)) {
             return null;
         }

tests/ReadWriteOperations.test.php

@@ -67,4 +67,14 @@
     }
 }
 
+foreach ($dirs as $dirIndex => $dir){
+    for ($i = 1; $i <= 20; $i++)
+    {
+        $cacheInstanceName = 'cacheInstance' . $i;
+
+        $testHelper->printText(sprintf('Clearing cache instance %s#%s data', $dir, $cacheInstanceName));
+        $instances[$dirIndex][$cacheInstanceName]->clear();
+    }
+}
+
 $testHelper->terminateTest();