Skip to content

Commit

Permalink
Merge pull request #138 from Roave/php_84
Browse files Browse the repository at this point in the history
Add PHP 8.4 support, drop PHP 8.2
  • Loading branch information
Slamdunk committed Sep 25, 2024
2 parents 7f8b5fc + d983d55 commit 04c877d
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/[email protected]
with:
php-version: 8.2
php-version: 8.3
coverage: pcov
tools: cs2pr

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/composer-require-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup PHP with composer require checker
uses: shivammathur/[email protected]
with:
php-version: 8.2
php-version: 8.3
tools: composer-require-checker

- name: Cache composer dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/roave-bc-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/[email protected]
with:
php-version: 8.2
php-version: 8.3
coverage: pcov
tools: cs2pr

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/[email protected]
with:
php-version: 8.2
php-version: 8.3
coverage: pcov
tools: cs2pr

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jobs:
strategy:
matrix:
php-version:
- '8.2'
- '8.3'
- '8.4'
dependencies:
- 'locked'
- 'latest'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ifdef CI
DOCKER_PHP_EXEC :=
else
DOCKER_PHP_EXEC := docker compose run php
DOCKER_PHP_EXEC := docker compose run --rm php
endif

SRCS := $(shell find ./src ./test -type f)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"homepage": "https://github.com/Roave/psr-container-doctrine",
"require": {
"php": "~8.2.0 || ~8.3.0",
"php": "~8.3.0 || ~8.4.0",
"doctrine/common": "^3.4.4",
"doctrine/dbal": "^4.1.1",
"doctrine/event-manager": "^2.0.1",
Expand Down Expand Up @@ -50,7 +50,7 @@
"ocramius/package-versions": true
},
"platform": {
"php": "8.2.99"
"php": "8.3.99"
},
"sort-packages": true
}
Expand Down
6 changes: 3 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 04c877d

Please sign in to comment.