Allow Hash::remove() to remove from ArrayAccess objects

cakephp · Jan 29, 2024 · 18c87fd · 18c87fd
1 parent 02f7c1e
commit 18c87fd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
@@ -413,7 +413,7 @@ public static function remove(array $data, string $path): array
 
         foreach ($data as $k => $v) {
             $match = static::_matchToken($k, $token);
-            if ($match && is_array($v)) {
+            if ($match && (is_array($v) || $v instanceof ArrayAccess)) {
                 if ($conditions) {
                     if (static::_matches($v, $conditions)) {
                         if ($nextPath !== '') {

diff --git a/tests/TestCase/Utility/HashTest.php b/tests/TestCase/Utility/HashTest.php
@@ -2146,6 +2146,31 @@ public function testRemoveMulti(): void
         $this->assertSame($expected, $result);
     }
 
+    public function testRemoveArrayAccess(): void
+    {
+        $testObject = new ArrayObject([
+            'name' => 'about',
+            'vars' => ['title' => 'page title'],
+        ]);
+
+        $a = [
+            'pages' => [
+                0 => ['name' => 'main'],
+                1 => $testObject,
+            ],
+        ];
+
+        $result = Hash::remove($a, 'pages.1.vars');
+        $expected = [
+            'pages' => [
+                0 => ['name' => 'main'],
+                1 => $testObject,
+            ],
+        ];
+        $this->assertSame($expected, $result);
+        $this->assertSame(['name' => 'about'], $testObject->getArrayCopy());
+    }
+
     /**
      * testCheck method
      */