Revert "Implement value retrieval by matcher"

This reverts commit a4e40b3.

Author: yus-ham

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 3.1.1 under development
 
-- New #142: Add `ArrayHelper::find()`, `ArrayHelper::findKey()`, `ArrayHelper::findAny()` and `ArrayHelper::findAll()` method for value retrieval or checks by a predicate function (@yus-ham)
+- New #142: Add `ArrayHelper::find()`, `ArrayHelper::findKey()`, `ArrayHelper::findAny()` and `ArrayHelper::findAll()` methods for value retrieval or checks by a predicate function (@yus-ham)
 - Enh #156: Improve psalm types in `ArrayHelper::getObjectVars()`, `ArrayableInterface`, `ArrayableTrait` and 
   `ArrayAccessTrait` (@vjik)
 

src/ArrayHelper.php

@@ -108,13 +108,13 @@ public static function toArray(mixed $object, array $properties = [], bool $recu
                     $result = [];
                     /**
                      * @var int|string $key
-                     * @var Closure|string $name
+                     * @var string $name
                      */
                     foreach ($properties[$className] as $key => $name) {
                         if (is_int($key)) {
-                            $result[(string)$name] = $object->$name;
+                            $result[$name] = $object->$name;
                         } else {
-                            $result[$key] = $name instanceof Closure ? $name($object) : self::getValue($object, $name);
+                            $result[$key] = self::getValue($object, $name);
                         }
                     }
 
@@ -183,9 +183,9 @@ public static function parametrizedMerge(array $arrays, ?int $depth): array
      * // Working with object:
      * $username = \Yiisoft\Arrays\ArrayHelper::getValue($user, 'username');
      *
-     * // Retrieve the value by matcher function:
-     * $firstActiveMember = \Yiisoft\Arrays\ArrayHelper::getValue($users, function ($user, $key) {
-     *     return $user->type === 'member' && $user->isActive;
+     * // Working with anonymous function:
+     * $fullName = \Yiisoft\Arrays\ArrayHelper::getValue($user, function ($user, $defaultValue) {
+     *     return $user->firstName . ' ' . $user->lastName;
      * });
      *
      * // Using an array of keys to retrieve the value:
@@ -194,22 +194,23 @@ public static function parametrizedMerge(array $arrays, ?int $depth): array
      *
      * @param array|object $array Array or object to extract value from.
      * @param array|Closure|float|int|string $key Key name of the array element,
-     * an array of keys, object property name, object method like `getName()` or a callable. The callable function signature should be:
-     * `function($value, $key)`.
+     * an array of keys, object property name, object method like `getName()`, or an anonymous function
+     * returning the value. The anonymous function signature should be:
+     * `function($array, $defaultValue)`.
      * @param mixed $default The default value to be returned if the specified array key does not exist. Not used when
      * getting value from an object.
      *
      * @psalm-param ArrayKey|Closure $key
      *
-     * @return mixed The value of the element if found or the return value of callable is truthy, default value otherwise.
+     * @return mixed The value of the element if found, default value otherwise.
      */
     public static function getValue(
         array|object $array,
         array|Closure|float|int|string $key,
         mixed $default = null
     ): mixed {
         if ($key instanceof Closure) {
-            return self::getValueByMatcher($array, $key, $default);
+            return $key($array, $default);
         }
 
         if (is_array($key)) {
@@ -268,20 +269,6 @@ private static function getRootValue(mixed $array, float|int|string $key, mixed
         return $default;
     }
 
-    private static function getValueByMatcher(
-        array $array,
-        Closure $match,
-        mixed $default = null
-    ): mixed {
-        foreach ($array as $key => $value) {
-            if ($match($value, $key)) {
-                return $value;
-            }
-        }
-
-        return $default;
-    }
-
     /**
      * Retrieves the value of an array element or object property with the given key or property name.
      * If the key does not exist in the array or object, the default value will be returned instead.
@@ -790,7 +777,7 @@ public static function index(
                     $lastArray[] = $element;
                 }
             } else {
-                $value = $key instanceof Closure ? $key($element) : self::getValue($element, $key);
+                $value = self::getValue($element, $key);
                 if ($value !== null) {
                     $lastArray[self::normalizeArrayKey($value)] = $element;
                 }
@@ -852,11 +839,11 @@ public static function getColumn(iterable $array, Closure|string $name, bool $ke
         $result = [];
         if ($keepKeys) {
             foreach ($array as $k => $element) {
-                $result[$k] = $name instanceof Closure ? $name($element) : self::getValue($element, $name);
+                $result[$k] = self::getValue($element, $name);
             }
         } else {
             foreach ($array as $element) {
-                $result[] = $name instanceof Closure ? $name($element) : self::getValue($element, $name);
+                $result[] = self::getValue($element, $name);
             }
         }
 
@@ -917,8 +904,8 @@ public static function map(
             if ($from instanceof Closure || $to instanceof Closure || !is_array($array)) {
                 $result = [];
                 foreach ($array as $element) {
-                    $key = (string)($from instanceof Closure ? $from($element) : self::getValue($element, $from));
-                    $result[$key] = $to instanceof Closure ? $to($element) : self::getValue($element, $to);
+                    $key = (string)self::getValue($element, $from);
+                    $result[$key] = self::getValue($element, $to);
                 }
 
                 return $result;
@@ -929,9 +916,9 @@ public static function map(
 
         $result = [];
         foreach ($array as $element) {
-            $groupKey = (string)($group instanceof Closure ? $group($element) : self::getValue($element, $group));
-            $key = (string)($from instanceof Closure ? $from($element) : self::getValue($element, $from));
-            $result[$groupKey][$key] = $to instanceof Closure ? $to($element) : self::getValue($element, $to);
+            $groupKey = (string)self::getValue($element, $group);
+            $key = (string)self::getValue($element, $from);
+            $result[$groupKey][$key] = self::getValue($element, $to);
         }
 
         return $result;

tests/ArrayHelper/GetValueTest.php

@@ -53,6 +53,11 @@ private function commonDataProviderFromArray(): array
             ['name', 'test'],
             ['noname', null],
             ['noname', 'test', 'test'],
+            [
+                static fn ($array, $defaultValue) => $array['date'] . $defaultValue,
+                '31-12-2113test',
+                'test',
+            ],
             [['version', 2], 'two'],
             [['version', 2.0], 'two'],
             [42.7, 500],
@@ -84,26 +89,6 @@ public function testGetValueFromArray($key, $expected, $default = null): void
         $this->assertEquals($expected, ArrayHelper::getValue($this->array, $key, $default));
     }
 
-    public function testGetValueByMatcher(): void
-    {
-        $users = [
-            ['name' => 'Cebe', 'status' => 'active'],
-            ['name' => 'John', 'status' => 'not active'],
-        ];
-
-        $activeUser = ArrayHelper::getValue($users, fn ($user) => $user['status'] === 'active');
-        $this->assertEquals('Cebe', $activeUser['name']);
-
-
-        $posts = [
-            (object)['title' => 'hello world'],
-            (object)['title' => 'hello test', 'tag' => 'test'],
-        ];
-
-        $taggedPost = ArrayHelper::getValue($posts, fn ($post) => isset($post->tag));
-        $this->assertEquals('hello test', $taggedPost->title);
-    }
-
     public function dataProviderGetValueByPathFromArray(): array
     {
         return array_merge($this->commonDataProviderFromArray(), [