Fixed annotation handling for invalid assertion results

Author: ro-pi

src/EvaluationContext/RuntimeEvaluationContext.php

@@ -97,6 +97,9 @@ public function getLastResultNumber(): int
         return $this->lastResultNumber;
     }
 
+    /**
+     * @return RuntimeEvaluationResult[]
+     */
     public function getResultsByKeywordName(string $keywordName): array
     {
         $results = [];

src/EvaluationContext/RuntimeEvaluationResult.php

@@ -43,7 +43,7 @@ public function setAnnotation(mixed $annotation): void
 
     public function getAnnotation(bool $force = false): mixed
     {
-        if (!$force && (!$this->valid || $this->suppressAnnotation)) {
+        if (!$force && $this->suppressAnnotation) {
             return null;
         }
 

src/Keyword/Applicator/AdditionalPropertiesKeyword.php

@@ -96,9 +96,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             $additionalEvaluatedPropertyNames[$propertyName] = $propertyName;
         }
 
-        if ($result->valid) {
-            $result->setAnnotation($additionalEvaluatedPropertyNames);
-        }
+        $result->setAnnotation($additionalEvaluatedPropertyNames);
 
         return $result;
     }

src/Keyword/Applicator/ItemsKeyword.php

@@ -72,9 +72,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             }
         }
 
-        if ($result->valid) {
-            $result->setAnnotation(true);
-        }
+        $result->setAnnotation(true);
 
         return $result;
     }

src/Keyword/Applicator/PatternPropertiesKeyword.php

@@ -94,9 +94,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             }
         }
 
-        if ($result->valid) {
-            $result->setAnnotation($matchedPropertyNames);
-        }
+        $result->setAnnotation($matchedPropertyNames);
 
         return $result;
     }

src/Keyword/Applicator/PrefixItemsKeyword.php

@@ -86,9 +86,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             }
         }
 
-        if ($result->valid) {
-            $result->setAnnotation(($prefixItemsKey === count($instance) - 1) ?: $prefixItemsKey);
-        }
+        $result->setAnnotation(($prefixItemsKey === count($instance) - 1) ?: $prefixItemsKey);
 
         return $result;
     }

src/Keyword/Applicator/PropertiesKeyword.php

@@ -102,9 +102,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             $evaluatedProperties[$propertyName] = $propertyName;
         }
 
-        if ($result->valid) {
-            $result->setAnnotation($evaluatedProperties);
-        }
+        $result->setAnnotation($evaluatedProperties);
 
         return $result;
     }

src/Keyword/Applicator/UnevaluatedItemsKeyword.php

@@ -107,9 +107,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             }
         }
 
-        if ($result->valid) {
-            $result->setAnnotation(true);
-        }
+        $result->setAnnotation(true);
 
         return $result;
     }

src/Keyword/Applicator/UnevaluatedPropertiesKeyword.php

@@ -85,9 +85,7 @@ public function evaluate(mixed $keywordValue, RuntimeEvaluationContext $context)
             $evaluatedPropertyNames[$propertyName] = $propertyName;
         }
 
-        if ($result->valid) {
-            $result->setAnnotation($evaluatedPropertyNames);
-        }
+        $result->setAnnotation($evaluatedPropertyNames);
 
         return $result;
     }