Merge pull request #4 from revinate/php7.4-compat

ccarrillot · web-flow · commit d4f3f37ae7cc · 2020-06-24T19:32:21.000-06:00
Fixing ArrayAccess comparison
diff --git a/src/getValueFunctions.php b/src/getValueFunctions.php
@@ -41,7 +41,7 @@ function getValue($doc, $fieldName, $default = null) {
         return isset($doc[$fieldName]) || array_key_exists($fieldName, $doc) ? $doc[$fieldName] : $default;
     }
     if ($doc instanceof ArrayAccess) {
-        return isset($doc[$fieldName]) || property_exists($doc, $fieldName) ? $doc[$fieldName] : $default;
+        return isset($doc[$fieldName]) || $doc->offsetExists($fieldName) ? $doc[$fieldName] : $default;
     }
     if (is_object($doc)) {
         if (isset($doc->{$fieldName})) {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ function getValue($doc, $fieldName, $default = null) {`
`41`	`41`	`return isset($doc[$fieldName]) \|\| array_key_exists($fieldName, $doc) ? $doc[$fieldName] : $default;`
`42`	`42`	`}`
`43`	`43`	`if ($doc instanceof ArrayAccess) {`
`44`		`- return isset($doc[$fieldName]) \|\| property_exists($doc, $fieldName) ? $doc[$fieldName] : $default;`
	`44`	`+ return isset($doc[$fieldName]) \|\| $doc->offsetExists($fieldName) ? $doc[$fieldName] : $default;`
`45`	`45`	`}`
`46`	`46`	`if (is_object($doc)) {`
`47`	`47`	`if (isset($doc->{$fieldName})) {`