Fixed broken CI with RedisCluser on Unix

PHPSocialNetwork · Dec 16, 2023 · 038ee38 · 038ee38
1 parent 18b98f5
commit 038ee38
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/docs/DRIVERS.md b/docs/DRIVERS.md
@@ -41,7 +41,7 @@
   * A very high-performance NoSQL driver using a key-value pair system.
 * Predis
   * A high-performance memory driver using a in-memory data structure storage. Less efficient than Redis driver as it is an embedded library.
-* Redis/RedisCluster
+* Redis/Rediscluster
   * A very high-performance memory driver using a in-memory data structure storage. More efficient than Predis driver as it is an compiled library.
   * RedisCluster use the RedisCluster class with a different driver name but behave slightly differently than Redis driver.
 * Riak **(REMOVED in v8.0.6)**

diff --git a/lib/Phpfastcache/Core/Pool/ExtendedCacheItemPoolInterface.php b/lib/Phpfastcache/Core/Pool/ExtendedCacheItemPoolInterface.php
@@ -30,13 +30,9 @@
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
- * IMPORTANT NOTICE
- *
- * If you modify this file please make sure that
- * the ActOnAll helper will also get those modifications
- * since it does no longer implements this interface
- * @see \Phpfastcache\Helper\ActOnAll
- *
+ * Extended cache item pool interface that
+ * contains all the phpfastcache-related
+ * methods that does not belong to PSR-6.
  */
 interface ExtendedCacheItemPoolInterface extends CacheItemPoolInterface, EventManagerDispatcherInterface, ClassNamespaceResolverInterface, TaggableCacheItemPoolInterface
 {

diff --git a/...fastcache/Drivers/RedisCluster/Config.php → ...fastcache/Drivers/Rediscluster/Config.php b/...fastcache/Drivers/RedisCluster/Config.php → ...fastcache/Drivers/Rediscluster/Config.php
@@ -14,7 +14,7 @@
 
 declare(strict_types=1);
 
-namespace Phpfastcache\Drivers\RedisCluster;
+namespace Phpfastcache\Drivers\Rediscluster;
 
 use Phpfastcache\Config\ConfigurationOption;
 use Phpfastcache\Exceptions\PhpfastcacheInvalidArgumentException;

diff --git a/...fastcache/Drivers/RedisCluster/Driver.php → ...fastcache/Drivers/Rediscluster/Driver.php b/...fastcache/Drivers/RedisCluster/Driver.php → ...fastcache/Drivers/Rediscluster/Driver.php
@@ -14,7 +14,7 @@
 
 declare(strict_types=1);
 
-namespace Phpfastcache\Drivers\RedisCluster;
+namespace Phpfastcache\Drivers\Rediscluster;
 
 use DateTime;
 use Phpfastcache\Cluster\AggregatablePoolInterface;

diff --git a/...hpfastcache/Drivers/RedisCluster/Item.php → ...hpfastcache/Drivers/Rediscluster/Item.php b/...hpfastcache/Drivers/RedisCluster/Item.php → ...hpfastcache/Drivers/Rediscluster/Item.php
@@ -14,7 +14,7 @@
 
 declare(strict_types=1);
 
-namespace Phpfastcache\Drivers\RedisCluster;
+namespace Phpfastcache\Drivers\Rediscluster;
 
 use Phpfastcache\Core\Item\ExtendedCacheItemInterface;
 use Phpfastcache\Core\Item\TaggableCacheItemTrait;

diff --git a/tests/RedisCluster.test.php b/tests/RedisCluster.test.php
@@ -15,12 +15,12 @@
 use Phpfastcache\CacheManager;
 use Phpfastcache\Exceptions\PhpfastcacheDriverCheckException;
 use Phpfastcache\Tests\Helper\TestHelper;
-use Phpfastcache\Drivers\RedisCluster\Config as RedisConfig;
+use Phpfastcache\Drivers\Rediscluster\Config as RedisConfig;
 use Redis as RedisClient;
 
 chdir(__DIR__);
 require_once __DIR__ . '/../vendor/autoload.php';
-$testHelper = new TestHelper('Redis bundled client');
+$testHelper = new TestHelper('Redis cluster');
 
 try {
     $config =  new RedisConfig();

diff --git a/tests/lib/Config/ConfigFactory.php b/tests/lib/Config/ConfigFactory.php
@@ -18,7 +18,7 @@
 
 use Phpfastcache\Config\ConfigurationOptionInterface;
 use Phpfastcache\Drivers\Mongodb\Config as MongodbConfig;
-use Phpfastcache\Drivers\RedisCluster\Config as RedisClusterConfig;
+use Phpfastcache\Drivers\Rediscluster\Config as RedisClusterConfig;
 use Phpfastcache\Helper\UninstanciableObjectTrait;
 
 class ConfigFactory