Skip to content

Commit 698548e

Browse files
author
Jeremiah VALERIE
committed
Fix resolver field with same property/method name
1 parent f5f784b commit 698548e

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

src/Resolver/FieldResolver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public static function valueFromObjectOrArray($objectOrArray, $fieldName)
2626
$value = $objectOrArray->$getter();
2727
} elseif (null !== $getter = self::guessObjectMethod($objectOrArray, $fieldName, 'is')) {
2828
$value = $objectOrArray->$getter();
29+
} elseif (null !== $getter = self::guessObjectMethod($objectOrArray, $fieldName, '')) {
30+
$value = $objectOrArray->$getter();
2931
} elseif (isset($objectOrArray->$fieldName)) {
3032
$value = $objectOrArray->$fieldName;
3133
}

tests/Resolver/ResolverFieldTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public function resolverProvider()
3939
['not_object_or_array', 'String', null],
4040
['name', $object, $object->name],
4141
['enabled', $object, $object->isEnabled()],
42+
['isDisabled', $object, $object->isDisabled()],
4243
];
4344
}
4445
}

tests/Resolver/Toto.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class Toto
1515
private $private_property_with_getter2 = self::PRIVATE_PROPERTY_WITH_GETTER2_VALUE;
1616
public $name = 'public';
1717
private $enabled = true;
18+
private $isDisabled = false;
1819

1920
/**
2021
* @return string
@@ -51,4 +52,12 @@ public function isEnabled()
5152
{
5253
return $this->enabled;
5354
}
55+
56+
/**
57+
* @return bool
58+
*/
59+
public function isDisabled()
60+
{
61+
return $this->isDisabled;
62+
}
5463
}

0 commit comments

Comments
 (0)