Added CustomError

Author: sorinsarca

src/Errors/CustomError.php

@@ -0,0 +1,34 @@
+<?php
+/* ============================================================================
+ * Copyright 2021 Zindex Software
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================================ */
+
+namespace Opis\JsonSchema\Errors;
+
+use Exception;
+
+class CustomError extends Exception
+{
+    protected array $args;
+
+    public function __construct(string $message, array $args = []) {
+        parent::__construct($message);
+        $this->args = $args;
+    }
+
+    public function getArgs(): array {
+        return $this->args;
+    }
+}

src/Keywords/FiltersKeyword.php

@@ -23,7 +23,7 @@
     Keyword,
     Schema
 };
-use Opis\JsonSchema\Errors\ValidationError;
+use Opis\JsonSchema\Errors\{ValidationError, CustomError};
 use Opis\JsonSchema\Exceptions\UnresolvedFilterException;
 
 class FiltersKeyword implements Keyword
@@ -62,10 +62,18 @@ public function validate(ValidationContext $context, Schema $schema): ?Validatio
                 $args = $context->globals();
             }
 
-            if ($func instanceof Filter) {
-                $ok = $func->validate($context, $schema, $args);
-            } else {
-                $ok = $func($context->currentData(), $args);
+            try {
+                if ($func instanceof Filter) {
+                    $ok = $func->validate($context, $schema, $args);
+                } else {
+                    $ok = $func($context->currentData(), $args);
+                }
+            } catch (CustomError $error) {
+                return $this->error($schema, $context, '$filters', $error->getMessage(), $error->getArgs() + [
+                    'filter' => $filter->name,
+                    'type' => $type,
+                    'args' => $args,
+                ]);
             }
 
             if ($ok) {

src/Keywords/FormatKeyword.php

@@ -23,7 +23,7 @@
     Keyword,
     Schema
 };
-use Opis\JsonSchema\Errors\ValidationError;
+use Opis\JsonSchema\Errors\{ValidationError, CustomError};
 
 class FormatKeyword implements Keyword
 {
@@ -56,10 +56,18 @@ public function validate(ValidationContext $context, Schema $schema): ?Validatio
         }
 
         $format = $this->types[$type];
-        if ($format instanceof Format) {
-            $ok = $format->validate($context->currentData());
-        } else {
-            $ok = $format($context->currentData());
+
+        try {
+            if ($format instanceof Format) {
+                $ok = $format->validate($context->currentData());
+            } else {
+                $ok = $format($context->currentData());
+            }
+        } catch (CustomError $error) {
+            return $this->error($schema, $context, 'format', $error->getMessage(), $error->getArgs() + [
+                'format' => $this->name,
+                'type' => $type,
+            ]);
         }
 
         if ($ok) {