Merge pull request #53 from swaggest/issue-52

Fix #52, proper `not` error handling

Author: vearutop

src/InvalidValue.php

@@ -17,7 +17,9 @@ public function addPath($path)
             $this->error = $this->message;
         }
         $this->path = $path;
-        $this->message .= ' at ' . $path;
+        if ('#' !== $this->path) {
+            $this->message .= ' at ' . $path;
+        }
     }
 
     const INVALID_VALUE = 1;
@@ -32,8 +34,10 @@ public function inspect()
         $error->dataPointer = PointerUtil::getDataPointer($error->processingPath);
         $error->schemaPointers = PointerUtil::getSchemaPointers($error->processingPath);
         if ($this instanceof LogicException) {
-            foreach ($this->subErrors as $subError) {
-                $error->subErrors[] = $subError->inspect();
+            if ($this->subErrors !== null) {
+                foreach ($this->subErrors as $subError) {
+                    $error->subErrors[] = $subError->inspect();
+                }
             }
         }
         return $error;

src/Path/PointerUtil.php

@@ -53,11 +53,14 @@ public static function getSchemaPointers($path, $isURIFragmentId = false)
                 $pointer .= '/' . JsonPointer::escapeSegment($schemaPaths[0], $isURIFragmentId);
                 if (isset($schemaPaths[1])) {
                     $pointer .= '/' . JsonPointer::escapeSegment($schemaPaths[1], $isURIFragmentId);
-                } elseif ($parts[1]) {
+                } elseif (isset($parts[1])) {
                     $pointer .= '/' . JsonPointer::escapeSegment($parts[1], $isURIFragmentId);
                 }
             }
         }
+        if ($pointer === '') {
+            $pointer = '/';
+        }
         $result[] = $pointer;
         return $result;
     }
@@ -81,6 +84,9 @@ public static function getDataPointer($path, $isURIFragmentId = false)
                 $result .= '/' . JsonPointer::escapeSegment($parts[1], $isURIFragmentId);
             }
         }
+        if ($result === '') {
+            return '/';
+        }
         return $result;
     }
 

src/Schema.php

@@ -284,7 +284,7 @@ private function processNot($data, Context $options, $path)
             // Expected exception
         }
         if ($exception === false) {
-            $this->fail(new LogicException('Not ' . json_encode($this->not) . ' expected, ' . json_encode($data) . ' received'), $path);
+            $this->fail(new LogicException('Not ' . json_encode($this->not) . ' expected, ' . json_encode($data) . ' received'), $path . '->not');
         }
     }
 
@@ -1167,9 +1167,7 @@ public function setUseObjectAsArray($useObjectAsArray)
      */
     private function fail(InvalidValue $exception, $path)
     {
-        if ($path !== '#') {
-            $exception->addPath($path);
-        }
+        $exception->addPath($path);
         throw $exception;
     }
 

tests/src/PHPUnit/Error/ErrorTest.php

@@ -2,10 +2,7 @@
 
 namespace Swaggest\JsonSchema\Tests\PHPUnit\Error;
 
-
-use Swaggest\JsonSchema\Exception\LogicException;
 use Swaggest\JsonSchema\InvalidValue;
-use Swaggest\JsonSchema\Path\Error;
 use Swaggest\JsonSchema\Schema;
 
 class ErrorTest extends \PHPUnit_Framework_TestCase
@@ -180,4 +177,26 @@ public function testErrorMessage()
         }
     }
 
+
+    public function testNoSubErrors()
+    {
+        $schema = Schema::import(json_decode(<<<'JSON'
+{
+    "not": {
+        "type": "string"
+    }
+}
+JSON
+        ));
+
+        try {
+            $schema->in('abc');
+        } catch (InvalidValue $exception) {
+            $this->assertSame('Not {"type":"string"} expected, "abc" received at #->not', $exception->getMessage());
+
+            $error = $exception->inspect();
+            $this->assertSame('Not {"type":"string"} expected, "abc" received', $error->error);
+        }
+    }
+
 }