Skip to content

Commit 4fbdaba

Browse files
authored
Merge pull request #40 from thomashohn/task-39-make-php84-compatible
[TASK] Make xml-lint PHP 8.4 compatible
2 parents 8a114be + 25a64b9 commit 4fbdaba

File tree

6 files changed

+389
-503
lines changed

6 files changed

+389
-503
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,20 @@ Using docker:
5858

5959
```shell
6060
# Example
61-
docker build -t xml-lint:php-8.3 --build-arg=PHP_VERSION="8.3" .
61+
docker build -t xml-lint:php-8.4 --build-arg=PHP_VERSION="8.4" .
6262

63-
# PHP_VERSION: choose between 8.0, 8.1, 8.2 and 8.3
63+
# PHP_VERSION: choose between 8.0, 8.1, 8.2, 8.3 and 8.4
6464
docker build -t xml-lint:php-8.0 --build-arg=PHP_VERSION="8.0" .
6565
docker build -t xml-lint:php-8.1 --build-arg=PHP_VERSION="8.1" .
6666
docker build -t xml-lint:php-8.2 --build-arg=PHP_VERSION="8.2" .
6767
docker build -t xml-lint:php-8.3 --build-arg=PHP_VERSION="8.3" .
68-
68+
docker build -t xml-lint:php-8.4 --build-arg=PHP_VERSION="8.4" .
6969
# Run with code style check
70-
docker build -t xml-lint:php-8.3 --build-arg=PHP_VERSION="8.3" --build-arg=PHP_CS_FIXER=true .
70+
docker build -t xml-lint:php-8.4 --build-arg=PHP_VERSION="8.4" --build-arg=PHP_CS_FIXER=true .
7171

7272
# Use this image to run xml-lint:
7373
cd tests/functional/_testdata
74-
docker run -it --rm -v "$PWD":/var/src -w /var/src xml-lint:php-8.3 -r -v -- ./
74+
docker run -it --rm -v "$PWD":/var/src -w /var/src xml-lint:php-8.4 -r -v -- ./
7575
```
7676

7777

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
],
1818
"bin": ["bin/xmllint"],
1919
"require": {
20-
"php": "8.0.*|8.1.*|8.2.*|8.3.*",
20+
"php": "8.0.*|8.1.*|8.2.*|8.3.*|8.4.*",
2121
"symfony/console": "5.3.*|5.4.*|6.*|7.*",
2222
"symfony/finder": "5.3.*|5.4.*|6.*|7.*",
2323
"ext-libxml": "*",
2424
"ext-dom": "*"
2525
},
2626
"require-dev": {
2727
"behat/behat": "^3.0",
28-
"phpunit/phpunit": "^9.1"
28+
"phpunit/phpunit": "^10"
2929
},
3030
"autoload": {
3131
"psr-4": {

0 commit comments

Comments
 (0)