Another attempt to make it work under PHP 5.3 and PHP 8+

.github/workflows/continuous-integration.yml

@@ -26,7 +26,8 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
-#          - "8.0"
+          - "8.0"
+          - "8.1"
         dependencies: [highest]
         experimental: [false]
         include:
@@ -36,15 +37,12 @@ jobs:
           - php-version: "5.3"
             dependencies: lowest
             experimental: false
-#          - php-version: "8.0"
-#            dependencies: highest
-#            experimental: false
-#          - php-version: "8.1"
-#            dependencies: lowest-ignore
-#            experimental: true
-#          - php-version: "8.1"
-#            dependencies: highest-ignore
-#            experimental: true
+          - php-version: "8.0"
+            dependencies: highest
+            experimental: false
+          - php-version: "8.1"
+            dependencies: highest-ignore
+            experimental: true
 
     steps:
       - name: "Checkout"

composer.json

@@ -29,12 +29,14 @@
     "require": {
         "php": ">=5.3.3",
         "marc-mabe/php-enum":"^2.0 || ^3.0 || ^4.0",
-        "icecave/parity": "1.0.0"
+        "icecave/parity": ">=1.0.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.2.20 || ~2.19.0",
         "json-schema/json-schema-test-suite": "1.2.0",
-        "phpunit/phpunit": "^4.8.35"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.29 || ^9.5.24",
+        "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
+        "phpspec/prophecy-phpunit": "^1.1 || ^2.0.1"
     },
     "extra": {
         "branch-alias": {
@@ -69,10 +71,10 @@
         "bin/validate-json"
     ],
     "scripts": {
-        "coverage": "phpunit --coverage-text",
+        "coverage": "vendor/bin/phpunit --coverage-text",
         "style-check": "php-cs-fixer fix --dry-run --verbose --diff",
         "style-fix": "php-cs-fixer fix --verbose",
-        "test": "phpunit",
-        "testOnly": "phpunit --colors --filter"
+        "test": "vendor/bin/phpunit",
+        "testOnly": "vendor/bin/phpunit --colors --filter"
     }
 }

tests/ConstraintErrorTest.php

@@ -10,9 +10,9 @@
 namespace JsonSchema\Tests;
 
 use JsonSchema\ConstraintError;
-use PHPUnit\Framework\TestCase;
+use JsonSchema\Tests\Constraints\VeryBaseTestCase;
 
-class ConstraintErrorTest extends TestCase
+class ConstraintErrorTest extends VeryBaseTestCase
 {
     public function testGetValidMessage()
     {
@@ -24,7 +24,7 @@ public function testGetInvalidMessage()
     {
         $e = ConstraintError::MISSING_ERROR();
 
-        $this->setExpectedException(
+        $this->expectExceptionCompat(
             '\JsonSchema\Exception\InvalidArgumentException',
             'Missing error message for missingError'
         );

tests/Constraints/CoerciveTest.php

@@ -18,7 +18,7 @@ class CoerciveTest extends VeryBaseTestCase
 {
     protected $factory = null;
 
-    public function setUp()
+    public function doSetUp()
     {
         $this->factory = new Factory();
         $this->factory->setConfig(Constraint::CHECK_MODE_TYPE_CAST | Constraint::CHECK_MODE_COERCE_TYPES);

tests/Constraints/FactoryTest.php

@@ -12,7 +12,6 @@
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\JsonPointer;
-use PHPUnit\Framework\TestCase;
 
 /**
  * Class MyBadConstraint
@@ -35,14 +34,14 @@ public function check(&$value, $schema = null, JsonPointer $path = null, $i = nu
     }
 }
 
-class FactoryTest extends TestCase
+class FactoryTest extends VeryBaseTestCase
 {
     /**
      * @var Factory
      */
     protected $factory;
 
-    protected function setUp()
+    protected function doSetUp()
     {
         $this->factory = new Factory();
     }
@@ -85,7 +84,7 @@ public function constraintNameProvider()
      */
     public function testExceptionWhenCreateInstanceForInvalidConstraintName($constraintName)
     {
-        $this->setExpectedException('JsonSchema\Exception\InvalidArgumentException');
+        $this->expectExceptionCompat('JsonSchema\Exception\InvalidArgumentException');
         $this->factory->createInstanceFor($constraintName);
     }
 
@@ -96,19 +95,17 @@ public function invalidConstraintNameProvider()
         );
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\InvalidArgumentException
-     */
     public function testSetConstraintClassExistsCondition()
     {
+        $this->expectExceptionCompat('\JsonSchema\Exception\InvalidArgumentException');
+
         $this->factory->setConstraintClass('string', 'SomeConstraint');
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\InvalidArgumentException
-     */
     public function testSetConstraintClassImplementsCondition()
     {
+        $this->expectExceptionCompat('\JsonSchema\Exception\InvalidArgumentException');
+
         $this->factory->setConstraintClass('string', 'JsonSchema\Tests\Constraints\MyBadConstraint');
     }
 

tests/Constraints/FormatTest.php

@@ -17,7 +17,7 @@ class FormatTest extends BaseTestCase
 {
     protected $validateSchema = true;
 
-    public function setUp()
+    public function doSetUp()
     {
         date_default_timezone_set('UTC');
     }

tests/Constraints/MinLengthMaxLengthMultiByteTest.php

@@ -13,7 +13,7 @@ class MinLengthMaxLengthMultiByteTest extends BaseTestCase
 {
     protected $validateSchema = true;
 
-    protected function setUp()
+    protected function doSetUp()
     {
         if (!extension_loaded('mbstring')) {
             $this->markTestSkipped('mbstring extension is not available');

tests/Constraints/PointerTest.php

@@ -10,7 +10,7 @@
 namespace JsonSchema\Tests\Constraints;
 
 use JsonSchema\Validator;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class PointerTest extends TestCase
 {

tests/Constraints/SchemaValidationTest.php

@@ -11,9 +11,8 @@
 
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Validator;
-use PHPUnit\Framework\TestCase;
 
-class SchemaValidationTest extends TestCase
+class SchemaValidationTest extends VeryBaseTestCase
 {
     protected $validateSchema = true;
 
@@ -102,7 +101,7 @@ public function testValidCases($schema)
 
     public function testNonObjectSchema()
     {
-        $this->setExpectedException(
+        $this->expectExceptionCompat(
             '\JsonSchema\Exception\RuntimeException',
             'Cannot validate the schema of a non-object'
         );
@@ -111,7 +110,7 @@ public function testNonObjectSchema()
 
     public function testInvalidSchemaException()
     {
-        $this->setExpectedException(
+        $this->expectExceptionCompat(
             '\JsonSchema\Exception\InvalidSchemaException',
             'Schema did not pass validation'
         );

tests/Constraints/SelfDefinedSchemaTest.php

@@ -74,7 +74,7 @@ public function testInvalidArgumentException()
 
         $v = new Validator();
 
-        $this->setExpectedException('\JsonSchema\Exception\InvalidArgumentException');
+        $this->expectExceptionCompat('\JsonSchema\Exception\InvalidArgumentException');
 
         $v->validate($value, $schema);
     }

tests/Constraints/TypeTest.php

@@ -11,7 +11,6 @@
 
 use JsonSchema\Constraints\TypeCheck\LooseTypeCheck;
 use JsonSchema\Constraints\TypeConstraint;
-use PHPUnit\Framework\TestCase;
 
 /**
  * Class TypeTest
@@ -20,7 +19,7 @@
  *
  * @author hakre <https://github.com/hakre>
  */
-class TypeTest extends TestCase
+class TypeTest extends VeryBaseTestCase
 {
     /**
      * @see testIndefiniteArticleForTypeInTypeCheckErrorMessage
@@ -80,7 +79,7 @@ private function assertTypeConstraintError($expected, TypeConstraint $actual)
 
         $actualError = $actualErrors[0];
 
-        $this->assertInternalType('array', $actualError, sprintf('Failed to assert that Type error is an array, %s given', gettype($actualError)));
+        $this->assertIsArrayCompat($actualError, sprintf('Failed to assert that Type error is an array, %s given', gettype($actualError)));
 
         $messageKey = 'message';
         $this->assertArrayHasKey(
@@ -125,7 +124,7 @@ public function testInvalidateTypeNameWording()
         $m = $r->getMethod('validateTypeNameWording');
         $m->setAccessible(true);
 
-        $this->setExpectedException(
+        $this->expectExceptionCompat(
             '\UnexpectedValueException',
             "No wording for 'notAValidTypeName' available, expected wordings are: [an integer, a number, a boolean, an object, an array, a string, a null]"
         );
@@ -138,7 +137,7 @@ public function testValidateTypeException()
         $data = new \stdClass();
         $schema = json_decode('{"type": "notAValidTypeName"}');
 
-        $this->setExpectedException(
+        $this->expectExceptionCompat(
             'JsonSchema\Exception\InvalidArgumentException',
             'object is an invalid type for notAValidTypeName'
         );

tests/Constraints/ValidationExceptionTest.php

@@ -12,9 +12,8 @@
 use JsonSchema\Constraints\Constraint;
 use JsonSchema\Exception\ValidationException;
 use JsonSchema\Validator;
-use PHPUnit\Framework\TestCase;
 
-class ValidationExceptionTest extends TestCase
+class ValidationExceptionTest extends VeryBaseTestCase
 {
     public function testValidationException()
     {
@@ -45,7 +44,7 @@ public function testValidationException()
             $exception->getMessage()
         );
 
-        $this->setExpectedException('JsonSchema\Exception\ValidationException');
+        $this->expectExceptionCompat('JsonSchema\Exception\ValidationException');
         throw $exception;
     }
 }

tests/Constraints/VeryBaseTestCase.php

@@ -9,7 +9,7 @@
 
 namespace JsonSchema\Tests\Constraints;
 
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 use Prophecy\Argument;
 
 /**
@@ -87,4 +87,22 @@ private function getJsonSchemaDraft04()
 
         return $this->jsonSchemaDraft04;
     }
+
+    public function expectExceptionCompat($exception)
+    {
+        if (\is_callable(array('PHPUnit\Framework\TestCase', 'expectException'))) {
+            parent::expectException($exception);
+        } else {
+            $this->setExpectedException($exception);
+        }
+    }
+
+    public static function assertIsArrayCompat($actual, $message = '')
+    {
+        if (\is_callable(array('PHPUnit\Framework\TestCase', 'assertIsArray'))) {
+            parent::assertIsArray($actual, $message);
+        } else {
+            static::assertInternalType('array', $actual, $message);
+        }
+    }
 }

tests/Entity/JsonPointerTest.php

@@ -10,14 +10,14 @@
 namespace JsonSchema\Tests\Entity;
 
 use JsonSchema\Entity\JsonPointer;
-use PHPUnit\Framework\TestCase;
+use JsonSchema\Tests\Constraints\VeryBaseTestCase;
 
 /**
  * @package JsonSchema\Tests\Entity
  *
  * @author Joost Nijhuis <[email protected]>
  */
-class JsonPointerTest extends TestCase
+class JsonPointerTest extends VeryBaseTestCase
 {
     /**
      * @dataProvider getTestData
@@ -113,7 +113,7 @@ public function testJsonPointerWithPropertyPaths()
 
     public function testCreateWithInvalidValue()
     {
-        $this->setExpectedException(
+        $this->expectExceptionCompat(
             '\JsonSchema\Exception\InvalidArgumentException',
             'Ref value must be a string'
         );

tests/Exception/InvalidArgumentExceptionTest.php

@@ -3,7 +3,7 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\InvalidArgumentException;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class InvalidArgumentExceptionTest extends TestCase
 {

tests/Exception/InvalidSchemaMediaTypeExceptionTest.php

@@ -3,7 +3,7 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\InvalidSchemaMediaTypeException;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class InvalidSchemaMediaTypeExceptionTest extends TestCase
 {

tests/Exception/InvalidSourceUriExceptionTest.php

@@ -3,7 +3,7 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\InvalidSourceUriException;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class InvalidSourceUriExceptionTest extends TestCase
 {

tests/Exception/JsonDecodingExceptionTest.php

@@ -3,7 +3,7 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\JsonDecodingException;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class JsonDecodingExceptionTest extends TestCase
 {

tests/Exception/ResourceNotFoundExceptionTest.php

@@ -3,7 +3,7 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\ResourceNotFoundException;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class ResourceNotFoundExceptionTest extends TestCase
 {

tests/Exception/RuntimeExceptionTest.php

@@ -3,7 +3,7 @@
 namespace JsonSchema\Tests\Exception;
 
 use JsonSchema\Exception\RuntimeException;
-use PHPUnit\Framework\TestCase;
+use LegacyPHPUnit\TestCase;
 
 class RuntimeExceptionTest extends TestCase
 {