Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,20 @@ jobs:
strategy:
matrix:
php: ['8.2', '8.3', '8.4', '8.5']
phpunit: ['8.0', '9.0', '10.0', '11.0', '12.0']
phpunit: ['8.0', '9.0', '10.0', '11.0', '12.0', '13.0']
exclude:
- php: '8.1'
phpunit: '11.0'
- php: '8.1'
phpunit: '12.0'
- php: '8.1'
phpunit: '13.0'
- php: '8.2'
phpunit: '12.0'
- php: '8.2'
phpunit: '13.0'
- php: '8.3'
phpunit: '13.0'
runs-on: ubuntu-latest
name: PHP ${{ matrix.php }}, PHPUnit ${{ matrix.phpunit }}

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ This library is [MIT-licensed](LICENSE.txt).

There are several release branches of this library, each of these being compatible with different releases of PHPUnit and PHP. The following table should give an easy overview:

| "JSON assertion" version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 | PHPUnit 9 | PHPUnit 10 | PHPUnit 11 | PHPUnit 12 |
| ------------------------ | --------- | --------- | --------- | --------- | --------- | --------- | ---------- |------------|------------|
| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
| v2 (branch `v2`) | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
| v3 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| "JSON assertion" version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 | PHPUnit 9 | PHPUnit 10 | PHPUnit 11 | PHPUnit 12 | PHPUnit 13 |
| ------------------------ | --------- | --------- | --------- | --------- | --------- | --------- | ---------- |------------|------------|------------|
| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
| v2 (branch `v2`) | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: |
| v3 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |

When you are using `composer require` and have already declared a dependency to `phpunit/phpunit` in your `composer.json` file, Composer should pick latest compatible version automatically.

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"justinrainbow/json-schema": "^5.0 || ^6.0"
},
"conflict": {
"phpunit/phpunit": "<8.0 || >= 13.0"
"phpunit/phpunit": "<8.0 || >= 14.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
"phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0 || ^13.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions tests/Functional/JsonValueMatchesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ public function testJsonValueMatchesSucceedsWithAnyConstraint()
{
$type = 'array';

// Required for PHPUnit 12 support as starting from PHPUnit
// Required for PHPUnit > 12 support as starting from PHPUnit
// version 12 IsTypeclass expects an enum of NativeType.
if (str_starts_with(Version::id(), '12.')) {
if (version_compare(Version::id(), '12', 'ge')) {
$type = NativeType::Array;
}

Expand Down