Merge branch 'martinssipenko-master'

Author: martin-helmich

.gitignore

@@ -1,5 +1,6 @@
 /build/
 /composer.lock
 /vendor/
+.phpunit.result.cache
 
 /.idea/

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 php:
   - 7.3
   - 7.2
-  - 7.1
 install:
   - composer install --optimize-autoloader --prefer-dist --no-interaction
 before_script:

README.md

@@ -23,10 +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 |
-| ------------------------ | --------- | --------- | --------- | --------- |
-| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :no_entry_sign: | :no_entry_sign: |
-| v2 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: |
+| "JSON assertion" version | PHPUnit 4 | PHPUnit 5 | PHPUnit 6 | PHPUnit 7 | PHPUnit 8 |
+| ------------------------ | --------- | --------- | --------- | --------- | --------- |
+| v1 (branch `v1`), **unsupported** | :white_check_mark: | :white_check_mark: | :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: |
+| v3 (branch `master`) | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :no_entry_sign: | :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

@@ -9,15 +9,15 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.2",
         "flow/jsonpath": "^0.4.0",
         "justinrainbow/json-schema": "^5.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<6.0 || >= 8.0"
+        "phpunit/phpunit": "<8.0 || >= 9.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0 | ^7.0"
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

src/Constraint/JsonValueMatches.php

@@ -41,8 +41,6 @@ class JsonValueMatches extends Constraint
      */
     public function __construct(string $jsonPath, Constraint $constraint, bool $matchAll = false)
     {
-        parent::__construct();
-
         $this->jsonPath   = $jsonPath;
         $this->constraint = $constraint;
         $this->matchAll   = $matchAll;

src/Constraint/JsonValueMatchesMany.php

@@ -27,8 +27,6 @@ class JsonValueMatchesMany extends Constraint
      */
     public function __construct(array $constraints)
     {
-        parent::__construct();
-
         foreach ($constraints as $key => $constraint) {
             if (!$constraint instanceof Constraint) {
                 $constraint = new IsEqual($constraint);

src/Constraint/JsonValueMatchesSchema.php

@@ -25,7 +25,6 @@ class JsonValueMatchesSchema extends Constraint
      */
     public function __construct($schema)
     {
-        parent::__construct();
         $this->schema = $this->forceToObject($schema);
     }
 

tests/Functional/JsonValueMatchesSchemaFluentTest.php

@@ -2,6 +2,7 @@
 namespace Helmich\JsonAssert\Tests\Functional;
 
 use Helmich\JsonAssert\JsonAssertions;
+use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\TestCase;
 
 class JsonValueMatchesSchemaFluentTest extends TestCase
@@ -59,11 +60,10 @@ public function testJsonDocumentMatchesSchema()
         ]));
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testJsonDocumentDoesNotMatchSchema()
     {
+        $this->expectException(AssertionFailedError::class);
+
         assertThat(static::$exampleDocument, matchesJsonSchema([
             'type' => 'object',
             'required' => ['foobar'],
@@ -72,4 +72,4 @@ public function testJsonDocumentDoesNotMatchSchema()
             ]
         ]));
     }
-}
+}

tests/Functional/JsonValueMatchesSchemaTest.php

@@ -2,6 +2,7 @@
 namespace Helmich\JsonAssert\Tests\Functional;
 
 use Helmich\JsonAssert\JsonAssertions;
+use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\TestCase;
 
 class JsonValueMatchesSchemaTest extends TestCase
@@ -59,11 +60,10 @@ public function testJsonDocumentMatchesSchema()
         ]);
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testJsonDocumentDoesNotMatchSchema()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertJsonDocumentMatchesSchema(static::$exampleDocument, [
             'type' => 'object',
             'required' => ['foobar'],
@@ -83,4 +83,4 @@ public function testStringsAreInterpretedAsJsonString()
             ]
         ]);
     }
-}
+}

tests/Functional/JsonValueMatchesTest.php

@@ -2,6 +2,7 @@
 namespace Helmich\JsonAssert\Tests\Functional;
 
 use Helmich\JsonAssert\JsonAssertions;
+use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Constraint\Count;
 use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\Constraint\IsType;
@@ -82,10 +83,11 @@ public function testJsonValueEqualsCanSucceed($jsonDocument, $jsonPath, $expecte
      * @param $jsonPath
      * @param $expectedValue
      * @dataProvider dataForJsonValueEqualsCanFail
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
      */
     public function testJsonValueEqualsCanFail($jsonDocument, $jsonPath, $expectedValue)
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertJsonValueEquals($jsonDocument, $jsonPath, $expectedValue);
     }
 
@@ -118,10 +120,11 @@ public function testJsonValueMatchesSucceedsWithAnyConstraint()
      * @param $jsonPath
      * @param $expectedValue
      * @dataProvider dataForJsonValueEqualsCanFail
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
      */
     public function testJsonValueMatchesCanFail($jsonDocument, $jsonPath, $expectedValue)
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertJsonValueMatches(
             $jsonDocument,
             $jsonPath,
@@ -146,11 +149,10 @@ public function testAssertManyCanSucceed()
         );
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testAssertManyCanFail()
     {
+        $this->expectException(AssertionFailedError::class);
+
         $this->assertJsonDocumentMatches(
             static::$exampleDocument,
             [
@@ -160,4 +162,4 @@ public function testAssertManyCanFail()
             ]
         );
     }
-}
+}