diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d89112ff..eb18a809 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -9,14 +9,14 @@ jobs: steps: - name: Set up PHP - uses: shivammathur/setup-php@2.7.0 + uses: shivammathur/setup-php@2.29.0 with: - php-version: 7.4 + php-version: 8.2 coverage: none tools: composer-normalize - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Normalize run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4afbe0ff..e46dc6a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,15 +13,15 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.4', '8.0', '8.1'] + php: ['7.4', '8.0', '8.1', '8.2', '8.3'] services: redis: - image: redis:6.0.0 + image: redis:6.0.18 ports: - 6379:6379 redis-cluster: - image: grokzen/redis-cluster:5.0.4 + image: grokzen/redis-cluster:6.0.18 ports: - 7000:7000 - 7001:7001 @@ -39,7 +39,7 @@ jobs: steps: - name: Set up PHP - uses: shivammathur/setup-php@2.7.0 + uses: shivammathur/setup-php@2.29.0 with: php-version: ${{ matrix.php }} coverage: none @@ -48,7 +48,7 @@ jobs: ini-values: apc.enable_cli=1 - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download dependencies env: diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index ec86a73d..4c66771f 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -13,20 +13,20 @@ jobs: steps: - name: Set up PHP - uses: shivammathur/setup-php@2.7.0 + uses: shivammathur/setup-php@2.29.0 with: php-version: '7.4' coverage: none - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download dependencies run: | composer update --no-interaction --prefer-dist --optimize-autoloader - name: PHPStan - uses: docker://oskarstark/phpstan-ga:0.12.48 + uses: docker://oskarstark/phpstan-ga with: entrypoint: /composer/vendor/bin/phpstan args: analyze --no-progress @@ -36,14 +36,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up PHP - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@2.29.0 with: php-version: '7.4' extensions: redis, memcached, apcu tools: composer:v2 - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download dependencies run: | diff --git a/composer.json b/composer.json index 858c316f..e2108084 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", @@ -102,6 +102,11 @@ "**/Tests/" ] }, + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } + }, "extra": { "branch-alias": { "dev-master": "1.1-dev" diff --git a/src/Adapter/Illuminate/composer.json b/src/Adapter/Illuminate/composer.json index 03822e0f..eeb7cdc5 100644 --- a/src/Adapter/Illuminate/composer.json +++ b/src/Adapter/Illuminate/composer.json @@ -32,7 +32,7 @@ "php": ">=7.4", "cache/adapter-common": "^1.0", "cache/hierarchical-cache": "^1.0", - "illuminate/cache": "^5.4 || ^5.5 || ^5.6", + "illuminate/cache": "^5.4", "psr/cache": "^1.0 || ^2.0", "psr/simple-cache": "^1.0" }, @@ -55,6 +55,11 @@ "/Tests/" ] }, + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } + }, "extra": { "branch-alias": { "dev-master": "1.1-dev"