Merge branch '2020'

# Conflicts:
#	.gitattributes
#	.github/workflows/tests.yml
#	.gitignore
#	composer.json
#	src/ValidatorHelper.php

Author: sorinsarca

.gitattributes

@@ -1,4 +1,5 @@
 tests/          export-ignore
 phpunit.xml     export-ignore
 .gitattributes  export-ignore
-.gitignore      export-ignore
+.gitignore      export-ignore
+.github         export-ignore

.github/workflows/tests.yml

@@ -12,33 +12,24 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
-        stability: [prefer-stable]
+        php: [7.4, 8.0]
 
     name: PHP ${{ matrix.php }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Cache dependencies
-        uses: actions/cache@v1
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, json, mbstring, intl
+          extensions: bcmath, json, intl
+          tools: composer:v2
           coverage: none
 
-      - name: Update composer
-        run: composer self-update
-
       - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+        run: composer update --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose

.gitignore

@@ -4,4 +4,5 @@ _site/
 shared/
 Gemfile.lock
 composer.lock
-.phpunit.result.cache
+.phpunit.result.cache
+test.php

NOTICE

@@ -1,5 +1,5 @@
 Opis Json Schema
-Copyright 2018 Zindex Software
+Copyright 2018-2021 Zindex Software
 
 This product includes software developed at
 Zindex Software (http://zindex.software).

README.md

@@ -8,25 +8,22 @@ Opis JSON Schema
 Validate JSON documents
 -----------
 
-**Opis JSON Schema** is a PHP implementation for the [JSON Schema] standard (draft-07 and draft-06), that
+**Opis JSON Schema** is a PHP implementation for the [JSON Schema] standard (draft-2020-12, draft-2019-09, draft-07 and draft-06), that
 will help you validate all sorts of JSON documents, whether they are configuration files or a set 
 of data sent to a RESTful API endpoint.
 
 
 **The library's key features:**
 
-- Fast validation (you can set maximum number of errors for a validation)
-- Custom schema document [loaders](https://docs.opis.io/json-schema/1.x/php-loader.html)
-- Support for [if-then-else](https://docs.opis.io/json-schema/1.x/conditional-subschemas.html#if-then-else)
-- All [string formats](https://docs.opis.io/json-schema/1.x/formats.html#provided-formats) are supported
-- Support for custom [formats](https://docs.opis.io/json-schema/1.x/php-format.html)
-- Support for custom [media types](https://docs.opis.io/json-schema/1.x/php-media-type.html)
-- Support for [default value](https://docs.opis.io/json-schema/1.x/default-value.html)
-- Support for custom variables using [`$vars` keyword](https://docs.opis.io/json-schema/1.x/variables.html)
-- Support for custom filters using [`$filters` keyword](https://docs.opis.io/json-schema/1.x/filters.html)
-- Advanced schema reuse using [`$map` keyword](https://docs.opis.io/json-schema/1.x/mappers.html)
-- Support for [json pointers](https://docs.opis.io/json-schema/1.x/pointers.html) (absolute and relative pointers)
-- Support for [URI templates](https://docs.opis.io/json-schema/1.x/uri-template.html)
+- Supports all keywords from all drafts (draft-2020-12 down to draft-06)
+- Support for custom PHP filters using [`$filters` keyword](https://docs.opis.io/json-schema/2.x/filters.html)
+- Advanced schema reuse using [`$map` keyword](https://docs.opis.io/json-schema/2.x/mappers.html)
+- Intuitive schema composition using [slots](https://docs.opis.io/json-schema/2.x/slots.html)
+- Support for absolute & relative [json pointers](https://docs.opis.io/json-schema/2.x/pointers.html)
+- Support for [URI templates](https://docs.opis.io/json-schema/2.x/uri-template.html)
+- Support for [`$data` keyword](https://docs.opis.io/json-schema/2.x/data-keyword.html)
+- Support for [casting](https://docs.opis.io/json-schema/2.x/pragma.html#cast)
+- Support for custom [formats](https://docs.opis.io/json-schema/2.x/php-format.html) and [media types](https://docs.opis.io/json-schema/2.x/php-media-type.html)
 
 ### Documentation
 
@@ -40,7 +37,7 @@ the library's own API.
 
 ### Requirements
 
-* PHP ^7.0
+* PHP ^7.4 || ^8.0
 
 ## Installation
 
@@ -56,12 +53,12 @@ Or you could directly reference it into your `composer.json` file as a dependenc
 ```json
 {
     "require": {
-        "opis/json-schema": "^1.0"
+        "opis/json-schema": "^2.0"
     }
 }
 ```
 
-[documentation]: https://docs.opis.io/json-schema
+[documentation]: https://opis.io/json-schema
 [apache_license]: https://www.apache.org/licenses/LICENSE-2.0 "Apache License"
 [Packagist]: https://packagist.org/packages/opis/json-schema "Packagist"
 [Composer]: https://getcomposer.org "Composer"

autoload.php

@@ -1,22 +1,19 @@
 <?php
 
-spl_autoload_register(function($class){
+spl_autoload_register(function ($class) {
     $class = ltrim($class, '\\');
     $dir = __DIR__ . '/src';
     $namespace = 'Opis\JsonSchema';
-    if(strpos($class, $namespace) === 0)
-    {
+    if (strpos($class, $namespace) === 0) {
         $class = substr($class, strlen($namespace));
         $path = '';
-        if(($pos = strripos($class, '\\')) !== FALSE)
-        {
+        if (($pos = strripos($class, '\\')) !== false) {
             $path = str_replace('\\', '/', substr($class, 0, $pos)) . '/';
             $class = substr($class, $pos + 1);
         }
         $path .= str_replace('_', '/', $class) . '.php';
         $dir .= '/' . $path;
-        if(file_exists($dir))
-        {
+        if (is_file($dir)) {
             include $dir;
             return true;
         }

composer.json

@@ -1,13 +1,14 @@
 {
     "name": "opis/json-schema",
-    "description": "Json Schema Validator",
+    "description": "Json Schema Validator for PHP",
     "keywords": [
         "json",
         "schema",
+        "json-schema",
         "validation",
         "validator"
     ],
-    "homepage": "http://www.opis.io/json-schema",
+    "homepage": "https://opis.io/json-schema",
     "license": "Apache-2.0",
     "authors": [
         {
@@ -20,18 +21,15 @@
         }
     ],
     "require": {
-        "php": ">=7.0"
+        "php": "^7.4 || ^8.0",
+        "ext-json": "*",
+        "opis/string": "^2.0",
+        "opis/uri": "^1.0"
     },
     "require-dev": {
-        "opis/string": "^1.4",
         "ext-bcmath": "*",
-        "ext-json": "*",
-        "ext-mbstring": "*",
         "ext-intl": "*",
-        "phpunit/phpunit": "^6.5 || ^7.0 || ^9.4"
-    },
-    "suggest": {
-        "opis/string": "A standalone library for manipulating multibyte strings"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -41,12 +39,11 @@
     "autoload-dev": {
         "psr-4": {
             "Opis\\JsonSchema\\Test\\": "tests/"
-        },
-        "files": ["tests/functions.php"]
+        }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }

phpunit.xml

@@ -2,14 +2,29 @@
     <testsuites>
         <testsuite name="Schema">
             <file>./tests/BasicTest.php</file>
+            <file>./tests/BooleanTypeTest.php</file>
+            <file>./tests/NullTypeTest.php</file>
+            <file>./tests/IntegerTypeTest.php</file>
+            <file>./tests/NumberTypeTest.php</file>
+            <file>./tests/StringTypeTest.php</file>
+            <file>./tests/ArrayTypeTest.php</file>
+            <file>./tests/ObjectTypeTest.php</file>
+            <file>./tests/MultipleTypesTest.php</file>
             <file>./tests/RefTest.php</file>
-            <file>./tests/TypesTest.php</file>
-            <file>./tests/FilterTest.php</file>
-            <file>./tests/MapTest.php</file>
+            <file>./tests/MapperTest.php</file>
+            <file>./tests/SlotTest.php</file>
+            <file>./tests/FiltersTest.php</file>
+            <file>./tests/DataTest.php</file>
+            <file>./tests/PragmaTest.php</file>
+        </testsuite>
+        <testsuite name="Errors">
+            <file>./tests/ErrorFormatterTest.php</file>
         </testsuite>
         <testsuite name="Official">
-            <file>./tests/OfficialDraft7.php</file>
-            <file>./tests/OfficialDraft6.php</file>
+            <file>./tests/OfficialDraft6Test.php</file>
+            <file>./tests/OfficialDraft7Test.php</file>
+            <file>./tests/OfficialDraft201909Test.php</file>
+            <file>./tests/OfficialDraft202012Test.php</file>
         </testsuite>
     </testsuites>
 </phpunit>

src/IFormatContainer.php renamed to src/ContentEncoding.php

@@ -1,6 +1,6 @@
 <?php
-/* ===========================================================================
- * Copyright 2018 Zindex Software
+/* ============================================================================
+ * Copyright 2020 Zindex Software
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 
 namespace Opis\JsonSchema;
 
-interface IFormatContainer
+interface ContentEncoding
 {
     /**
+     * @param string $value
      * @param string $type
-     * @param string $name
-     * @return IFormat|null
+     * @return null|string
      */
-    public function get(string $type, string $name);
+    public function decode(string $value, string $type): ?string;
 }

src/IFilter.php renamed to src/ContentMediaType.php

@@ -1,6 +1,6 @@
 <?php
-/* ===========================================================================
- * Copyright 2018 Zindex Software
+/* ============================================================================
+ * Copyright 2020 Zindex Software
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 
 namespace Opis\JsonSchema;
 
-interface IFilter
+interface ContentMediaType
 {
     /**
-     * @param $data
-     * @param array $args
+     * @param string $content
+     * @param string $media_type
      * @return bool
      */
-    public function validate($data, array $args): bool;
+    public function validate(string $content, string $media_type): bool;
 }