Second version of it::map with keys: Handle 'null', '1' for code and Traversable objects for array

1 files changed, 7 insertions, 2 deletions

diff --git a/it.class b/it.class
index 3846fe5..77c51f7 100644
--- a/it.class
+++ b/it.class
@@ -950,15 +950,20 @@ static function date($format = "", $stamp = null)
  * Iterate over an array, replacing every element by function value or expression
  * @param $code The function or expression to apply. Expression may contain $k for keys and $v for values
  * @param $array The array to iterate over
+ * @param $p['keys'] Only modify elements with given keys (keys can be array or comma separated)
  */
-static function map($code, $array)
+static function map($code, $array, $p = null)
 {
 	static $cache = array();
 
+	if (is_string($code) && it::match('^[\w:]+$', $code) && is_callable($code))
+		$code .= '($v)';
+
 	if (!is_callable($func = $code) && !($func = $cache[$code]))
 		$func = $cache[$code] = create_function('$k,$v', "return $code;");
 
-	foreach ($array as $k => $v)
+	$result = is_array($array) ? $array : iterator_to_array($array);
+	foreach (isset($p['keys']) ? it::filter_keys($array, $p['keys']) : $array as $k => $v)
 		$result[$k] = $func($k, $v);
 
 	return (array)$result;