Merge pull request #789 from Geolim4/master

 Fixed #788 // Redundant directory name for Sqlite

Author: Geolim4

lib/Phpfastcache/Core/Pool/IO/IOHelperTrait.php

@@ -100,7 +100,7 @@ protected function getFilePath($keyword, $skip = false): string
             );
         }
 
-        return $path . '/' . $filename . '.' . $this->getConfig()->getCacheFileExtension();
+        return $path . \DIRECTORY_SEPARATOR . $filename . '.' . $this->getConfig()->getCacheFileExtension();
     }
 
     /**
@@ -322,7 +322,7 @@ protected function readFile($file): string
      * @return bool
      * @throws PhpfastcacheIOException
      */
-    protected function writefile($file, $data, $secureFileManipulation = false): bool
+    protected function writefile(string $file, string $data, bool $secureFileManipulation = false): bool
     {
         /**
          * @eventName CacheWriteFileOnDisk
@@ -335,11 +335,10 @@ protected function writefile($file, $data, $secureFileManipulation = false): boo
 
         if ($secureFileManipulation) {
             $tmpFilename = Directory::getAbsolutePath(
-                dirname($file) . '/tmp_' . $this->getConfig()->getDefaultFileNameHashFunction()(
-                    \str_shuffle(\uniqid($this->getDriverName(), false))
-                    . \str_shuffle(\uniqid($this->getDriverName(), false))
+                dirname($file) . \DIRECTORY_SEPARATOR . 'tmp_' . $this->getConfig()->getDefaultFileNameHashFunction()(
+                    \bin2hex(\random_bytes(16))
                 )
-            );
+            ) . '.' .  $this->getConfig()->getCacheFileExtension() . \random_int(1000, 9999);
 
             $handle = \fopen($tmpFilename, 'w+b');
             if (\is_resource($handle)) {

lib/Phpfastcache/Drivers/Sqlite/Driver.php

@@ -34,10 +34,6 @@ class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterfac
 {
     use DriverBaseTrait, IOHelperTrait;
 
-    /**
-     *
-     */
-    protected const FILE_DIR = 'sqlite';
     /**
      *
      */
@@ -77,7 +73,7 @@ public function driverCheck(): bool
      */
     public function getSqliteDir(): string
     {
-        return $this->SqliteDir ?: $this->getPath() . DIRECTORY_SEPARATOR . self::FILE_DIR;
+        return $this->SqliteDir ?: $this->getPath();
     }
 
     /**
@@ -97,13 +93,13 @@ protected function driverConnect(): bool
         if (!file_exists($this->getSqliteDir()) && !@mkdir($this->getSqliteDir(), $this->getDefaultChmod(), true)) {
             throw new PhpfastcacheIOException(sprintf('Sqlite cannot write in "%s", aborting...', $this->getPath()));
         }
-        if (!file_exists($this->getPath() . '/' . self::FILE_DIR)) {
-            if (!mkdir($this->getPath() . '/' . self::FILE_DIR, $this->getDefaultChmod(), true)
+        if (!file_exists($this->getPath())) {
+            if (!mkdir($this->getPath(), $this->getDefaultChmod(), true)
             ) {
                 $this->fallback = true;
             }
         }
-        $this->SqliteDir = $this->getPath() . '/' . self::FILE_DIR;
+        $this->SqliteDir = $this->getPath();
 
         return true;
     }

lib/Phpfastcache/Helper/TestHelper.php

@@ -482,4 +482,4 @@ public function printPassText(string $string): self
 
         return $this;
     }
-}
+}

tests/ReadWriteOperations.test.php

@@ -40,7 +40,8 @@
 
         $instances[ $dirIndex ][ $cacheInstanceName ] = CacheManager::getInstance('Files', new FilesConfig([
           'path' => $dir . str_pad($i, 3, '0', STR_PAD_LEFT),
-          'secureFileManipulation' => true
+          'secureFileManipulation' => true,
+          'securityKey' => '_cache',
         ]));
 
         foreach ($keys[ $dirIndex ] as $index => $key) {
@@ -75,4 +76,4 @@
     }
 }
 
-$testHelper->terminateTest();
+$testHelper->terminateTest();

tests/Sqlite.test.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @author Khoa Bui (khoaofgod)  <[email protected]> https://www.phpfastcache.com
+ * @author Georges.L (Geolim4)  <[email protected]>
+ */
+
+use Phpfastcache\CacheManager;
+use Phpfastcache\Config\ConfigurationOption;
+use Phpfastcache\Helper\TestHelper;
+
+chdir(__DIR__);
+require_once __DIR__ . '/../vendor/autoload.php';
+$testHelper = new TestHelper('Sqlite');
+CacheManager::setDefaultConfig(new ConfigurationOption(['path' => __DIR__ . '/../cache']));
+
+$cacheInstance = CacheManager::getInstance('Sqlite');
+
+$testHelper->runCRUDTests($cacheInstance);
+
+$testHelper->terminateTest();