Backport CI changes to 5.x.x branch

.github/workflows/code-cov.yml

@@ -0,0 +1,33 @@
+name: "Code Coverage"
+
+on:
+  - push
+  - pull_request
+
+env:
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
+
+jobs:
+  tests:
+    name: "Code Coverage"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          extensions: "intl, zip"
+          ini-values: "memory_limit=-1, phar.readonly=0, error_reporting=E_ALL, display_errors=On"
+          php-version: "7.4"
+          tools: composer
+          coverage: xdebug2
+
+      - name: "Update dependencies"
+        run: "composer update ${{ env.COMPOSER_FLAGS }}"
+
+      - name: "Run coverage"
+        run: "composer coverage"

.github/workflows/continuous-integration.yml

@@ -0,0 +1,79 @@
+name: "Continuous Integration"
+
+on:
+  - push
+  - pull_request
+
+env:
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
+
+jobs:
+  tests:
+    name: "CI"
+
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+
+    strategy:
+      matrix:
+        php-version:
+          - "5.3"
+          - "5.4"
+          - "5.5"
+          - "5.6"
+          - "7.0"
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+#          - "8.0"
+        dependencies: [highest]
+        experimental: [false]
+        include:
+          - php-version: "5.3"
+            dependencies: highest
+            experimental: false
+          - 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
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          extensions: "intl, zip"
+          ini-values: "memory_limit=-1, phar.readonly=0, error_reporting=E_ALL, display_errors=On"
+          php-version: "${{ matrix.php-version }}"
+          tools: composer
+
+      - name: "Handle lowest dependencies update"
+        if: "contains(matrix.dependencies, 'lowest')"
+        run: "echo \"COMPOSER_UPDATE_FLAGS=$COMPOSER_UPDATE_FLAGS --prefer-lowest\" >> $GITHUB_ENV"
+
+      - name: "Handle ignore-platform-reqs dependencies update"
+        if: "contains(matrix.dependencies, 'ignore')"
+        run: "echo \"COMPOSER_FLAGS=$COMPOSER_FLAGS --ignore-platform-req=php\" >> $GITHUB_ENV"
+
+      - name: "Update dependencies"
+        run: "composer update ${{ env.COMPOSER_UPDATE_FLAGS }} ${{ env.COMPOSER_FLAGS }}"
+
+      - name: "Validate composer.json"
+        run: "composer validate"
+
+      - name: "Run tests"
+        run: "composer test"
+
+

.github/workflows/phpstan.yml

@@ -0,0 +1,34 @@
+name: "PHPStan"
+
+on:
+  - push
+  - pull_request
+
+env:
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
+
+jobs:
+  tests:
+    name: "PHPStan"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          extensions: "intl, zip"
+          ini-values: "memory_limit=-1"
+          php-version: "7.4"
+
+      - name: "Update dependencies"
+        run: "composer update ${{ env.COMPOSER_FLAGS }}"
+
+      - name: Run PHPStan
+        run: |
+          composer require --dev phpstan/phpstan:^0.12.93 marc-mabe/php-enum-phpstan ${{ env.COMPOSER_FLAGS }}
+          vendor/bin/phpstan analyse

.github/workflows/style-check.yml

@@ -0,0 +1,33 @@
+name: "Style Check"
+
+on:
+  - push
+  - pull_request
+
+env:
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
+
+jobs:
+  tests:
+    name: "Style Check"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          extensions: "intl, zip"
+          ini-values: "memory_limit=-1, phar.readonly=0, error_reporting=E_ALL, display_errors=On"
+          php-version: "7.4"
+          tools: composer
+
+      - name: "Update dependencies"
+        run: "composer update ${{ env.COMPOSER_FLAGS }}"
+
+      - name: "Run style-check"
+        run: "composer style-check"

.php_cs.dist → .php-cs-fixer.dist.php

@@ -20,10 +20,10 @@
         'phpdoc_no_package' => false,
         'phpdoc_order' => true,
         'phpdoc_summary' => false,
-        'pre_increment' => false,
         'increment_style' => false,
         'simplified_null_return' => false,
-        'trailing_comma_in_multiline_array' => false,
+        'single_line_throw' => false,
+        'trailing_comma_in_multiline' => false,
         'yoda_style' => false,
         'phpdoc_types_order' => array('null_adjustment' => 'none', 'sort_algorithm' => 'none'),
         'no_superfluous_phpdoc_tags' => false,

README.md

@@ -1,6 +1,6 @@
 # JSON Schema for PHP
 
-[![Build Status](https://travis-ci.org/justinrainbow/json-schema.svg?branch=master)](https://travis-ci.org/justinrainbow/json-schema)
+[![Build Status](https://github.com/justinrainbow/json-schema/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/justinrainbow/json-schema/actions)
 [![Latest Stable Version](https://poser.pugx.org/justinrainbow/json-schema/v/stable.png)](https://packagist.org/packages/justinrainbow/json-schema)
 [![Total Downloads](https://poser.pugx.org/justinrainbow/json-schema/downloads.png)](https://packagist.org/packages/justinrainbow/json-schema)
 

composer.json

@@ -30,7 +30,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
+        "friendsofphp/php-cs-fixer": "~2.2.20 || ~2.19.0",
         "json-schema/json-schema-test-suite": "1.2.0",
         "phpunit/phpunit": "^4.8.35"
     },

phpstan-baseline.neon

@@ -0,0 +1,12 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^PHPDoc tag @throws with type JsonSchema\\\\Exception\\\\ExceptionInterface is not subtype of Throwable$#"
+			count: 1
+			path: src/JsonSchema/Constraints/ConstraintInterface.php
+
+		-
+			message: "#^Access to an undefined property object\\:\\:\\$properties\\.$#"
+			count: 3
+			path: src/JsonSchema/SchemaStorage.php
+

phpstan.neon

@@ -0,0 +1,9 @@
+parameters:
+    level: 2
+    paths:
+        - ./src/
+    ignoreErrors: []
+
+includes:
+    - phpstan-baseline.neon
+    - vendor/marc-mabe/php-enum-phpstan/extension.neon

src/JsonSchema/Constraints/BaseConstraint.php

@@ -145,4 +145,21 @@ public static function arrayToObjectRecursive($array)
 
         return (object) json_decode($json);
     }
+
+    /**
+     * @param JsonPointer $pointer
+     *
+     * @return string property path
+     */
+    protected function convertJsonPointerIntoPropertyPath(JsonPointer $pointer)
+    {
+        $result = array_map(
+            function ($path) {
+                return sprintf(is_numeric($path) ? '[%d]' : '.%s', $path);
+            },
+            $pointer->getPropertyPaths()
+        );
+
+        return trim(implode('', $result), '.');
+    }
 }

src/JsonSchema/Constraints/Constraint.php

@@ -86,6 +86,7 @@ protected function checkArray(&$value, $schema = null, JsonPointer $path = null,
     protected function checkObject(&$value, $schema = null, JsonPointer $path = null, $properties = null,
         $additionalProperties = null, $patternProperties = null, $appliedDefaults = array())
     {
+        /** @var ObjectConstraint $validator */
         $validator = $this->factory->createInstanceFor('object');
         $validator->check($value, $schema, $path, $properties, $additionalProperties, $patternProperties, $appliedDefaults);
 
@@ -118,6 +119,7 @@ protected function checkType(&$value, $schema = null, JsonPointer $path = null,
      */
     protected function checkUndefined(&$value, $schema = null, JsonPointer $path = null, $i = null, $fromDefault = false)
     {
+        /** @var UndefinedConstraint $validator */
         $validator = $this->factory->createInstanceFor('undefined');
 
         $validator->check($value, $this->factory->getSchemaStorage()->resolveRefSchema($schema), $path, $i, $fromDefault);
@@ -198,21 +200,4 @@ protected function getTypeCheck()
     {
         return $this->factory->getTypeCheck();
     }
-
-    /**
-     * @param JsonPointer $pointer
-     *
-     * @return string property path
-     */
-    protected function convertJsonPointerIntoPropertyPath(JsonPointer $pointer)
-    {
-        $result = array_map(
-            function ($path) {
-                return sprintf(is_numeric($path) ? '[%d]' : '.%s', $path);
-            },
-            $pointer->getPropertyPaths()
-        );
-
-        return trim(implode('', $result), '.');
-    }
 }

src/JsonSchema/Constraints/Factory.php

@@ -184,6 +184,7 @@ public function setConstraintClass($name, $class)
      * @throws InvalidArgumentException if is not possible create the constraint instance
      *
      * @return ConstraintInterface|ObjectConstraint
+     * @phpstan-return ConstraintInterface&BaseConstraint
      */
     public function createInstanceFor($constraintName)
     {
@@ -201,7 +202,8 @@ public function createInstanceFor($constraintName)
     /**
      * Get the error context
      *
-     * @return string
+     * @return int
+     * @phpstan-return Validator::ERROR_DOCUMENT_VALIDATION|Validator::ERROR_SCHEMA_VALIDATION
      */
     public function getErrorContext()
     {
@@ -211,7 +213,8 @@ public function getErrorContext()
     /**
      * Set the error context
      *
-     * @param string $validationContext
+     * @param int $errorContext
+     * @phpstan-param Validator::ERROR_DOCUMENT_VALIDATION|Validator::ERROR_SCHEMA_VALIDATION $errorContext
      */
     public function setErrorContext($errorContext)
     {

src/JsonSchema/Constraints/TypeConstraint.php

@@ -70,11 +70,11 @@ public function check(&$value = null, $schema = null, JsonPointer $path = null,
      * of $isValid to true, if at least one $type mateches the type of $value or the value
      * passed as $isValid is already true.
      *
-     * @param mixed $value             Value to validate
-     * @param array $type              TypeConstraints to check agains
-     * @param array $validTypesWording An array of wordings of the valid types of the array $type
-     * @param bool  $isValid           The current validation value
-     * @param $path
+     * @param mixed        $value             Value to validate
+     * @param array        $type              TypeConstraints to check against
+     * @param array        $validTypesWording An array of wordings of the valid types of the array $type
+     * @param bool         $isValid           The current validation value
+     * @param ?JsonPointer $path
      */
     protected function validateTypesArray(&$value, array $type, &$validTypesWording, &$isValid, $path)
     {
@@ -217,7 +217,7 @@ protected function validateType(&$value, $type)
     /**
      * Converts a value to boolean. For example, "true" becomes true.
      *
-     * @param $value The value to convert to boolean
+     * @param mixed $value The value to convert to boolean
      *
      * @return bool|mixed
      */