cleanup

Author: vearutop

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
   - nightly
   - hhvm
+  - 7.1
   - 7.0
   - 5.6
   - 5.5
@@ -29,6 +30,7 @@ script:
   - ./vendor/bin/phpunit -v --configuration phpunit.xml --coverage-clover build/logs/clover.xml
 
 after_script:
- - php vendor/bin/coveralls -v
  - wget https://scrutinizer-ci.com/ocular.phar
  - php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover
+ - if [[ $(phpenv version-name) =~ 7.0 ]] ; then php vendor/bin/coveralls -v; fi
+ - if [[ $(phpenv version-name) =~ 7.0 ]] ; then ./vendor/bin/test-reporter; fi

README.md

@@ -1,7 +1,7 @@
 # Swaggest JSON-schema implementation for PHP
 
 [![Build Status](https://travis-ci.org/swaggest/php-json-schema.svg?branch=master)](https://travis-ci.org/swaggest/php-json-schema)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/swaggest/php-json-schema/badges/quality-score.png?b=spec-compliance)](https://scrutinizer-ci.com/g/swaggest/php-json-schema/?branch=spec-compliance)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/swaggest/php-json-schema/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/swaggest/php-json-schema/?branch=master)
 [![Code Climate](https://codeclimate.com/github/swaggest/php-json-schema/badges/gpa.svg)](https://codeclimate.com/github/swaggest/php-json-schema)
 [![Test Coverage](https://codeclimate.com/github/swaggest/php-json-schema/badges/coverage.svg)](https://codeclimate.com/github/swaggest/php-json-schema/coverage)
 

src/Helper.php

@@ -45,7 +45,6 @@ public static function resolveURI($parent, $current)
             if (false !== $pos = strpos($parent, '#')) {
                 $result = substr($parent, 0, $pos) . $current;
             }
-        } elseif ($current[0] === '/') {
         } else {
             if (false !== $pos = strrpos($parent, '/')) {
                 $result = substr($parent, 0, $pos + 1) . $current;

src/MagicMap.php

@@ -52,7 +52,7 @@ public function &toArray()
         return $this->_arrayOfData;
     }
 
-    function jsonSerialize()
+    public function jsonSerialize()
     {
         return (object)$this->_arrayOfData;
     }

src/Schema.php

@@ -141,6 +141,7 @@ private function process($data, $import = true, $path = '#')
             try {
                 $this->not->process($data, $import, $path . '->not');
             } catch (InvalidValue $exception) {
+                // Expected exception
             }
             if ($exception === false) {
                 $this->fail(new LogicException('Failed due to logical constraint: not'), $path);
@@ -157,6 +158,7 @@ private function process($data, $import = true, $path = '#')
                         break;
                     }
                 } catch (InvalidValue $exception) {
+                    // Expected exception
                 }
             }
             if ($successes !== 1) {
@@ -174,6 +176,7 @@ private function process($data, $import = true, $path = '#')
                         break;
                     }
                 } catch (InvalidValue $exception) {
+                    // Expected exception
                 }
             }
             if (!$successes) {
@@ -269,6 +272,7 @@ private function process($data, $import = true, $path = '#')
                 if ($result instanceof ClassStructure) {
                     if ($result->__validateOnSet) {
                         $result->__validateOnSet = false;
+                        /** @noinspection PhpUnusedLocalVariableInspection */
                         $validateOnSetHandler = new ScopeExit(function()use($result){
                             $result->__validateOnSet = true;
                         });
@@ -352,7 +356,7 @@ private function process($data, $import = true, $path = '#')
                 $pathItems = 'additionalItems';
             }
 
-            if ($items || $additionalItems !== null) {
+            if ($items !== null || $additionalItems !== null) {
                 $itemsLen = is_array($items) ? count($items) : 0;
                 $index = 0;
                 foreach ($data as &$value) {

src/SchemaLoader.php

@@ -82,7 +82,7 @@ public function readSchema($schemaData)
 
     private $resolutionScope;
 
-    protected function readSchemaDeeper($schemaArray, Schema $parentSchema = null)
+    protected function readSchemaDeeper($schemaArray)
     {
         $schema = new Schema();
         if (null === $this->rootSchema) {
@@ -97,6 +97,7 @@ protected function readSchemaDeeper($schemaArray, Schema $parentSchema = null)
         if (isset($schemaArray[self::ID])) {
             $parentScope = $this->resolutionScope;
             $this->resolutionScope = Helper::resolveURI($parentScope, $schemaArray[self::ID]);
+            /** @noinspection PhpUnusedLocalVariableInspection */
             $defer = new ScopeExit(function () use ($parentScope) {
                 $this->resolutionScope = $parentScope;
             });
@@ -270,7 +271,7 @@ private function resolveReference($referencePath)
                 } else {
                     $path = explode('/', trim($referencePath, '#/'));
                     $branch = &$this->rootData;
-                    while ($path) {
+                    while (!empty($path)) {
                         $folder = array_shift($path);
 
                         // unescaping special characters
@@ -309,7 +310,7 @@ private function resolveReference($referencePath)
     /**
      * @return static
      */
-    static function create()
+    public static function create()
     {
         return new static;
     }

src/Structure/ClassStructure.php

@@ -37,7 +37,6 @@ public static function schema()
      */
     public static function import($data)
     {
-        //static $schemas = array();
         return static::schema()->import($data);
     }
 
@@ -54,7 +53,7 @@ public static function export($data)
     /**
      * @return static
      */
-    static function create()
+    public static function create()
     {
         return new static;
     }

src/TODO.md

@@ -3,4 +3,5 @@
 * avoid `(array)` cast in `SchemaLoader`, getaway from `const` fields?
 * process string formats
 * test against optional json-schema cases
-* all-errors at once mode (apart of throw Exception)
+* all-errors at once mode (apart of throw Exception)
+* add general purpose mixins