Updated tests for custom drivers

Author: Geolim4

lib/Phpfastcache/CacheManager.php

@@ -18,7 +18,7 @@
 use Phpfastcache\Config\ConfigurationOption;
 use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
 use Phpfastcache\Exceptions\{
-  PhpfastcacheDeprecatedException, PhpfastcacheDriverCheckException, PhpfastcacheDriverNotFoundException, PhpfastcacheInstanceNotFoundException, PhpfastcacheInvalidArgumentException, PhpfastcacheInvalidConfigurationException, PhpfastcacheLogicException, PhpfastcacheUnsupportedOperationException
+  PhpfastcacheDeprecatedException, PhpfastcacheDriverCheckException, PhpfastcacheDriverException, PhpfastcacheDriverNotFoundException, PhpfastcacheInstanceNotFoundException, PhpfastcacheInvalidArgumentException, PhpfastcacheInvalidConfigurationException, PhpfastcacheLogicException, PhpfastcacheUnsupportedOperationException
 };
 use Phpfastcache\Util\ClassNamespaceResolverTrait;
 
@@ -102,6 +102,7 @@ class CacheManager
      * @throws PhpfastcacheInvalidConfigurationException
      * @throws PhpfastcacheDriverNotFoundException
      * @throws PhpfastcacheInvalidArgumentException
+     * @throws PhpfastcacheDriverException
      */
     public static function getInstance($driver = 'auto', $config = null, $instanceId = null): ExtendedCacheItemPoolInterface
     {
@@ -134,6 +135,14 @@ public static function getInstance($driver = 'auto', $config = null, $instanceId
         if (!isset(self::$instances[ $instance ])) {
             $badPracticeOmeter[ $driver ] = 1;
             $driverClass = self::getDriverClass($driver);
+
+            if(!is_a($driverClass, ExtendedCacheItemPoolInterface::class, true)){
+                throw new PhpfastcacheDriverException(sprintf(
+                  'Class "%s" does not implement "%s"',
+                  $driverClass,
+                  ExtendedCacheItemPoolInterface::class
+                ));
+            }
             try {
                 if (\class_exists($driverClass)) {
                     $configClass = $driverClass::getConfigClass();

tests/CustomDriver.test.php

@@ -9,8 +9,6 @@
 use Phpfastcache\Drivers\Fakefiles\Config;
 use Phpfastcache\Exceptions\PhpfastcacheDriverCheckException;
 use Phpfastcache\Exceptions\PhpfastcacheInvalidArgumentException;
-use Phpfastcache\Exceptions\PhpfastcacheLogicException;
-use Phpfastcache\Helper\CacheConditionalHelper as CacheConditional;
 use Phpfastcache\Helper\TestHelper;
 
 chdir(__DIR__);
@@ -29,33 +27,38 @@
 }
 
 try {
-    CacheManager::addCoreDriverOverride('Fakefiles', \Phpfastcache\Drivers\Fakefiles\Driver::class);
-    $testHelper->printFailText('No exception thrown while trying to override an non-existing driver');
-} catch (PhpfastcacheLogicException $e) {
-    $testHelper->printPassText('An exception has been thrown while trying to override an non-existing driver');
+    CacheManager::addCustomDriver('Fakefiles', \Phpfastcache\Drivers\Fakefiles\Driver::class);
+    $testHelper->printPassText('No exception thrown while trying to add a custom driver');
+} catch (\Throwable $e) {
+    $testHelper->printFailText('An exception has been thrown while trying to add a custom driver');
 }
 
 try {
-    CacheManager::addCoreDriverOverride('', \Phpfastcache\Drivers\Fakefiles\Driver::class);
+    CacheManager::addCustomDriver('Fakefiles', \Phpfastcache\Drivers\Fakefiles\Driver::class);
+    $testHelper->printFailText('No exception thrown  while trying to re-add a the same custom driver');
+} catch (\Throwable $e) {
+    $testHelper->printPassText('An exception has been thrown while trying to re-add a the same custom driver');
+}
+
+try {
+    CacheManager::addCustomDriver('', \Phpfastcache\Drivers\Fakefiles\Driver::class);
     $testHelper->printFailText('No exception thrown while trying to override an empty driver');
 } catch (PhpfastcacheInvalidArgumentException $e) {
     $testHelper->printPassText('An exception has been thrown while trying to override an empty driver');
 }
 
-CacheManager::addCoreDriverOverride('Files', \Phpfastcache\Drivers\Fakefiles\Driver::class);
-
 try{
-    $cacheInstance = CacheManager::getInstance('Files', new Config(['customOption' => true]));
+    $cacheInstance = CacheManager::getInstance('Fakefiles', new Config(['customOption' => true]));
     $testHelper->printPassText('The custom driver is unavailable at the moment and no exception has been thrown.');
 }catch (PhpfastcacheDriverCheckException $e){
     $testHelper->printPassText('The custom driver is unavailable at the moment and the exception has been catch.');
 }
 
-CacheManager::removeCoreDriverOverride('Files');
+CacheManager::removeCustomDriver('Fakefiles');
 
 try{
-    $cacheInstance = CacheManager::getInstance('Files');
-    $testHelper->printPassText('The custom driver has been removed but is still.');
+    $cacheInstance = CacheManager::getInstance('Fakefiles');
+    $testHelper->printPassText('The custom driver has been removed but is still active.');
 }catch (PhpfastcacheDriverCheckException $e){
     $testHelper->printPassText('The custom driver is unavailable at the moment and the exception has been catch.');
 }