|
@@ -325,17 +325,11 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface
|
|
*/
|
|
*/
|
|
public function getFieldValue($object, $fieldName)
|
|
public function getFieldValue($object, $fieldName)
|
|
{
|
|
{
|
|
- $code = $this->getOption('code');
|
|
|
|
-
|
|
|
|
- if (is_callable($code)) {
|
|
|
|
- return call_user_func($code, $object);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
$camelizedFieldName = self::camelize($fieldName);
|
|
$camelizedFieldName = self::camelize($fieldName);
|
|
|
|
|
|
$getters = array();
|
|
$getters = array();
|
|
$parameters = array();
|
|
$parameters = array();
|
|
-
|
|
|
|
|
|
+
|
|
// prefer method name given in the code option
|
|
// prefer method name given in the code option
|
|
if ($code) {
|
|
if ($code) {
|
|
$getters[] = $code;
|
|
$getters[] = $code;
|
|
@@ -346,7 +340,7 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface
|
|
}
|
|
}
|
|
$getters[] = 'get' . $camelizedFieldName;
|
|
$getters[] = 'get' . $camelizedFieldName;
|
|
$getters[] = 'is' . $camelizedFieldName;
|
|
$getters[] = 'is' . $camelizedFieldName;
|
|
-
|
|
|
|
|
|
+
|
|
foreach ($getters as $getter) {
|
|
foreach ($getters as $getter) {
|
|
if (method_exists($object, $getter)) {
|
|
if (method_exists($object, $getter)) {
|
|
return call_user_func_array(array($object, $getter),$parameters);
|
|
return call_user_func_array(array($object, $getter),$parameters);
|