Skip to content

Commit

Permalink
Add PHP 8.3 support, drop PHP < 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Slamdunk committed Nov 20, 2023
1 parent 649c4fc commit 86d2a8f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand All @@ -43,8 +43,8 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
dependencies:
- "highest"

Expand All @@ -70,7 +70,7 @@ jobs:
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-

- name: "Remove PHP-CS-Fixer not ready for PHP 8.2 yet"
- name: "Remove PHP-CS-Fixer not ready for PHP 8.3 yet"
run: "composer remove --dev --no-update slam/php-cs-fixer-extensions"

- name: "Install lowest dependencies"
Expand All @@ -93,7 +93,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ all: csfix static-analysis test
@echo "Done."

vendor: composer.json
composer update --ignore-platform-req=php
composer update
composer bump
touch vendor

.PHONY: csfix
csfix: vendor
php8.1 vendor/bin/php-cs-fixer fix --verbose
vendor/bin/php-cs-fixer fix --verbose

.PHONY: static-analysis
static-analysis: vendor
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0",
"php": "~8.2.0 || ~8.3.0",
"phpstan/phpstan": "^1.10.43"
},
"require-dev": {
Expand All @@ -37,8 +37,7 @@
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"phpstan/phpstan-phpunit": "^1.3.15",
"phpunit/phpunit": "^9.6.13",
"slam/php-cs-fixer-extensions": "^v3.9.0",
"slam/php-debug-r": "^v1.8.1"
"slam/php-cs-fixer-extensions": "^v3.10.0"
},
"conflict": {
"laminas/laminas-cache": "<3.9",
Expand Down

0 comments on commit 86d2a8f

Please sign in to comment.