From 46bf1c1e63d8275d9b35569b957a33d33df25cef Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 14:27:58 +0100 Subject: [PATCH 1/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- .github/workflows/checks.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/static.yml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d89112ff..2d85746f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -16,7 +16,7 @@ jobs: 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..f4568b85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ 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: @@ -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..a051b8e7 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -19,14 +19,14 @@ jobs: 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 @@ -43,7 +43,7 @@ jobs: tools: composer:v2 - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download dependencies run: | From f962c9316f3e0b0b387679ed173e0a2554f95ee7 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 14:33:42 +0100 Subject: [PATCH 2/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4568b85..a5ab041d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,11 @@ jobs: 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 From 8ade4040864149c724879826802b7ce0506399bc Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 14:43:37 +0100 Subject: [PATCH 3/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index 858c316f..f6a2bb11 100644 --- a/composer.json +++ b/composer.json @@ -106,5 +106,10 @@ "branch-alias": { "dev-master": "1.1-dev" } + }, + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } } } From d9c63a1ecbc4ec83355a4c99313e4a15a6f5a9c4 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 14:48:47 +0100 Subject: [PATCH 4/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- .github/workflows/checks.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/static.yml | 4 ++-- src/Adapter/Illuminate/composer.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 2d85746f..a22e13df 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -9,7 +9,7 @@ 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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5ab041d..e46dc6a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index a051b8e7..4c66771f 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -13,7 +13,7 @@ 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 @@ -36,7 +36,7 @@ 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 diff --git a/src/Adapter/Illuminate/composer.json b/src/Adapter/Illuminate/composer.json index 03822e0f..08cc01b4 100644 --- a/src/Adapter/Illuminate/composer.json +++ b/src/Adapter/Illuminate/composer.json @@ -59,5 +59,10 @@ "branch-alias": { "dev-master": "1.1-dev" } + }, + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } } } From 4f962b55adfa3de54a7df7fb266f784fd40c9b17 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 14:59:00 +0100 Subject: [PATCH 5/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index a22e13df..eb18a809 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -11,7 +11,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@2.29.0 with: - php-version: 7.4 + php-version: 8.2 coverage: none tools: composer-normalize From c65e22e7fad7579cb6eccd8aa0ab1dd345273a1b Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 15:02:53 +0100 Subject: [PATCH 6/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- composer.json | 2 +- src/Adapter/Illuminate/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f6a2bb11..a1dae853 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/Illuminate/composer.json b/src/Adapter/Illuminate/composer.json index 08cc01b4..69a30bd8 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" }, From 635ded814265f1d6700327c24d486d6d8870b110 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Fri, 26 Jan 2024 15:04:35 +0100 Subject: [PATCH 7/7] chore: add testruns for PHP 8.2 and 8.3 bump github actions "actions/checkout@" 2 => 4 bump github actions "docker://oskarstark/phpstan-ga" --- composer.json | 10 +++++----- src/Adapter/Illuminate/composer.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index a1dae853..e2108084 100644 --- a/composer.json +++ b/composer.json @@ -102,14 +102,14 @@ "**/Tests/" ] }, - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "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 69a30bd8..eeb7cdc5 100644 --- a/src/Adapter/Illuminate/composer.json +++ b/src/Adapter/Illuminate/composer.json @@ -55,14 +55,14 @@ "/Tests/" ] }, - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "config": { "allow-plugins": { "kylekatarnls/update-helper": true } + }, + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } } }