add more tests

yiisoft · May 20, 2024 · ff4a7fa · ff4a7fa
1 parent 80eb301
commit ff4a7fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/ArrayHelper.php b/src/ArrayHelper.php
@@ -111,10 +111,14 @@ public static function toArray(mixed $object, array $properties = [], bool $recu
                      * @var Closure|string $name
                      */
                     foreach ($properties[$className] as $key => $name) {
+                        if ($name instanceof Closure) {
+                            $result[$key] = $name($object);
+                            continue;
+                        }
                         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);
                         }
                     }
 

diff --git a/tests/ArrayHelper/GetValueTest.php b/tests/ArrayHelper/GetValueTest.php
@@ -102,6 +102,13 @@ public function testGetValueByMatcher(): void
 
         $taggedPost = ArrayHelper::getValue($posts, fn ($post) => isset($post->tag));
         $this->assertEquals('hello test', $taggedPost->title);
+
+        $default = ArrayHelper::getValue([], fn ($post) => isset($post->tag), 'default');
+        $this->assertEquals($default, 'default');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Matcher cannot be applied to an object');
+        $taggedPost = ArrayHelper::getValue(new StaticObject(), fn ($post) => isset($post->tag));
     }
 
     public function dataProviderGetValueByPathFromArray(): array