Extend pipeline for newer versions php (#746)

* ci: Add PHP 8.0 and greater to build matrix

* ci: Remove PHP 5.3 - 7.1 from workflows

* build: Require minimum PHP 7.2

* build: Upgrade to PHPUnit 8.5

* refactor: Add now required void return types for setup() methods

* build: Include phpspec/prophecy dependency

* refactor: Replace setExpectedException with expectException/expectExceptionMessage

* refactor: Replace @ExpectedException annotation for expectException method

* refactor: Replace assertInternalType for assertIsArray

* refactor: Replace getMock for createMock

* test: Improve test assertions

* fix: Solve return type issues with Objectiterator (port of #682)

See #682

* build: Update icecave/parity to ^3.0 as 1.0 uses deprecated each() method

* style: Correct code style issues

* fix: Fix deprecation notices found from GHA workflow run

See https://github.com/jsonrainbow/json-schema/actions/runs/10216569969/job/28268331091

* fix: Add fallback to empty string when null value is passed in UriResolver::parse

* fix: Port #717: Fixes for implicit nullability deprecation

See #717

* ci: Avoid GHA run on each push and pull request; Include PHP 8.4 in matrix

* ci(Drop-PHP-8.4-from-matrix): This PR adds phpspec/prophecy as an explicit dependency which is restrictive and doesnt support upcoming PHP versions

* refactor: Replace ternary variable with explicit cast to string

.github/workflows/continuous-integration.yml

@@ -1,8 +1,12 @@
 name: "Continuous Integration"
 
 on:
- - push
- - pull_request
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
 
 env:
  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
@@ -17,23 +21,20 @@ jobs:
  strategy:
  matrix:
  php-version:
- - "5.3"
- - "5.4"
- - "5.5"
- - "5.6"
- - "7.0"
- - "7.1"
  - "7.2"
  - "7.3"
  - "7.4"
-# - "8.0"
+ - "8.0"
+ - "8.1"
+ - "8.2"
+ - "8.3"
  dependencies: [highest]
  experimental: [false]
  include:
- - php-version: "5.3"
+ - php-version: "7.2"
  dependencies: highest
  experimental: false
- - php-version: "5.3"
+ - php-version: "7.2"
  dependencies: lowest
  experimental: false
 # - php-version: "8.0"

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
  strategy:
  matrix:
  php-version:
- - "5.3"
+ - "7.2"
  - "latest"
 
  steps:

composer.json

@@ -27,14 +27,15 @@
  }
  ],
  "require": {
- "php": ">=5.3.3",
+ "php": "^7.2 || ^8.0",
  "marc-mabe/php-enum":"^2.0 || ^3.0 || ^4.0",
- "icecave/parity": "1.0.0"
+ "icecave/parity": "^3.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": "^8.5",
+ "phpspec/prophecy": "^1.19"
  },
  "extra": {
  "branch-alias": {

phpunit.xml.dist

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ backupGlobals="false"
  backupStaticAttributes="false"
  colors="true"
  convertErrorsToExceptions="true"
  convertNoticesToExceptions="true"
  convertWarningsToExceptions="true"
  processIsolation="false"
  stopOnFailure="false"
- syntaxCheck="false"
  bootstrap="vendor/autoload.php"
  verbose="true"
 >

src/JsonSchema/Constraints/BaseConstraint.php

@@ -39,12 +39,12 @@ class BaseConstraint
  /**
  * @param Factory $factory
  */
- public function __construct(Factory $factory = null)
+ public function __construct(?Factory $factory = null)
  {
  $this->factory = $factory ?: new Factory();
  }
 
- public function addError(ConstraintError $constraint, JsonPointer $path = null, array $more = array())
+ public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = array())
  {
  $message = $constraint ? $constraint->getMessage() : '';
  $name = $constraint ? $constraint->getValue() : '';

src/JsonSchema/Constraints/CollectionConstraint.php

@@ -23,7 +23,7 @@ class CollectionConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$value, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  // Verify minItems
  if (isset($schema->minItems) && count($value) < $schema->minItems) {
@@ -62,7 +62,7 @@ public function check(&$value, $schema = null, JsonPointer $path = null, $i = nu
  * @param JsonPointer|null $path
  * @param string $i
  */
- protected function validateItems(&$value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function validateItems(&$value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  if (is_object($schema->items)) {
  // just one type definition for the whole array

src/JsonSchema/Constraints/ConstConstraint.php

@@ -23,7 +23,7 @@ class ConstConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  // Only validate const if the attribute exists
  if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {

src/JsonSchema/Constraints/Constraint.php

@@ -40,7 +40,7 @@ abstract class Constraint extends BaseConstraint implements ConstraintInterface
  *
  * @return JsonPointer;
  */
- protected function incrementPath(JsonPointer $path = null, $i)
+ protected function incrementPath(?JsonPointer $path = null, $i)
  {
  $path = $path ?: new JsonPointer('');
 
@@ -66,7 +66,7 @@ protected function incrementPath(JsonPointer $path = null, $i)
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkArray(&$value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkArray(&$value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('collection');
  $validator->check($value, $schema, $path, $i);
@@ -84,7 +84,7 @@ protected function checkArray(&$value, $schema = null, JsonPointer $path = null,
  * @param mixed $additionalProperties
  * @param mixed $patternProperties
  */
- protected function checkObject(&$value, $schema = null, JsonPointer $path = null, $properties = null,
+ protected function checkObject(&$value, $schema = null, ?JsonPointer $path = null, $properties = null,
  $additionalProperties = null, $patternProperties = null, $appliedDefaults = array())
  {
  /** @var ObjectConstraint $validator */
@@ -102,7 +102,7 @@ protected function checkObject(&$value, $schema = null, JsonPointer $path = null
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkType(&$value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkType(&$value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('type');
  $validator->check($value, $schema, $path, $i);
@@ -118,7 +118,7 @@ protected function checkType(&$value, $schema = null, JsonPointer $path = null,
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkUndefined(&$value, $schema = null, JsonPointer $path = null, $i = null, $fromDefault = false)
+ protected function checkUndefined(&$value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false)
  {
  /** @var UndefinedConstraint $validator */
  $validator = $this->factory->createInstanceFor('undefined');
@@ -136,7 +136,7 @@ protected function checkUndefined(&$value, $schema = null, JsonPointer $path = n
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkString($value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkString($value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('string');
  $validator->check($value, $schema, $path, $i);
@@ -147,12 +147,12 @@ protected function checkString($value, $schema = null, JsonPointer $path = null,
  /**
  * Checks a number element
  *
- * @param mixed $value
- * @param mixed $schema
- * @param JsonPointer $path
- * @param mixed $i
+ * @param mixed  $value
+ * @param mixed  $schema
+ * @param JsonPointer|null $path
+ * @param mixed  $i
  */
- protected function checkNumber($value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkNumber($value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('number');
  $validator->check($value, $schema, $path, $i);
@@ -168,7 +168,7 @@ protected function checkNumber($value, $schema = null, JsonPointer $path = null,
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkEnum($value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkEnum($value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('enum');
  $validator->check($value, $schema, $path, $i);
@@ -184,7 +184,7 @@ protected function checkEnum($value, $schema = null, JsonPointer $path = null, $
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkConst($value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkConst($value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('const');
  $validator->check($value, $schema, $path, $i);
@@ -200,7 +200,7 @@ protected function checkConst($value, $schema = null, JsonPointer $path = null,
  * @param JsonPointer|null $path
  * @param mixed $i
  */
- protected function checkFormat($value, $schema = null, JsonPointer $path = null, $i = null)
+ protected function checkFormat($value, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $validator = $this->factory->createInstanceFor('format');
  $validator->check($value, $schema, $path, $i);

src/JsonSchema/Constraints/ConstraintInterface.php

@@ -40,7 +40,7 @@ public function addErrors(array $errors);
  * @param JsonPointer|null $path
  * @param array $more more array elements to add to the error
  */
- public function addError(ConstraintError $constraint, JsonPointer $path = null, array $more = array());
+ public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = array());
 
  /**
  * checks if the validator has not raised errors
@@ -61,5 +61,5 @@ public function isValid();
  *
  * @throws \JsonSchema\Exception\ExceptionInterface
  */
- public function check(&$value, $schema = null, JsonPointer $path = null, $i = null);
+ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null);
 }

src/JsonSchema/Constraints/EnumConstraint.php

@@ -24,7 +24,7 @@ class EnumConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  // Only validate enum if the attribute exists
  if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {

src/JsonSchema/Constraints/Factory.php

@@ -70,13 +70,13 @@ class Factory
  private $instanceCache = array();
 
  /**
- * @param SchemaStorage $schemaStorage
- * @param UriRetrieverInterface $uriRetriever
- * @param int $checkMode
+ * @param ?SchemaStorage $schemaStorage
+ * @param ?UriRetrieverInterface $uriRetriever
+ * @param int  $checkMode
  */
  public function __construct(
- SchemaStorageInterface $schemaStorage = null,
- UriRetrieverInterface $uriRetriever = null,
+ ?SchemaStorageInterface $schemaStorage = null,
+ ?UriRetrieverInterface $uriRetriever = null,
  $checkMode = Constraint::CHECK_MODE_NORMAL
  ) {
  // set provided config options

src/JsonSchema/Constraints/FormatConstraint.php

@@ -25,7 +25,7 @@ class FormatConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  if (!isset($schema->format) || $this->factory->getConfig(self::CHECK_MODE_DISABLE_FORMAT)) {
  return;

src/JsonSchema/Constraints/NumberConstraint.php

@@ -23,7 +23,7 @@ class NumberConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  // Verify minimum
  if (isset($schema->exclusiveMinimum)) {

src/JsonSchema/Constraints/ObjectConstraint.php

@@ -28,7 +28,7 @@ class ObjectConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $properties = null,
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $properties = null,
  $additionalProp = null, $patternProperties = null, $appliedDefaults = array())
  {
  if ($element instanceof UndefinedConstraint) {
@@ -52,7 +52,7 @@ public function check(&$element, $schema = null, JsonPointer $path = null, $prop
  $this->validateElement($element, $matches, $schema, $path, $properties, $additionalProp);
  }
 
- public function validatePatternProperties($element, JsonPointer $path = null, $patternProperties)
+ public function validatePatternProperties($element, ?JsonPointer $path = null, $patternProperties)
  {
  $matches = array();
  foreach ($patternProperties as $pregex => $schema) {
@@ -84,7 +84,7 @@ public function validatePatternProperties($element, JsonPointer $path = null, $p
  * @param \StdClass $properties Properties
  * @param mixed $additionalProp Additional properties
  */
- public function validateElement($element, $matches, $schema = null, JsonPointer $path = null,
+ public function validateElement($element, $matches, $schema = null, ?JsonPointer $path = null,
  $properties = null, $additionalProp = null)
  {
  $this->validateMinMaxConstraint($element, $schema, $path);
@@ -129,7 +129,7 @@ public function validateElement($element, $matches, $schema = null, JsonPointer
  * @param \stdClass $properties Property definitions
  * @param JsonPointer|null $path Path?
  */
- public function validateProperties(&$element, $properties = null, JsonPointer $path = null)
+ public function validateProperties(&$element, $properties = null, ?JsonPointer $path = null)
  {
  $undefinedConstraint = $this->factory->createInstanceFor('undefined');
 
@@ -171,7 +171,7 @@ protected function &getProperty(&$element, $property, $fallback = null)
  * @param \stdClass $objectDefinition ObjectConstraint definition
  * @param JsonPointer|null $path Path to test?
  */
- protected function validateMinMaxConstraint($element, $objectDefinition, JsonPointer $path = null)
+ protected function validateMinMaxConstraint($element, $objectDefinition, ?JsonPointer $path = null)
  {
  // Verify minimum number of properties
  if (isset($objectDefinition->minProperties) && !is_object($objectDefinition->minProperties)) {

src/JsonSchema/Constraints/SchemaConstraint.php

@@ -29,7 +29,7 @@ class SchemaConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  if ($schema !== null) {
  // passed schema

src/JsonSchema/Constraints/StringConstraint.php

@@ -23,7 +23,7 @@ class StringConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$element, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  // Verify maxLength
  if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {

src/JsonSchema/Constraints/TypeConstraint.php

@@ -40,7 +40,7 @@ class TypeConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$value = null, $schema = null, JsonPointer $path = null, $i = null)
+ public function check(&$value = null, $schema = null, ?JsonPointer $path = null, $i = null)
  {
  $type = isset($schema->type) ? $schema->type : null;
  $isValid = false;

src/JsonSchema/Constraints/UndefinedConstraint.php

@@ -32,7 +32,7 @@ class UndefinedConstraint extends Constraint
  /**
  * {@inheritdoc}
  */
- public function check(&$value, $schema = null, JsonPointer $path = null, $i = null, $fromDefault = false)
+ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false)
  {
  if (is_null($schema) || !is_object($schema)) {
  return;

src/JsonSchema/Exception/JsonDecodingException.php

@@ -14,7 +14,7 @@
  */
 class JsonDecodingException extends RuntimeException
 {
- public function __construct($code = JSON_ERROR_NONE, \Exception $previous = null)
+ public function __construct($code = JSON_ERROR_NONE, ?\Exception $previous = null)
  {
  switch ($code) {
  case JSON_ERROR_DEPTH: