add PHP8 support

Author: samijnih

.travis.yml

@@ -12,23 +12,22 @@ cache:
 
 matrix:
   include:
-    - php: 5.3
-    - php: 5.4
-    - php: 5.5
-    - php: 5.6
-    - php: hhvm
-    - php: nightly
-    - php: 7.0
+    - php: 7.3
       env: COVERAGE=yes
-    - php: 7.0
+    - php: 7.3
+      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
+    - php: 7.4
+      env: COVERAGE=yes
+    - php: 7.4
+      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
+    - php: 8.0
+      env: COVERAGE=yes
+    - php: 8.0
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
-  allow_failures:
-    - php: hhvm
-    - php: nightly
   fast_finish: true
 
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION != hhvm && $COVERAGE != yes ]]; then phpenv config-rm xdebug.ini; fi;
+  - if [[ $COVERAGE != yes ]]; then phpenv config-rm xdebug.ini; fi;
   - if [[ $TRAVIS_REPO_SLUG = webmozart/json ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
   - composer self-update
 

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+* 2.0.0 (@release_date@)
+
+ * dropped support for PHP ^5.2
+ * dropped support for PHP 7.0
+ * dropped support for PHP 7.1
+ * dropped support for PHP 7.2
+ * upgraded dependencies
+ * added PHP 8 compatibility
+
 * 1.3.0 (@release_date@)
 
  * added `JsonConverter` and `ConversionException`

README.md

@@ -6,9 +6,9 @@ Webmozart JSON
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/webmozart/json/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/webmozart/json/?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/webmozart/json/v/stable.svg)](https://packagist.org/packages/webmozart/json)
 [![Total Downloads](https://poser.pugx.org/webmozart/json/downloads.svg)](https://packagist.org/packages/webmozart/json)
-[![Dependency Status](https://www.versioneye.com/php/webmozart:json/1.2.2/badge.svg)](https://www.versioneye.com/php/webmozart:json/1.2.2)
+[![Dependency Status](https://www.versioneye.com/php/webmozart:json/2.0.0/badge.svg)](https://www.versioneye.com/php/webmozart:json/2.0.0)
 
-Latest release: [1.2.2](https://packagist.org/packages/webmozart/json#1.2.2)
+Latest release: [2.0.0](https://packagist.org/packages/webmozart/json#2.0.0)
 
 A robust wrapper for `json_encode()`/`json_decode()` that normalizes their
 behavior across PHP versions, throws meaningful exceptions and supports schema

composer.json

@@ -9,16 +9,17 @@
         }
     ],
     "require": {
-        "php": "^5.3.3|^7.0",
-        "justinrainbow/json-schema": "^2.0",
-        "seld/jsonlint": "^1.0",
-        "webmozart/assert": "^1.0",
-        "webmozart/path-util": "^2.3"
+        "php": ">=7.3",
+        "justinrainbow/json-schema": "^5.2",
+        "seld/jsonlint": "^1.8",
+        "webmozart/assert": "^1.9",
+        "webmozart/path-util": "^2.3",
+        "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.6",
-        "sebastian/version": "^1.0.1",
-        "symfony/filesystem": "^2.5"
+        "phpunit/phpunit": "^9.5",
+        "sebastian/version": "^3.0.2",
+        "symfony/filesystem": "^5.2"
     },
     "autoload": {
         "psr-4": {

src/InvalidSchemaException.php

@@ -11,6 +11,7 @@
 
 namespace Webmozart\Json;
 
+use JsonSchema\Validator;
 use Seld\JsonLint\JsonParser;
 use Seld\JsonLint\ParsingException;
 
@@ -44,7 +45,7 @@ class JsonDecoder
     const STRING = 3;
 
     /**
-     * @var JsonValidator
+     * @var Validator
      */
     private $validator;
 
@@ -66,11 +67,11 @@ class JsonDecoder
     /**
      * Creates a new decoder.
      *
-     * @param null|JsonValidator $validator
+     * @param null|Validator $validator
      */
-    public function __construct(JsonValidator $validator = null)
+    public function __construct(Validator $validator = null)
     {
-        $this->validator = $validator ?: new JsonValidator();
+        $this->validator = $validator ?? new Validator();
     }
 
     /**
@@ -94,7 +95,6 @@ public function __construct(JsonValidator $validator = null)
      * @throws DecodingFailedException   If the JSON string could not be decoded
      * @throws ValidationFailedException If the decoded string fails schema
      *                                   validation
-     * @throws InvalidSchemaException    If the schema is invalid
      */
     public function decode($json, $schema = null)
     {
@@ -109,7 +109,8 @@ public function decode($json, $schema = null)
         $decoded = $this->decodeJson($json);
 
         if (null !== $schema) {
-            $errors = $this->validator->validate($decoded, $schema);
+            $this->validator->validate($decoded, $schema);
+            $errors = $this->validator->getErrors();
 
             if (count($errors) > 0) {
                 throw ValidationFailedException::fromErrors($errors);
@@ -131,7 +132,6 @@ public function decode($json, $schema = null)
      * @throws DecodingFailedException   If the file could not be decoded
      * @throws ValidationFailedException If the decoded file fails schema
      *                                   validation
-     * @throws InvalidSchemaException    If the schema is invalid
      *
      * @see decode
      */
@@ -170,6 +170,10 @@ public function decodeFile($path, $schema = null)
             ), $errorCode);
         }
 
+        if (false === $content) {
+            throw new IOException(sprintf('Could not read %s', $path));
+        }
+
         try {
             return $this->decode($content, $schema);
         } catch (DecodingFailedException $e) {
@@ -186,13 +190,6 @@ public function decodeFile($path, $schema = null)
                 $path,
                 $e->getErrorsAsString()
             ), $e->getErrors(), $e->getCode(), $e);
-        } catch (InvalidSchemaException $e) {
-            // Add the file name to the exception
-            throw new InvalidSchemaException(sprintf(
-                'An error happened while decoding %s: %s',
-                $path,
-                $e->getMessage()
-            ), $e->getCode(), $e);
         }
     }
 

src/JsonDecoder.php

@@ -11,6 +11,8 @@
 
 namespace Webmozart\Json;
 
+use JsonSchema\Validator;
+
 /**
  * Encodes data as JSON.
  *
@@ -41,7 +43,7 @@ class JsonEncoder
     const JSON_NUMBER = 4;
 
     /**
-     * @var JsonValidator
+     * @var Validator
      */
     private $validator;
 
@@ -103,11 +105,11 @@ class JsonEncoder
     /**
      * Creates a new encoder.
      *
-     * @param null|JsonValidator $validator
+     * @param null|Validator $validator
      */
-    public function __construct(JsonValidator $validator = null)
+    public function __construct(Validator $validator = null)
     {
-        $this->validator = $validator ?: new JsonValidator();
+        $this->validator = $validator ?? new Validator();
     }
 
     /**
@@ -126,12 +128,12 @@ public function __construct(JsonValidator $validator = null)
      *
      * @throws EncodingFailedException   If the data could not be encoded
      * @throws ValidationFailedException If the data fails schema validation
-     * @throws InvalidSchemaException    If the schema is invalid
      */
     public function encode($data, $schema = null)
     {
         if (null !== $schema) {
-            $errors = $this->validator->validate($data, $schema);
+            $this->validator->validate($data, $schema);
+            $errors = $this->validator->getErrors();
 
             if (count($errors) > 0) {
                 throw ValidationFailedException::fromErrors($errors);
@@ -178,21 +180,6 @@ public function encode($data, $schema = null)
             }
         }
 
-        if (PHP_VERSION_ID < 71000) {
-            // PHP before 7.1 decodes empty properties as "_empty_". Make
-            // sure the encoding of these properties works again.
-            if (is_object($data) && isset($data->{'_empty_'})) {
-                $data = (array) $data;
-            }
-
-            if (is_array($data) && isset($data['_empty_'])) {
-                // Maintain key order
-                $keys = array_keys($data);
-                $keys[array_search('_empty_', $keys, true)] = '';
-                $data = array_combine($keys, $data);
-            }
-        }
-
         if (PHP_VERSION_ID >= 50500) {
             $maxDepth = $this->maxDepth;
 
@@ -210,12 +197,6 @@ public function encode($data, $schema = null)
             $encoded = json_encode($data, $options);
         }
 
-        if (PHP_VERSION_ID < 50400 && !$this->slashEscaped) {
-            // PHP below 5.4 does not allow to turn off slash escaping. Let's
-            // unescape slashes manually.
-            $encoded = str_replace('\\/', '/', $encoded);
-        }
-
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new EncodingFailedException(sprintf(
                 'The data could not be encoded as JSON: %s',
@@ -239,7 +220,6 @@ public function encode($data, $schema = null)
      *
      * @throws EncodingFailedException   If the data could not be encoded
      * @throws ValidationFailedException If the data fails schema validation
-     * @throws InvalidSchemaException    If the schema is invalid
      *
      * @see encode
      */
@@ -268,13 +248,6 @@ public function encodeFile($data, $path, $schema = null)
                 $path,
                 $e->getErrorsAsString()
             ), $e->getErrors(), $e->getCode(), $e);
-        } catch (InvalidSchemaException $e) {
-            // Add the file name to the exception
-            throw new InvalidSchemaException(sprintf(
-                'An error happened while encoding %s: %s',
-                $path,
-                $e->getMessage()
-            ), $e->getCode(), $e);
         }
 
         $errorMessage = null;