Optimize DatabasePresenceVerifier

Author: GromNaN

src/Query/Builder.php

@@ -1075,8 +1075,6 @@ protected function compileWhereBasic(array $where): array
                 $flags = end($e);
                 // Extract the regex string between the delimiters
                 $regstr = substr($value, 1, -1 - strlen($flags));
-                // Unescape forward slashes
-                $regstr = stripslashes($regstr);
                 $value = new Regex($regstr, $flags);
             }
 

src/Validation/DatabasePresenceVerifier.php

@@ -2,6 +2,8 @@
 
 namespace Jenssegers\Mongodb\Validation;
 
+use MongoDB\BSON\Regex;
+
 class DatabasePresenceVerifier extends \Illuminate\Validation\DatabasePresenceVerifier
 {
     /**
@@ -17,7 +19,7 @@ class DatabasePresenceVerifier extends \Illuminate\Validation\DatabasePresenceVe
      */
     public function getCount($collection, $column, $value, $excludeId = null, $idColumn = null, array $extra = [])
     {
-        $query = $this->table($collection)->where($column, 'regex', '/'.preg_quote($value).'/i');
+        $query = $this->table($collection)->where($column, new Regex(preg_quote($value), '/i'));
 
         if ($excludeId !== null && $excludeId != 'NULL') {
             $query->where($idColumn ?: 'id', '<>', $excludeId);

tests/Query/BuilderTest.php

@@ -635,9 +635,9 @@ function (Builder $builder) {
             fn (Builder $builder) => $builder->where('name', 'regex', '#^acme$#si'),
         ];
 
-        yield 'where regex with escaped forward slash' => [
-            ['find' => [['name' => new Regex('ac/me', '')], []]],
-            fn (Builder $builder) => $builder->where('name', 'regex', '/ac\/me/'),
+        yield 'where regex with escaped characters' => [
+            ['find' => [['name' => new Regex('a\.c\/m\+e', '')], []]],
+            fn (Builder $builder) => $builder->where('name', 'regex', '/a\.c\/m\+e/'),
         ];
 
         yield 'where not regex' => [