New version to support phpunit 6 (#15)

* Added phpunit6 support
* Fixed PHP versions for travis ci
* fix: DataProvider for testGetJsonObject wasn't working
* ci: Remove non-required travis statements

Author: Mabiro

.travis.yml

@@ -3,18 +3,8 @@ sudo: false
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm
-
-matrix:
-    include:
-        - php: 5.4
-          env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
-    allow_failures:
-        - php: hhvm
+  - 7.1
+  - 7.2
 
 before_script:
     - travis_retry composer self-update

README.md

@@ -57,8 +57,9 @@ You can either use the `trait` or `class` version.
 namespace EnricoStahn\JsonAssert\Tests;
 
 use EnricoStahn\JsonAssert\Assert as JsonAssert;
+use PHPUnit\Framework\TestCase;
 
-class MyTestCase extends \PHPUnit_Framework_TestCase
+class MyTestCase extends TestCase
 {
     use JsonAssert;
 
@@ -86,7 +87,7 @@ class MyTestCase extends \PHPUnit_Framework_TestCase
 
 ### Class
 
-In case you don't want to use the `trait` you can use the provided class wich extends from `\PHPUnit_Framework_TestCase`.
+In case you don't want to use the `trait` you can use the provided class wich extends from `PHPUnit\Framework\TestCase`.
 You can either extend your test case or use the static methods like below.
 
 ```php
@@ -95,8 +96,9 @@ You can either extend your test case or use the static methods like below.
 namespace EnricoStahn\JsonAssert\Tests;
 
 use EnricoStahn\JsonAssert\AssertClass as JsonAssert;
+use PHPUnit\Framework\TestCase;
 
-class MyTestCase extends \PHPUnit_Framework_TestCase
+class MyTestCase extends TestCase
 {
     public function testJsonDocumentIsValid()
     {

composer.json

@@ -13,12 +13,12 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^5.4 || ^7.0",
+        "php": "^7.0",
         "justinrainbow/json-schema": "^2.0",
         "mtdowling/jmespath.php": "^2.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8|~5.2",
+        "phpunit/phpunit": "^6",
         "codacy/coverage": "dev-master",
         "symfony/http-foundation": "^2.8|^3.0"
     },

src/Assert.php

@@ -51,7 +51,7 @@ public static function assertJsonMatchesSchema($schema, $content)
         }, $validator->getErrors());
         $messages[] = '- Response: '.json_encode($content);
 
-        \PHPUnit_Framework_Assert::assertTrue($validator->isValid(), implode("\n", $messages));
+        \PHPUnit\Framework\Assert::assertTrue($validator->isValid(), implode("\n", $messages));
     }
 
     /**
@@ -84,8 +84,8 @@ public static function assertJsonValueEquals($expected, $expression, $json)
     {
         $result = \JmesPath\Env::search($expression, $json);
 
-        \PHPUnit_Framework_Assert::assertEquals($expected, $result);
-        \PHPUnit_Framework_Assert::assertInternalType(gettype($expected), $result);
+        \PHPUnit\Framework\Assert::assertEquals($expected, $result);
+        \PHPUnit\Framework\Assert::assertInternalType(gettype($expected), $result);
     }
 
     /**

src/AssertClass.php

@@ -11,7 +11,9 @@
 
 namespace EnricoStahn\JsonAssert;
 
-class AssertClass extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class AssertClass extends TestCase
 {
     use Assert;
 }

src/Extension/Symfony.php

@@ -69,12 +69,12 @@ public static function assertJsonValueEquals($expected, $expression, $response)
      */
     public static function assertJsonResponse(Response $response, $statusCode = 200)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
+        \PHPUnit\Framework\Assert::assertEquals(
             $statusCode,
             $response->getStatusCode(),
             $response->getContent()
         );
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $response->headers->contains('Content-Type', 'application/json'),
             $response->headers
         );

src/Extension/SymfonyClass.php

@@ -11,7 +11,9 @@
 
 namespace EnricoStahn\JsonAssert\Extension;
 
-class SymfonyClass extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class SymfonyClass extends TestCase
 {
     use Symfony;
 }

tests/AssertClassTest.php

@@ -12,8 +12,9 @@
 namespace EnricoStahn\JsonAssert\Tests;
 
 use EnricoStahn\JsonAssert\AssertClass;
+use PHPUnit\Framework\TestCase;
 
-class AssertClassTest extends \PHPUnit_Framework_TestCase
+class AssertClassTest extends TestCase
 {
     public function testClassInstance()
     {

tests/AssertTraitImpl.php

@@ -12,8 +12,9 @@
 namespace EnricoStahn\JsonAssert\Tests;
 
 use EnricoStahn\JsonAssert\Assert as JsonAssert;
+use PHPUnit\Framework\TestCase;
 
-class AssertTraitImpl extends \PHPUnit_Framework_TestCase
+class AssertTraitImpl extends TestCase
 {
     use JsonAssert;
 }

tests/AssertTraitTest.php

@@ -11,7 +11,10 @@
 
 namespace EnricoStahn\JsonAssert\Tests;
 
-class AssertTraitTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
+
+class AssertTraitTest extends TestCase
 {
     /**
      * Showcase for the Wiki.
@@ -33,7 +36,7 @@ public function testAssertJsonMatchesSchema()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      */
     public function testAssertJsonMatchesSchemaFail()
     {
@@ -50,12 +53,12 @@ public function testAssertJsonMatchesSchemaFailMessage()
 
         try {
             AssertTraitImpl::assertJsonMatchesSchema(Utils::getSchemaPath('test.schema.json'), $content);
-        } catch (\PHPUnit_Framework_ExpectationFailedException $exception) {
+        } catch (ExpectationFailedException $exception) {
             self::assertContains('- Property: foo, Contraint: type, Message: String value found, but an integer is required', $exception->getMessage());
             self::assertContains('- Response: {"foo":"123"}', $exception->getMessage());
         }
 
-        self::assertInstanceOf('PHPUnit_Framework_ExpectationFailedException', $exception);
+        self::assertInstanceOf('\PHPUnit\Framework\ExpectationFailedException', $exception);
     }
 
     /**
@@ -69,7 +72,7 @@ public function testAssertJsonMatchesSchemaWithRefs()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      */
     public function testAssertJsonMatchesSchemaWithRefsFails()
     {
@@ -110,7 +113,7 @@ public function assertJsonValueEqualsProvider()
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_ExpectationFailedException
+     * @expectedException \PHPUnit\Framework\ExpectationFailedException
      */
     public function testAssertJsonValueEqualsFailsOnWrongDataType()
     {
@@ -120,14 +123,14 @@ public function testAssertJsonValueEqualsFailsOnWrongDataType()
     }
 
     /**
-     * @dataProvider testGetJsonObjectProvider
+     * @dataProvider jsonObjectProvider
      */
     public function testGetJsonObject($expected, $actual)
     {
         self::assertEquals($expected, AssertTraitImpl::getJsonObject($actual));
     }
 
-    public function testGetJsonObjectProvider()
+    public function jsonObjectProvider()
     {
         return [
             [[], []],