error handling optimization

Author: ro-pi

README.md

@@ -254,7 +254,7 @@ class Md5HashKeyword extends \Ropi\JsonSchemaEvaluator\Keyword\AbstractKeyword i
 }
 
 $draft = new \Ropi\JsonSchemaEvaluator\Draft\Draft202012();
-$draft->registerKeyword(new Md5HashKeyword());
+$draft->registerKeyword(new Md5HashKeyword(), 'https://example.tld/draft/2022-03/vocab/md5'); // Register keyword with custom vocabulary
 
 $evaluator = new \Ropi\JsonSchemaEvaluator\JsonSchemaEvaluator();
 

src/Draft/AbstractDraft.php

@@ -94,9 +94,9 @@ public function vocabularyEnabled(string $vocabulary): bool
     {
         if (!$this->supportsVocabulary($vocabulary)) {
             throw new UnsupportedVocabularyException(
-                'Can not enable vocabulary "'
+                'Can not enable vocabulary \''
                 . $vocabulary
-                . '", because vocabulary is not supported',
+                . '\', because vocabulary is not supported.',
                 1647637917
             );
         }
@@ -108,9 +108,9 @@ public function enableVocabulary(string $vocabulary): void
     {
         if (!$this->supportsVocabulary($vocabulary)) {
             throw new UnsupportedVocabularyException(
-                'Can not enable vocabulary "'
+                'Can not enable vocabulary \''
                 . $vocabulary
-                . '", because vocabulary is not supported',
+                . '\', because vocabulary is not supported.',
                 1647637758
             );
         }
@@ -127,9 +127,9 @@ public function disableVocabulary(string $vocabulary): void
     {
         if (!$this->supportsVocabulary($vocabulary)) {
             throw new UnsupportedVocabularyException(
-                'Can not disable vocabulary "'
+                'Can not disable vocabulary \''
                 . $vocabulary
-                . '", because vocabulary is not supported',
+                . '\', because vocabulary is not supported.',
                 1647637759
             );
         }
@@ -222,6 +222,13 @@ public function evaluate(RuntimeEvaluationContext $context, bool $mutationsOnly
         $schema = $context->getCurrentSchema();
 
         if (is_bool($schema)) {
+            if ($schema === false) {
+                $lastResult = $context->getLastResult();
+                if ($lastResult) {
+                    $context->createResultForKeyword($lastResult->keyword)->invalidate('Not allowed');
+                }
+            }
+
             return $schema;
         }
 

src/EvaluationContext/RuntimeEvaluationContext.php

@@ -139,6 +139,11 @@ public function getLastResultByKeywordLocation(string $keywordLocation): ?Runtim
         return null;
     }
 
+    public function getLastResult(): ?RuntimeEvaluationResult
+    {
+        return end($this->results) ?: null;
+    }
+
     /**
      * @return RuntimeEvaluationResult[]
      */

src/Keyword/Applicator/AdditionalPropertiesKeyword.php

@@ -27,7 +27,7 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
     {
         if (!is_object($keywordValue) && !is_bool($keywordValue)) {
             throw new InvalidKeywordValueException(
-                'The value of "%s" must be a valid JSON Schema',
+                'The value of \'%s\' must be a valid JSON Schema.',
                 $this,
                 $context
             );

src/Keyword/Applicator/AllOfKeyword.php

@@ -37,7 +37,8 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
         if ($numMatches !== count($keywordValue)) {
             $result->invalidate(
                 'Value must match all schemas, but matches only '
-                . $numMatches
+                . $numMatches,
+                $numMatches
             );
         }
 

src/Keyword/Applicator/ContainsKeyword.php

@@ -27,7 +27,7 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
     {
         if (!is_object($keywordValue) && !is_bool($keywordValue)) {
             throw new InvalidKeywordValueException(
-                'The value of "%s" must be a valid JSON Schema',
+                'The value of \'%s\' must be a valid JSON Schema.',
                 $this,
                 $context
             );

src/Keyword/Applicator/DependentSchemasKeyword.php

@@ -27,7 +27,7 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
     {
         if (!is_object($keywordValue)) {
             throw new InvalidKeywordValueException(
-                'The value of "%s" must be an object',
+                'The value of \'%s\' must be an object.',
                 $this,
                 $context
             );
@@ -38,9 +38,9 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
 
             if (!is_object($dependentSchema) && !is_bool($dependentSchema)) {
                 throw new InvalidKeywordValueException(
-                    'The property "'
+                    'The property \''
                     . $dependencyPropertyName
-                    . '" in "%s" object must be a valid JSON Schema',
+                    . '\' in \'%s\' object must be a valid JSON Schema.',
                     $this,
                     $context
                 );

src/Keyword/Applicator/ElseKeyword.php

@@ -27,7 +27,7 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
     {
         if (!is_object($keywordValue) && !is_bool($keywordValue)) {
             throw new InvalidKeywordValueException(
-                'The value of "%s" must be a valid JSON Schema',
+                'The value of \'%s\' must be a valid JSON Schema.',
                 $this,
                 $context
             );

src/Keyword/Applicator/IfKeyword.php

@@ -27,7 +27,7 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
     {
         if (!is_object($keywordValue) && !is_bool($keywordValue)) {
             throw new InvalidKeywordValueException(
-                'The value of "%s" must be a valid JSON Schema',
+                'The value of \'%s\' must be a valid JSON Schema.',
                 $this,
                 $context
             );

src/Keyword/Applicator/ItemsKeyword.php

@@ -27,7 +27,7 @@ public function evaluateStatic(mixed &$keywordValue, StaticEvaluationContext $co
     {
         if (!is_object($keywordValue) && !is_bool($keywordValue)) {
             throw new InvalidKeywordValueException(
-                'The value of "%s" must be a valid JSON Schema',
+                'The value of \'%s\' must be a valid JSON Schema.',
                 $this,
                 $context
             );