Merge remote-tracking branch 'origin/master' into cleanup

Author: martin-helmich

.github/workflows/php.yml

@@ -12,11 +12,15 @@ jobs:
   build:
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2']
-        phpunit: ['8.0', '9.0', '10.0']
+        php: ['8.0', '8.1', '8.2', '8.3']
+        phpunit: ['8.0', '9.0', '10.0', '11.0']
         exclude:
           - php: '8.0'
             phpunit: '10.0'
+          - php: '8.1'
+            phpunit: '11.0'
+          - php: '8.0'
+            phpunit: '11.0'
     runs-on: ubuntu-latest
     name: PHP ${{ matrix.php }}, PHPUnit ${{ matrix.phpunit }}
 

.github/workflows/php_coverage.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.0
+        php-version: 8.3
         extensions: mbstring, intl, json
         coverage: pcov
 

README.md

@@ -23,11 +23,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 |
-| ------------------------ | --------- | --------- | --------- | --------- | --------- | --------- | ---------- |
-| 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: |
-| v2 (branch `v2`) | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :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: |
+| "JSON assertion" version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 | PHPUnit 9 | PHPUnit 10 | PHPUnit 11 |
+| ------------------------ | --------- | --------- | --------- | --------- | --------- | --------- | ---------- |------------|
+| 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: |
+| 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: |
+| 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: |
 
 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.
 

composer.json

@@ -14,10 +14,10 @@
         "justinrainbow/json-schema": "^5.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<8.0 || >= 11.0"
+        "phpunit/phpunit": "<8.0 || >= 12.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
+        "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,27 +1,29 @@
 <?xml version="1.0"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
         bootstrap="vendor/autoload.php"
         colors="true"
         timeoutForSmallTests="1"
         timeoutForMediumTests="10"
         timeoutForLargeTests="60"
         cacheDirectory=".phpunit.cache">
     <testsuites>
-        <testsuite name="functional">
-            <directory>tests/Functional</directory>
-        </testsuite>
+      <testsuite name="functional">
+        <directory>tests/Functional</directory>
+      </testsuite>
     </testsuites>
     <logging>
-        <junit outputFile="build/phpunit"/>
+      <junit outputFile="build/phpunit"/>
     </logging>
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
-        </report>
+      <report>
+        <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
+      </report>
     </coverage>
+    <source>
+      <include>
+        <directory suffix=".php">src</directory>
+      </include>
+    </source>
 </phpunit>

tests/Functional/JsonValueMatchesTest.php

@@ -3,6 +3,7 @@
 
 use Helmich\JsonAssert\JsonAssertions;
 use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Constraint\Count;
 use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\Constraint\IsType;
@@ -83,6 +84,7 @@ public static function dataForJsonValueEqualsCanFail()
      * @param $expectedValue
      * @dataProvider dataForJsonValueEquals
      */
+    #[DataProvider('dataForJsonValueEquals')]
     public function testJsonValueEqualsCanSucceed($jsonDocument, $jsonPath, $expectedValue)
     {
         $this->assertJsonValueEquals($jsonDocument, $jsonPath, $expectedValue);
@@ -94,6 +96,7 @@ public function testJsonValueEqualsCanSucceed($jsonDocument, $jsonPath, $expecte
      * @param $expectedValue
      * @dataProvider dataForJsonValueEqualsCanFail
      */
+    #[DataProvider('dataForJsonValueEqualsCanFail')]
     public function testJsonValueEqualsCanFail($jsonDocument, $jsonPath, $expectedValue)
     {
         $this->expectException(AssertionFailedError::class);
@@ -107,6 +110,7 @@ public function testJsonValueEqualsCanFail($jsonDocument, $jsonPath, $expectedVa
      * @param $expectedValue
      * @dataProvider dataForJsonValueEquals
      */
+    #[DataProvider('dataForJsonValueEquals')]
     public function testJsonValueMatchesCanSucceed($jsonDocument, $jsonPath, $expectedValue)
     {
         $this->assertJsonValueMatches(
@@ -131,6 +135,7 @@ public function testJsonValueMatchesSucceedsWithAnyConstraint()
      * @param $expectedValue
      * @dataProvider dataForJsonValueEqualsCanFail
      */
+    #[DataProvider('dataForJsonValueEqualsCanFail')]
     public function testJsonValueMatchesCanFail($jsonDocument, $jsonPath, $expectedValue)
     {
         $this->expectException(AssertionFailedError::class);