Fixes #217: use array_key_exists() for arrays

lstrojny · lstrojny · commit aff829f62e38 · 2021-03-07T01:23:06.000+01:00
diff --git a/src/Functional/Pick.php b/src/Functional/Pick.php
@@ -20,7 +20,7 @@
  * @param ArrayAccess|array $collection
  * @param mixed $index
  * @param mixed $default
- * @param callable $callback Custom function to check if index exists, default function is "isset"
+ * @param callable|null $callback Custom function to check if index exists
  * @return mixed
  * @no-named-arguments
  */
@@ -29,7 +29,7 @@ function pick($collection, $index, $default = null, callable $callback = null)
     InvalidArgumentException::assertArrayAccess($collection, __FUNCTION__, 1);
 
     if ($callback === null) {
-        if (!isset($collection[$index])) {
+        if (!isset($collection[$index]) && (!\is_array($collection) || !\array_key_exists($index, $collection))) {
             return $default;
         }
     } else {
diff --git a/tests/Functional/PickTest.php b/tests/Functional/PickTest.php
@@ -71,6 +71,8 @@ public function testDefaultValue(): void
             pick($this->array_1, 'one', 5),
             'Index does exists, should return the corresponding value'
         );
+
+        self::assertNull(pick($this->array_1, 'null-index', 'default'), 'Will handle null correctly');
     }
 
     public function testCustomCallback(): void
@@ -93,8 +95,10 @@ public function testArrayAccess(): void
         $object = new ArrayObject();
 
         $object['test'] = 5;
+        $object['null'] = null;
 
         self::assertSame(5, pick($object, 'test'), 'Key exists');
+        self::assertNull(pick($object, 'null'), 'Key exists');
         self::assertSame(10, pick($object, 'dummy', 10), 'Key does not exists');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ public function testDefaultValue(): void`
`71`	`71`	`pick($this->array_1, 'one', 5),`
`72`	`72`	`'Index does exists, should return the corresponding value'`
`73`	`73`	`);`
	`74`	`+`
	`75`	`+ self::assertNull(pick($this->array_1, 'null-index', 'default'), 'Will handle null correctly');`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`public function testCustomCallback(): void`
`@@ -93,8 +95,10 @@ public function testArrayAccess(): void`
`93`	`95`	`$object = new ArrayObject();`
`94`	`96`
`95`	`97`	`$object['test'] = 5;`
	`98`	`+ $object['null'] = null;`
`96`	`99`
`97`	`100`	`self::assertSame(5, pick($object, 'test'), 'Key exists');`
	`101`	`+ self::assertNull(pick($object, 'null'), 'Key exists');`
`98`	`102`	`self::assertSame(10, pick($object, 'dummy', 10), 'Key does not exists');`
`99`	`103`	`}`
`100`	`104`	`}`