Merge pull request #67 from TheDragonCode/3.x

Fixed handling of boolean values
TheDragonCode · May 23, 2023 · c8a4bcb · c8a4bcb
2 parents 5796aa0 + b574f25
commit c8a4bcb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/Concerns/Arrayable.php b/src/Concerns/Arrayable.php
@@ -34,7 +34,7 @@ protected function arrayMap(array $values, callable $callback): array
                 return $value;
             })
             ->flatten()
-            ->filter(static fn ($value) => ! empty($value) || is_numeric($value))
+            ->filter(static fn ($value) => ! empty($value) || is_numeric($value) || is_bool($value))
             ->map($callback)
             ->values()
             ->toArray();

diff --git a/src/Support/Key.php b/src/Support/Key.php
@@ -24,7 +24,11 @@ public function get(string $separator, ArrayObject|array|DragonArrayable|Illumin
 
     protected function hash(array $values, bool $hash = true): array
     {
-        return $this->arrayMap($values, static fn ($value) => $hash ? md5((string) $value) : (string) $value);
+        return $this->arrayMap($values, static function (mixed $value) use ($hash) {
+            $value = is_bool($value) ? (int) $value : $value;
+
+            return $hash ? md5((string) $value) : (string) $value;
+        });
     }
 
     protected function compile(array $values, string $separator): string

diff --git a/tests/Support/KeyTest.php b/tests/Support/KeyTest.php
@@ -58,6 +58,15 @@ public function testArray()
         $this->assertSame($expected, $key);
     }
 
+    public function testBoolean()
+    {
+        $key = Key::get(':', [true, false]);
+
+        $expected = 'c4ca4238a0b923820dcc509a6f75849b:cfcd208495d565ef66e7dff9f98764da';
+
+        $this->assertSame($expected, $key);
+    }
+
     public function testCombine()
     {
         $key = Key::get(':', [1, 'Foo', [['Bar', 'Baz']]]);
@@ -109,9 +118,9 @@ public function testMultiObjectArrays()
 
     public function testEmpties()
     {
-        $key = Key::get(':', [null, '', 0, []]);
+        $key = Key::get(':', [null, '', 0, [], false]);
 
-        $expected = 'cfcd208495d565ef66e7dff9f98764da';
+        $expected = 'cfcd208495d565ef66e7dff9f98764da:cfcd208495d565ef66e7dff9f98764da';
 
         $this->assertSame($expected, $key);
     }