testing type before triggering match. switching match return value to…

… more compact style
etsy · May 31, 2012 · 24e4d74 · 24e4d74
1 parent 33ced98
commit 24e4d74
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/PHPUnit/Extensions/Constraint/ArrayHasKeyValuePair.php b/PHPUnit/Extensions/Constraint/ArrayHasKeyValuePair.php
@@ -34,10 +34,10 @@ public function __construct($key, $value)
      */
     protected function matches($other)
     {
-        if (array_key_exists($this->key, $other) && $other[$this->key] === $this->value) {
-            return true;
+        if (!(is_array($other) || $other instanceof ArrayAccess)) {
+            return false;
         }
-        return false;
+        return (array_key_exists($this->key, $other) && ($other[$this->key] === $this->value));
     }
 
     /**