From 9ee84fd515e95c4b78bf59ffd4c7f5971b8904ce Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Mon, 2 Jul 2018 13:53:59 +1200 Subject: [PATCH 1/2] MINOR: DataObject->fieldLabels() will only return an array --- src/ORM/DataObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php index d66a25d2b..5ae255730 100644 --- a/src/ORM/DataObject.php +++ b/src/ORM/DataObject.php @@ -3495,7 +3495,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * * @param boolean $includerelations a boolean value to indicate if the labels returned include relation fields * - * @return array|string Array of all element labels if no argument given, otherwise the label of the field + * @return array Array of all element labels if no argument given, otherwise the label of the field */ public function fieldLabels($includerelations = true) { From fbf30ee7475b894274431d413601ca933de9e3a5 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Wed, 4 Jul 2018 10:55:20 +1200 Subject: [PATCH 2/2] Message reflect previous return type change --- src/ORM/DataObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php index 5ae255730..13618cf1d 100644 --- a/src/ORM/DataObject.php +++ b/src/ORM/DataObject.php @@ -3495,7 +3495,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * * @param boolean $includerelations a boolean value to indicate if the labels returned include relation fields * - * @return array Array of all element labels if no argument given, otherwise the label of the field + * @return array Array of all element labels */ public function fieldLabels($includerelations = true) {