optimize

Author: michalsn

system/Helpers/Array/ArrayHelper.php

@@ -50,13 +50,22 @@ public static function dotSearch(string $index, array $array)
      */
     private static function convertToArray(string $index): array
     {
+        $trimmed = rtrim($index, '* ');
+
+        if ($trimmed === '') {
+            return [];
+        }
+
+        // Fast path: no escaped dots, skip the regex entirely.
+        if (! str_contains($trimmed, '\\.')) {
+            return array_values(array_filter(
+                explode('.', $trimmed),
+                static fn ($s): bool => $s !== '',
+            ));
+        }
+
         // See https://regex101.com/r/44Ipql/1
-        $segments = preg_split(
-            '/(?<!\\\\)\./',
-            rtrim($index, '* '),
-            0,
-            PREG_SPLIT_NO_EMPTY,
-        );
+        $segments = preg_split('/(?<!\\\\)\./', $trimmed, 0, PREG_SPLIT_NO_EMPTY);
 
         return array_map(
             static fn ($key): string => str_replace('\.', '.', $key),

tests/system/Helpers/Array/ArrayHelperDotModifyTest.php

@@ -96,6 +96,16 @@ public static function provideDotKeyExists(): iterable
                 'array'    => ['user' => ['code' => '0']],
                 'expected' => true,
             ],
+            'escaped dot in key' => [
+                'index'    => 'config.api\.version',
+                'array'    => ['config' => ['api.version' => 'v1']],
+                'expected' => true,
+            ],
+            'escaped dot key does not exist' => [
+                'index'    => 'config.api\.version',
+                'array'    => ['config' => ['api' => ['version' => 'v1']]],
+                'expected' => false,
+            ],
         ];
     }
 
@@ -403,6 +413,24 @@ public function testDotExceptSupportsEndingWildcard(): void
         $this->assertSame($expected, ArrayHelper::dotExcept($array, 'user.*'));
     }
 
+    public function testDotExceptWithEscapedDotKey(): void
+    {
+        $array = [
+            'config' => [
+                'api.version' => 'v1',
+                'region'      => 'eu',
+            ],
+        ];
+
+        $expected = [
+            'config' => [
+                'region' => 'eu',
+            ],
+        ];
+
+        $this->assertSame($expected, ArrayHelper::dotExcept($array, 'config.api\.version'));
+    }
+
     public function testDotOnlyWithSingleWildcardReturnsWholeArray(): void
     {
         $array = [

tests/system/Helpers/ArrayHelperTest.php

@@ -480,6 +480,11 @@ public static function provideDotArrayHas(): iterable
                 'data'     => ['user' => ['score' => 0]],
                 'expected' => true,
             ],
+            'escaped dot in key' => [
+                'index'    => 'config.api\.version',
+                'data'     => ['config' => ['api.version' => 'v1']],
+                'expected' => true,
+            ],
         ];
     }