Polish new import Exceptions

* rename Invalid... -> Unknown...
* make PHP 5.6 compatible
* create message inside Exceptions

Author: Silvan-WMDE

src/InvalidOperationException.php

@@ -65,10 +65,10 @@ public static function import(array $data)
             }
 
             if (!isset($operation->op)) {
-                throw new MissingFieldException('op', $operation, 'Missing "op" in operation data');
+                throw new MissingFieldException('op', $operation);
             }
             if (!isset($operation->path)) {
-                throw new MissingFieldException('path', $operation, 'Missing "path" in operation data');
+                throw new MissingFieldException('path', $operation);
             }
 
             $op = null;
@@ -92,18 +92,18 @@ public static function import(array $data)
                     $op = new Test();
                     break;
                 default:
-                    throw new InvalidOperationException($operation, 'Invalid "op": ' . $operation->op);
+                    throw new UnknownOperationException($operation);
             }
             $op->path = $operation->path;
             if ($op instanceof OpPathValue) {
                 if (property_exists($operation, 'value')) {
                     $op->value = $operation->value;
                 } else {
-                    throw new MissingFieldException('value', $operation, 'Missing "value" in operation data');
+                    throw new MissingFieldException('value', $operation);
                 }
             } elseif ($op instanceof OpPathFrom) {
                 if (!isset($operation->from)) {
-                    throw new MissingFieldException('from', $operation, 'Missing "from" in operation data');
+                    throw new MissingFieldException('from', $operation);
                 }
                 $op->from = $operation->from;
             }

src/JsonPatch.php

@@ -6,29 +6,42 @@
 
 class MissingFieldException extends Exception
 {
-    private string $missingField;
-    private object $operationObject;
+	/** @var string */
+    private $missingField;
+	/** @var object */
+    private $operation;
 
+	/**
+	 * @param string $missingField
+	 * @param object $operation
+	 * @param int $code
+	 * @param Throwable|null $previous
+	 */
     public function __construct(
-        string    $missingField,
-        object    $operationObject,
-        string    $message = '',
-        int       $code = 0,
+        $missingField,
+        $operation,
+        $code = 0,
         Throwable $previous = null
     )
     {
-        parent::__construct($message, $code, $previous);
+        parent::__construct('Missing "' . $missingField . '" in operation data', $code, $previous);
         $this->missingField = $missingField;
-        $this->operationObject = $operationObject;
+        $this->operation = $operation;
     }
 
-    public function getMissingField(): string
+	/**
+	 * @return string
+	 */
+    public function getMissingField()
     {
         return $this->missingField;
     }
 
-    public function getOperationObject(): object
+	/**
+	 * @return object
+	 */
+    public function getOperation()
     {
-        return $this->operationObject;
+        return $this->operation;
     }
 }

src/MissingFieldException.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Swaggest\JsonDiff;
+
+
+use Throwable;
+
+class UnknownOperationException extends Exception
+{
+	/** @var object */
+    private $operation;
+
+	/**
+	 * @param object $operation
+	 * @param int $code
+	 * @param Throwable|null $previous
+	 */
+    public function __construct(
+        $operation,
+        $code = 0,
+        Throwable $previous = null
+    )
+    {
+		// @phpstan-ignore-next-line MissingFieldOperation will be thrown if op is not set
+        parent::__construct('Unknown "op": ' . $operation->op, $code, $previous);
+        $this->operation = $operation;
+    }
+
+	/**
+	 * @return object
+	 */
+    public function getOperation()
+    {
+        return $this->operation;
+    }
+}

src/UnknownOperationException.php

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