Merge pull request #6 from kielabokkie/hotfix/array-issue

Fix incorrect concealing of first key of array
kielabokkie · May 23, 2020 · bc7e29b · bc7e29b
2 parents 611d8ce + 5ee9670
commit bc7e29b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Concealer.php b/src/Concealer.php
@@ -48,7 +48,7 @@ public function conceal($input, array $keys = [])
     private function handleCollection($input)
     {
         $output = $input->map(function ($item, $key) {
-            if (in_array($key, $this->keys) === true) {
+            if (in_array($key, $this->keys, true) === true) {
                 return $input[$key] = '********';
             }
 
@@ -75,7 +75,7 @@ private function handleCollection($input)
     private function handleArray($input)
     {
         foreach ($input as $key => $item) {
-            if (in_array($key, $this->keys) === true) {
+            if (in_array($key, $this->keys, true) === true) {
                 $input[$key] = '********';
                 continue;
             }

diff --git a/tests/ConcealerTest.php b/tests/ConcealerTest.php
@@ -199,13 +199,25 @@ public function it_handles_numeric_keys_for_collections(): void
             'password' => new Collection([
                 'test',
                 'secret',
-            ])
+            ]),
+            'test' => new Collection([
+                'test',
+                'secret',
+            ]),
+            'test2' => [
+                'test',
+                'secret',
+            ]
         ]);
 
         $output = $this->concealer->conceal($data);
 
         $this->assertEquals('wouter', $output['username']);
         $this->assertEquals('********', $output['password']);
+        $this->assertEquals('test', $output['test'][0]);
+        $this->assertEquals('secret', $output['test'][1]);
+        $this->assertEquals('test', $output['test2'][0]);
+        $this->assertEquals('secret', $output['test2'][1]);
     }
 
     /** @test */