Fix double access to ArrayAccess methods

This is a proposal to fix webonyx#759
brunobg · Dec 29, 2020 · 92cac4b · 92cac4b
1 parent 5289a54
commit 92cac4b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
@@ -173,13 +173,15 @@ public static function defaultFieldResolver($objectValue, $args, $contextValue,
         $fieldName = $info->fieldName;
         $property  = null;
 
-        if (is_array($objectValue) || $objectValue instanceof ArrayAccess) {
-            if (isset($objectValue[$fieldName])) {
-                $property = $objectValue[$fieldName];
+        if (is_array($source)) {
+            if (isset($source[$fieldName])) {
+                $property = $source[$fieldName];
             }
-        } elseif (is_object($objectValue)) {
-            if (isset($objectValue->{$fieldName})) {
-                $property = $objectValue->{$fieldName};
+        } elseif ($source instanceof ArrayAccess) {
+            $property = $source[$fieldName];
+        } elseif (is_object($source)) {
+            if (isset($source->{$fieldName})) {
+                $property = $source->{$fieldName};
             }
         }