diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d89112ff..99bb23cf 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -9,9 +9,9 @@ jobs: steps: - name: Set up PHP - uses: shivammathur/setup-php@2.7.0 + uses: shivammathur/setup-php@v2 with: - php-version: 7.4 + php-version: 8.1 coverage: none tools: composer-normalize diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4afbe0ff..68505a88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,17 @@ jobs: services: redis: - image: redis:6.0.0 + image: redis:7.0 ports: - 6379:6379 redis-cluster: - image: grokzen/redis-cluster:5.0.4 + image: grokzen/redis-cluster:6.2.10 ports: - 7000:7000 - 7001:7001 - 7002:7002 env: - STANDALONE: 1 + IP: 0.0.0.0 memcached: image: memcached:1.6.5 ports: @@ -39,7 +39,7 @@ jobs: steps: - name: Set up PHP - uses: shivammathur/setup-php@2.7.0 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} coverage: none diff --git a/composer.json b/composer.json index 858c316f..ac05163d 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "require-dev": { "cache/integration-tests": "^0.17", "defuse/php-encryption": "^2.0", - "illuminate/cache": "^5.4 || ^5.5 || ^5.6", + "illuminate/cache": "^5.4", "mockery/mockery": "^1.0", "phpunit/phpunit": "^7.5.20 || ^9.5.10", "predis/predis": "^1.1", diff --git a/src/Adapter/Apc/composer.json b/src/Adapter/Apc/composer.json index c30dd6c4..fa11fbb1 100644 --- a/src/Adapter/Apc/composer.json +++ b/src/Adapter/Apc/composer.json @@ -23,9 +23,7 @@ "homepage": "http://www.php-cache.com/en/latest/", "require": { "php": ">=7.4", - "cache/adapter-common": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/adapter-common": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Apcu/composer.json b/src/Adapter/Apcu/composer.json index c5a0d1c2..e3cd560d 100644 --- a/src/Adapter/Apcu/composer.json +++ b/src/Adapter/Apcu/composer.json @@ -23,9 +23,7 @@ "homepage": "http://www.php-cache.com/en/latest/", "require": { "php": ">=7.4", - "cache/adapter-common": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/adapter-common": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Doctrine/composer.json b/src/Adapter/Doctrine/composer.json index 6be7f5b1..52e5bbff 100644 --- a/src/Adapter/Doctrine/composer.json +++ b/src/Adapter/Doctrine/composer.json @@ -25,9 +25,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.0", - "doctrine/cache": "^1.6", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "doctrine/cache": "^1.6" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Filesystem/composer.json b/src/Adapter/Filesystem/composer.json index d2f794d8..69f60197 100644 --- a/src/Adapter/Filesystem/composer.json +++ b/src/Adapter/Filesystem/composer.json @@ -25,9 +25,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.0", - "league/flysystem": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "league/flysystem": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Illuminate/composer.json b/src/Adapter/Illuminate/composer.json index 03822e0f..d6fe8227 100644 --- a/src/Adapter/Illuminate/composer.json +++ b/src/Adapter/Illuminate/composer.json @@ -32,9 +32,7 @@ "php": ">=7.4", "cache/adapter-common": "^1.0", "cache/hierarchical-cache": "^1.0", - "illuminate/cache": "^5.4 || ^5.5 || ^5.6", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "illuminate/cache": "^5.4" }, "require-dev": { "cache/integration-tests": "^0.17", @@ -55,6 +53,11 @@ "/Tests/" ] }, + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } + }, "extra": { "branch-alias": { "dev-master": "1.1-dev" diff --git a/src/Adapter/Memcache/composer.json b/src/Adapter/Memcache/composer.json index 26c42022..c02f7c72 100644 --- a/src/Adapter/Memcache/composer.json +++ b/src/Adapter/Memcache/composer.json @@ -24,9 +24,7 @@ "homepage": "http://www.php-cache.com/en/latest/", "require": { "php": ">=7.4", - "cache/adapter-common": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/adapter-common": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Memcached/composer.json b/src/Adapter/Memcached/composer.json index aadb1848..09a179a4 100644 --- a/src/Adapter/Memcached/composer.json +++ b/src/Adapter/Memcached/composer.json @@ -25,9 +25,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.0", - "cache/hierarchical-cache": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/hierarchical-cache": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/MongoDB/composer.json b/src/Adapter/MongoDB/composer.json index ecadc298..a8b5215d 100644 --- a/src/Adapter/MongoDB/composer.json +++ b/src/Adapter/MongoDB/composer.json @@ -25,9 +25,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.1", - "mongodb/mongodb": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "mongodb/mongodb": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/PHPArray/composer.json b/src/Adapter/PHPArray/composer.json index 53a327e3..9897e6eb 100644 --- a/src/Adapter/PHPArray/composer.json +++ b/src/Adapter/PHPArray/composer.json @@ -25,9 +25,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.0", - "cache/hierarchical-cache": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/hierarchical-cache": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Predis/Changelog.md b/src/Adapter/Predis/Changelog.md index 82944367..dd5d3c19 100644 --- a/src/Adapter/Predis/Changelog.md +++ b/src/Adapter/Predis/Changelog.md @@ -4,6 +4,9 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee ## UNRELEASED +* Update predis/predis: ^2.0 +* Fixed unserialized(null) deprecation + ## 1.2.0 * Support for PHP 8.1 diff --git a/src/Adapter/Predis/PredisCachePool.php b/src/Adapter/Predis/PredisCachePool.php index f1ec6eee..ea737e53 100644 --- a/src/Adapter/Predis/PredisCachePool.php +++ b/src/Adapter/Predis/PredisCachePool.php @@ -42,7 +42,7 @@ public function __construct(Client $cache) */ protected function fetchObjectFromCache($key) { - if (false === $result = unserialize($this->cache->get($this->getHierarchyKey($key)))) { + if (false === $result = unserialize($this->cache->get($this->getHierarchyKey($key)) ?? '')) { return [false, null, [], null]; } diff --git a/src/Adapter/Predis/composer.json b/src/Adapter/Predis/composer.json index 2739326b..14349ec0 100644 --- a/src/Adapter/Predis/composer.json +++ b/src/Adapter/Predis/composer.json @@ -27,9 +27,7 @@ "php": ">=7.4", "cache/adapter-common": "^1.0", "cache/hierarchical-cache": "^1.0", - "predis/predis": "^1.1", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "predis/predis": "^2.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Redis/composer.json b/src/Adapter/Redis/composer.json index 7abda0c3..b8990a3d 100644 --- a/src/Adapter/Redis/composer.json +++ b/src/Adapter/Redis/composer.json @@ -26,9 +26,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.0", - "cache/hierarchical-cache": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/hierarchical-cache": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17", diff --git a/src/Adapter/Void/composer.json b/src/Adapter/Void/composer.json index 1c09f613..89b2e959 100644 --- a/src/Adapter/Void/composer.json +++ b/src/Adapter/Void/composer.json @@ -25,9 +25,7 @@ "require": { "php": ">=7.4", "cache/adapter-common": "^1.0", - "cache/hierarchical-cache": "^1.0", - "psr/cache": "^1.0 || ^2.0", - "psr/simple-cache": "^1.0" + "cache/hierarchical-cache": "^1.0" }, "require-dev": { "cache/integration-tests": "^0.17",