Skip to content

Commit 03f827c

Browse files
maciejlewmaciejlew
authored
Merge pull request #137 from maciejlew/php-8.5
PHP 8.5 support
2 parents b4305a8 + f656ac6 commit 03f827c

18 files changed

Lines changed: 61 additions & 33 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- 8.2
2828
- 8.3
2929
- 8.4
30+
- 8.5
3031
steps:
3132
- name: Checkout
3233
uses: actions/checkout@v3

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
55

6+
## [Unreleased]
7+
### Added
8+
- PHP-8.5 support
9+
610
## [3.0.12] - 2025-07-03
711
### Added
812
- PHP-8.4 support

‎build/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ help:
1717
| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
1818

1919
build: ## build php images
20-
docker-compose build
20+
docker compose build
2121

2222
test: ## test all against all php images
2323
$(MAKE) test-php-7.0

‎build/docker-compose.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,11 @@ services:
7070
context: php-8.4
7171
volumes:
7272
- ..:/app
73+
network_mode: host
74+
75+
php-8.5:
76+
build:
77+
context: php-8.5
78+
volumes:
79+
- ..:/app
7380
network_mode: host

‎build/php-7.0/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: prepare-php-7.0 test-php-7.0 test-suite-php-7.0
22

33
prepare-php-7.0: ## load dependencies with php 7.0
4-
docker-compose run -T php-7.0 /usr/bin/composer update
4+
docker compose run -T php-7.0 /usr/bin/composer update
55

66
test-php-7.0: prepare-php-7.0 ## run tests against php 7.0
7-
docker-compose run -T php-7.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
7+
docker compose run -T php-7.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
88

99
test-suite-php-7.0: prepare-php-7.0 ## run suite tests against php 7.0, ex: make test-suite-php-7.0 SUITE="unit"
10-
docker-compose run -T php-7.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
10+
docker compose run -T php-7.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)

‎build/php-7.1/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: prepare-php-7.1 test-php-7.1 test-suite-php-7.1
22

33
prepare-php-7.1: ## load dependencies with php 7.1
4-
docker-compose run -T php-7.1 /usr/bin/composer update
4+
docker compose run -T php-7.1 /usr/bin/composer update
55

66
test-php-7.1: prepare-php-7.1 ## run tests against php 7.1
7-
docker-compose run -T php-7.1 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
7+
docker compose run -T php-7.1 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
88

99
test-suite-php-7.1: prepare-php-7.1 ## run suite tests against php 7.1, ex: make test-suite-php-7.1 SUITE="unit"
10-
docker-compose run -T php-7.1 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
10+
docker compose run -T php-7.1 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)

‎build/php-7.2/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: prepare-php-7.2 test-php-7.2 test-suite-php-7.2
22

33
prepare-php-7.2: ## load dependencies with php 7.2
4-
docker-compose run -T php-7.2 /usr/bin/composer update
4+
docker compose run -T php-7.2 /usr/bin/composer update
55

66
test-php-7.2: prepare-php-7.2 ## run tests against php 7.2
7-
docker-compose run -T php-7.2 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
7+
docker compose run -T php-7.2 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
88

99
test-suite-php-7.2: prepare-php-7.2 ## run suite tests against php 7.2, ex: make test-suite-php-7.2 SUITE="unit"
10-
docker-compose run -T php-7.2 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
10+
docker compose run -T php-7.2 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)

‎build/php-7.3/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: prepare-php-7.3 test-php-7.3 test-suite-php-7.3
22

33
prepare-php-7.3: ## load dependencies with php 7.3
4-
docker-compose run -T php-7.3 /usr/bin/composer update
4+
docker compose run -T php-7.3 /usr/bin/composer update
55

66
test-php-7.3: prepare-php-7.3 ## run tests against php 7.3
7-
docker-compose run -T php-7.3 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
7+
docker compose run -T php-7.3 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
88

99
test-suite-php-7.3: prepare-php-7.3 ## run suite tests against php 7.3, ex: make test-suite-php-7.3 SUITE="unit"
10-
docker-compose run -T php-7.3 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
10+
docker compose run -T php-7.3 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)

‎build/php-7.4/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: prepare-php-7.4 test-php-7.4 test-suite-php-7.4
22

33
prepare-php-7.4: ## load dependencies with php 7.4
4-
docker-compose run -T php-7.4 /usr/bin/composer update
4+
docker compose run -T php-7.4 /usr/bin/composer update
55

66
test-php-7.4: prepare-php-7.4 ## run tests against php 7.4
7-
docker-compose run -T php-7.4 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
7+
docker compose run -T php-7.4 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
88

99
test-suite-php-7.4: prepare-php-7.4 ## run suite tests against php 7.4, ex: make test-suite-php-7.4 SUITE="unit"
10-
docker-compose run -T php-7.4 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
10+
docker compose run -T php-7.4 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)

‎build/php-8.0/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.PHONY: prepare-php-8.0 test-php-8.0 test-suite-php-8.0
22

33
prepare-php-8.0: ## load dependencies with php 8.0
4-
docker-compose run -T php-8.0 /usr/bin/composer update
4+
docker compose run -T php-8.0 /usr/bin/composer update
55

66
test-php-8.0: prepare-php-8.0 ## run tests against php 8.0
7-
docker-compose run -T php-8.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
7+
docker compose run -T php-8.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml
88

99
test-suite-php-8.0: prepare-php-8.0 ## run suite tests against php 8.0, ex: make test-suite-php-8.0 SUITE="unit"
10-
docker-compose run -T php-8.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)
10+
docker compose run -T php-8.0 php vendor/bin/phpunit --configuration tests-resources/phpunit.xml --testsuite $(SUITE)

0 commit comments

Comments
 (0)