#71 Added check if value exists

Author: Michal Szczur

src/Matcher/ArrayMatcher.php

@@ -6,6 +6,7 @@
 use Coduo\ToString\StringConverter;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\PropertyAccess\PropertyPath;
 
 final class ArrayMatcher extends Matcher
 {
@@ -147,7 +148,7 @@ private function isPatternValid(array $pattern, array $values, $parentPath)
 
             if (count($notExistingKeys) > 0) {
                 $keyNames = array_keys($notExistingKeys);
-                $path = $this->formatFullPath($parentPath,  $this->formatAccessPath($keyNames[0]));
+                $path = $this->formatFullPath($parentPath, $this->formatAccessPath($keyNames[0]));
                 $this->setMissingElementInError('value', $path);
                 return false;
             }
@@ -180,7 +181,33 @@ private function valueMatchPattern($value, $pattern)
      */
     private function valueExist($path, array $haystack)
     {
-        return $this->getPropertyAccessor()->isReadable($haystack, $path);
+        $propertyPath = new PropertyPath($path);
+        $length = $propertyPath->getLength();
+        $valueExist = true;
+        for ($i = 0; $i < $length; ++$i) {
+            $property = $propertyPath->getElement($i);
+            $isIndex = $propertyPath->isIndex($i);
+            $propertyExist = $this->arrayPropertyExists($property, $haystack);
+
+            if ($isIndex && !$propertyExist) {
+                $valueExist = false;
+                break;
+            }
+        }
+
+        unset($propertyPath);
+        return $valueExist;
+    }
+
+    /**
+     * @param string $property
+     * @param array $objectOrArray
+     * @return bool
+     */
+    private function arrayPropertyExists($property, array $objectOrArray)
+    {
+        return ($objectOrArray instanceof \ArrayAccess && isset($objectOrArray[$property])) ||
+            (is_array($objectOrArray) && array_key_exists($property, $objectOrArray));
     }
 
     /**
@@ -203,7 +230,6 @@ private function getPropertyAccessor()
         }
 
         $accessorBuilder = PropertyAccess::createPropertyAccessorBuilder();
-        $accessorBuilder->enableExceptionOnInvalidIndex();
         $this->accessor = $accessorBuilder->getPropertyAccessor();
 
         return $this->accessor;