Throw more specific exceptions in JsonPatch::import()

- InvalidOperationException
- MissingFieldException

Author: outdooracorn

src/InvalidOperationException.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Swaggest\JsonDiff;
+
+
+use Throwable;
+
+class InvalidOperationException extends Exception
+{
+    private object $operationObject;
+
+    public function __construct(
+        object    $operationObject,
+        string    $message = '',
+        int       $code = 0,
+        Throwable $previous = null
+    )
+    {
+        parent::__construct($message, $code, $previous);
+        $this->operationObject = $operationObject;
+    }
+
+    public function getInvalidOperation(): string
+    {
+        return $this->operationObject->op;
+    }
+
+    public function getOperationObject(): object
+    {
+        return $this->operationObject;
+    }
+}

src/JsonPatch.php

@@ -60,11 +60,15 @@ public static function import(array $data)
                 $operation = (object)$operation;
             }
 
+            if (!is_object($operation)) {
+                throw new Exception( 'Invalid patch operation - should be a JSON object' );
+            }
+
             if (!isset($operation->op)) {
-                throw new Exception('Missing "op" in operation data');
+                throw new MissingFieldException('op', $operation, 'Missing "op" in operation data');
             }
             if (!isset($operation->path)) {
-                throw new Exception('Missing "path" in operation data');
+                throw new MissingFieldException('path', $operation, 'Missing "path" in operation data');
             }
 
             $op = null;
@@ -88,18 +92,18 @@ public static function import(array $data)
                     $op = new Test();
                     break;
                 default:
-                    throw new Exception('Unknown "op": ' . $operation->op);
+                    throw new InvalidOperationException($operation, 'Invalid "op": ' . $operation->op);
             }
             $op->path = $operation->path;
             if ($op instanceof OpPathValue) {
                 if (property_exists($operation, 'value')) {
                     $op->value = $operation->value;
                 } else {
-                    throw new Exception('Missing "value" in operation data');
+                    throw new MissingFieldException('value', $operation, 'Missing "value" in operation data');
                 }
             } elseif ($op instanceof OpPathFrom) {
                 if (!isset($operation->from)) {
-                    throw new Exception('Missing "from" in operation data');
+                    throw new MissingFieldException('from', $operation, 'Missing "from" in operation data');
                 }
                 $op->from = $operation->from;
             }

src/MissingFieldException.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Swaggest\JsonDiff;
+
+use Throwable;
+
+class MissingFieldException extends Exception
+{
+    private string $missingField;
+    private object $operationObject;
+
+    public function __construct(
+        string    $missingField,
+        object    $operationObject,
+        string    $message = '',
+        int       $code = 0,
+        Throwable $previous = null
+    )
+    {
+        parent::__construct($message, $code, $previous);
+        $this->missingField = $missingField;
+        $this->operationObject = $operationObject;
+    }
+
+    public function getMissingField(): string
+    {
+        return $this->missingField;
+    }
+
+    public function getOperationObject(): object
+    {
+        return $this->operationObject;
+    }
+}

tests/src/JsonPatchTest.php

@@ -5,6 +5,7 @@
 use Swaggest\JsonDiff\Exception;
 use Swaggest\JsonDiff\JsonDiff;
 use Swaggest\JsonDiff\JsonPatch;
+use Swaggest\JsonDiff\MissingFieldException;
 use Swaggest\JsonDiff\PatchTestOperationFailedException;
 
 class JsonPatchTest extends \PHPUnit_Framework_TestCase
@@ -75,7 +76,7 @@ public function testNull()
 
     public function testMissingOp()
     {
-        $this->setExpectedException(get_class(new Exception()), 'Missing "op" in operation data');
+        $this->setExpectedException(MissingFieldException::class, 'Missing "op" in operation data');
         JsonPatch::import(array((object)array('path' => '/123')));
     }
 
@@ -87,7 +88,7 @@ public function testMissingPath()
 
     public function testInvalidOp()
     {
-        $this->setExpectedException(get_class(new Exception()), 'Unknown "op": wat');
+        $this->setExpectedException(get_class(new Exception()), 'Invalid "op": wat');
         JsonPatch::import(array((object)array('op' => 'wat', 'path' => '/123')));
     }