Replace {ArrayHasKeyWith,ArrayHasItemWith}::evaluate() by self::matches()

Author: PhrozenByte

src/Constraint/ArrayHasItemWith.php

@@ -68,26 +68,22 @@ public function toString(): string
     /**
      * {@inheritDoc}
      */
-    public function evaluate($other, string $description = '', bool $returnResult = false)
+    protected function matches($other): bool
     {
-        $success = false;
+        $valueExists = false;
         if (is_array($other)) {
             $other = array_values($other);
-            $success = isset($other[$this->index]);
+            $valueExists = isset($other[$this->index]);
         } elseif ($other instanceof Traversable) {
             $other = iterator_to_array($other, false);
-            $success = isset($other[$this->index]);
+            $valueExists = isset($other[$this->index]);
         }
 
-        if (!$success) {
-            if ($returnResult) {
-                return false;
-            }
-
-            $this->fail($other, $description);
+        if (!$valueExists) {
+            return false;
         }
 
-        return $this->constraint->evaluate($other[$this->index], $description, $returnResult);
+        return $this->constraint->evaluate($other[$this->index], '', true);
     }
 
     /**

src/Constraint/ArrayHasKeyWith.php

@@ -64,24 +64,20 @@ public function toString(): string
     /**
      * {@inheritDoc}
      */
-    public function evaluate($other, string $description = '', bool $returnResult = false)
+    protected function matches($other): bool
     {
-        $success = false;
+        $valueExists = false;
         if (is_array($other)) {
-            $success = array_key_exists($this->key, $other);
+            $valueExists = array_key_exists($this->key, $other);
         } elseif ($other instanceof ArrayAccess) {
-            $success = $other->offsetExists($this->key);
+            $valueExists = $other->offsetExists($this->key);
         }
 
-        if (!$success) {
-            if ($returnResult) {
-                return false;
-            }
-
-            $this->fail($other, $description);
+        if (!$valueExists) {
+            return false;
         }
 
-        return $this->constraint->evaluate($other[$this->key], $description, $returnResult);
+        return $this->constraint->evaluate($other[$this->key], '', true);
     }
 
     /**