Fix Cache tests

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c905ee877159d6cfba792589fc0c34874674cb45..eabd28ff6f74cedcfa98bd7da2677fb74473c541 100644 (file)
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: pecl
-          extensions: pdo_mysql, gd, zip, opcache, ctype, pcntl, ldap, apcu, memcached, redis, imagick
+          extensions: pdo_mysql, gd, zip, opcache, ctype, pcntl, ldap, apcu, memcached, redis, imagick, memcache
           coverage: xdebug
           ini-values: apc.enabled=1, apc.enable_cli=1
 
@@ -90,6 +90,9 @@ jobs:
           MYSQL_DATABASE: test
           MYSQL_PASSWORD: test
           MYSQL_USER: test
+          REDIS_PORT: ${{ job.services.redis.ports[6379] }}
+          MEMCACHED_PORT: ${{ job.services.memcached.ports[11211] }}
+          MEMCACHE_PORT: ${{ job.services.memcached.ports[11211] }}
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1

diff --git a/tests/src/Core/Cache/MemcacheCacheTest.php b/tests/src/Core/Cache/MemcacheCacheTest.php
index ed69d887a9deea7afa045c50c71cf37c7086a9e6..44600d5eed81ef1f527b3d2476678b66c0cd9879 100644 (file)
--- a/tests/src/Core/Cache/MemcacheCacheTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheTest.php
@@ -35,6 +35,7 @@ class MemcacheCacheTest extends MemoryCacheTest
                $configMock = \Mockery::mock(IConfig::class);
 
                $host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost';
+               $port = $_SERVER['MEMCACHE_PORT'] ?? '11211';
 
                $configMock
                        ->shouldReceive('get')
@@ -43,7 +44,7 @@ class MemcacheCacheTest extends MemoryCacheTest
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'memcache_port')
-                       ->andReturn(11211);
+                       ->andReturn($port);
 
                try {
                        $this->cache = new MemcacheCache($host, $configMock);

diff --git a/tests/src/Core/Cache/MemcachedCacheTest.php b/tests/src/Core/Cache/MemcachedCacheTest.php
index 5fe96ddaeea02b8c855c6a978a12c01b394e3a0e..c6ec48a4ba6269dbce66e1a4baf27fbf93e8e91a 100644 (file)
--- a/tests/src/Core/Cache/MemcachedCacheTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheTest.php
@@ -36,11 +36,12 @@ class MemcachedCacheTest extends MemoryCacheTest
                $configMock = \Mockery::mock(IConfig::class);
 
                $host = $_SERVER['MEMCACHED_HOST'] ?? 'localhost';
+               $port = $_SERVER['MEMCACHED_PORT'] ?? '11211';
 
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'memcached_hosts')
-                       ->andReturn([0 => $host . ', 11211']);
+                       ->andReturn([0 => $host . ', ' . $port]);
 
                $logger = new NullLogger();
 

diff --git a/tests/src/Core/Cache/RedisCacheTest.php b/tests/src/Core/Cache/RedisCacheTest.php
index 821c3c5cf7965919e070ba82e64d677dab71e3f6..543137ca09ad509b45e6d3ddf95ea92a37a454c2 100644 (file)
--- a/tests/src/Core/Cache/RedisCacheTest.php
+++ b/tests/src/Core/Cache/RedisCacheTest.php
@@ -35,6 +35,7 @@ class RedisCacheTest extends MemoryCacheTest
                $configMock = \Mockery::mock(IConfig::class);
 
                $host = $_SERVER['REDIS_HOST'] ?? 'localhost';
+               $port = $_SERVER['REDIS_PORT'] ?? null;
 
                $configMock
                        ->shouldReceive('get')
@@ -43,7 +44,7 @@ class RedisCacheTest extends MemoryCacheTest
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'redis_port')
-                       ->andReturn(null);
+                       ->andReturn($port);
 
                $configMock
                        ->shouldReceive('get')

diff --git a/tests/src/Core/Lock/MemcacheCacheLockTest.php b/tests/src/Core/Lock/MemcacheCacheLockTest.php
index 8008cb0eed605012a63cbb7c21b8790d4049a27d..f4aab0602cd943cc6cd3c5c2be0cdf96277c083f 100644 (file)
--- a/tests/src/Core/Lock/MemcacheCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockTest.php
@@ -36,6 +36,7 @@ class MemcacheCacheLockTest extends LockTest
                $configMock = \Mockery::mock(IConfig::class);
 
                $host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost';
+               $port = $_SERVER['MEMCACHE_PORT'] ?? '11211';
 
                $configMock
                        ->shouldReceive('get')
@@ -44,7 +45,7 @@ class MemcacheCacheLockTest extends LockTest
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'memcache_port')
-                       ->andReturn(11211);
+                       ->andReturn($port);
 
                $lock = null;
 

diff --git a/tests/src/Core/Lock/MemcachedCacheLockTest.php b/tests/src/Core/Lock/MemcachedCacheLockTest.php
index 232f78714fec18c3a0eee48a3e91f080b6892517..f41bf992055417c3f474b505fbbcc0a122506a2c 100644 (file)
--- a/tests/src/Core/Lock/MemcachedCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockTest.php
@@ -37,11 +37,12 @@ class MemcachedCacheLockTest extends LockTest
                $configMock = \Mockery::mock(IConfig::class);
 
                $host = $_SERVER['MEMCACHED_HOST'] ?? 'localhost';
+               $port = $_SERVER['MEMCACHED_PORT'] ?? '11211';
 
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'memcached_hosts')
-                       ->andReturn([0 => $host . ', 11211']);
+                       ->andReturn([0 => $host . ', ' . $port]);
 
                $logger = new NullLogger();
 

diff --git a/tests/src/Core/Lock/RedisCacheLockTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php
index fb9bc80b7d5c58e7cd9ebf02d4ac46726d99e66f..62b15bc7c73eef0cf616fb61ddb4e785ece9ebed 100644 (file)
--- a/tests/src/Core/Lock/RedisCacheLockTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockTest.php
@@ -36,6 +36,7 @@ class RedisCacheLockTest extends LockTest
                $configMock = \Mockery::mock(IConfig::class);
 
                $host = $_SERVER['REDIS_HOST'] ?? 'localhost';
+               $port = $_SERVER['REDIS_PORT'] ?? null;
 
                $configMock
                        ->shouldReceive('get')
@@ -44,7 +45,7 @@ class RedisCacheLockTest extends LockTest
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'redis_port')
-                       ->andReturn(null);
+                       ->andReturn($port);
 
                $configMock
                        ->shouldReceive('get')