Skip to content

Remove indirect dependencies #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Remove indirect dependencies #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8999079
Remove deprecation warning
sideshowcoder Feb 16, 2023
fd7e534
Update predis/predis
sideshowcoder Feb 16, 2023
098ed25
Update changelog
sideshowcoder Feb 16, 2023
6be5d78
Update ci workflow
sideshowcoder Mar 13, 2023
bc6f961
Fix composer-normalize workflow
sideshowcoder Mar 15, 2023
cb0a1ff
Remove indirect dependencies
villfa Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Apc/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Apcu/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Filesystem/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 6 additions & 3 deletions src/Adapter/Illuminate/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -55,6 +53,11 @@
"/Tests/"
]
},
"config": {
"allow-plugins": {
"kylekatarnls/update-helper": true
}
},
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Memcache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Memcached/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/MongoDB/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/PHPArray/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/Adapter/Predis/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Predis/PredisCachePool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}

Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Predis/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Redis/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions src/Adapter/Void/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down