From 6049009cac01fa0c6e045e57f0b260cdb3cd1600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Gonz=C3=A1lez?= Date: Fri, 7 Mar 2014 19:29:27 +0000 Subject: [PATCH] improving docblock for Set::extract and Set::classicExtract return types --- lib/Cake/Utility/Set.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php index 9c57dc57036..8ace38b0007 100644 --- a/lib/Cake/Utility/Set.php +++ b/lib/Cake/Utility/Set.php @@ -307,7 +307,7 @@ public static function format($data, $format, $keys) { * @param string $path An absolute XPath 2.0 path * @param array $data An array of data to extract from * @param array $options Currently only supports 'flatten' which can be disabled for higher XPath-ness - * @return array An array of matched items + * @return array|mixed|null An array of matched items or the content of a single selected item or null in any of these cases: $path or $data are null, no items found. * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::extract */ public static function extract($path, $data = null, $options = array()) { @@ -532,7 +532,7 @@ public static function matches($conditions, $data = array(), $i = null, $length * * @param array $data Array from where to extract * @param string|array $path As an array, or as a dot-separated string. - * @return array|null Extracted data or null when $data or $path are empty. + * @return array|mixed|null An array of matched items or the content of a single selected item or null in any of these cases: $path or $data are null, no items found. * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::classicExtract */ public static function classicExtract($data, $path = null) {