Merge pull request #133 from MindscapeHQ/feature/php8-tests

MindscapeHQ · Jan 17, 2021 · 1ac3953 · 1ac3953
2 parents 6b0063b + f68e595
commit 1ac3953
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: php
 
-dist: trusty
+dist: xenial
 
 php:
-  - '7.2'
   - '7.3'
   - '7.4'
+  - '8.0'
 
 cache:
   directories:

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "squizlabs/php_codesniffer": "^3.0",
-        "estahn/phpunit-json-assertions": "^3"
+        "justinrainbow/json-schema": "^5.2"
     },
     "suggest": {
         "ext-curl": "*"

diff --git a/tests/RaygunClientTest.php b/tests/RaygunClientTest.php
@@ -2,19 +2,17 @@
 
 namespace Raygun4php\Tests;
 
+use JsonSchema\Validator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Raygun4php\RaygunClient;
 use Raygun4php\RaygunMessage;
 use Raygun4php\RaygunRequestMessage;
 use Raygun4php\Interfaces\TransportInterface;
 use Raygun4php\Tests\Stubs\TransportGetMessageStub;
-use EnricoStahn\JsonAssert\Assert as JsonAssert;
 
 class RaygunClientTest extends TestCase
 {
-    use JsonAssert;
-
     /**
      * @var RaygunClient
      */
@@ -205,6 +203,10 @@ public function testValidateMessageJsonInTransportObj()
         $client->SendException(new \Exception('test'));
         $raygunMessage = $transportStub->getMessage();
 
-        $this->assertJsonMatchesSchemaString($this->jsonSchema, json_decode($raygunMessage->toJson()));
+        $data = json_decode($raygunMessage->toJson());
+
+        $schemaValidator = new Validator();
+        $schemaValidator->validate($data, $this->jsonSchema);
+        $this->assertTrue($schemaValidator->isValid());
     }
 }
diff --git a/tests/RaygunMessageTest.php b/tests/RaygunMessageTest.php
@@ -3,14 +3,12 @@
 namespace Raygun4php\Tests;
 
 use Exception;
+use JsonSchema\Validator;
 use PHPUnit\Framework\TestCase;
 use Raygun4php\RaygunMessage;
-use EnricoStahn\JsonAssert\Assert as JsonAssert;
 
 class RaygunMessageTest extends TestCase
 {
-    use JsonAssert;
-
     /**
      * json schema used to validate message json.
      *
@@ -65,6 +63,10 @@ public function testMessageToJsonSchema()
         $msg->build(new Exception('Test'));
 
         $msgJson = $msg->toJson();
-        $this->assertJsonMatchesSchemaString($this->jsonSchema, json_decode($msgJson));
+        $data = json_decode($msgJson);
+
+        $schemaValidator = new Validator();
+        $schemaValidator->validate($data, $this->jsonSchema);
+        $this->assertTrue($schemaValidator->isValid());
     }
 }