Fix consecutive _ in like

Author: GromNaN

src/Query/Builder.php

@@ -944,7 +944,7 @@ protected function compileWheres(): array
                 $where['operator'] = strtolower($where['operator']);
 
                 // Convert aliased operators
-                if (array_key_exists($where['operator'], $this->conversion)) {
+                if (isset($this->conversion[$where['operator']])) {
                     $where['operator'] = $this->conversion[$where['operator']];
                 }
             }
@@ -1036,20 +1036,30 @@ protected function compileWhereBasic(array $where): array
 
         // Replace like with a Regex instance.
         if (in_array($operator, ['like', 'not like'])) {
-            // Convert % and _ to regex, and unescape \% and \_
             $regex = preg_replace(
-                ['#(^|[^\\\])%#', '#(^|[^\\\])_#', '#\\\\\\\(%|_)#'],
+                [
+                    // Unescaped % are converted to .*
+                    // Group consecutive %
+                    '#(^|[^\\\])%+#',
+                    // Unescaped _ are converted to .
+                    // Use positive lookahead to replace consecutive _
+                    '#(?<=^|[^\\\\])_#',
+                    // Escaped \% or \_ are unescaped
+                    '#\\\\\\\(%|_)#',
+                ],
                 ['$1.*', '$1.', '$1'],
+                // Escape any regex reserved characters, so they are matched
+                // All backslashes are converted to \\, which are needed in matching regexes.
                 preg_quote($value),
             );
             $value = new Regex('^'.$regex.'$', 'i');
 
-            // For inverse like operations, we can just use the $not operator and pass it a Regex instance.
+            // For inverse like operations, we can just use the $not operator with the Regex
             $operator = $operator === 'like' ? '=' : 'not';
         }
 
         // Manipulate regex operations.
-        if (in_array($operator, ['regex', 'not regex'])) {
+        elseif (in_array($operator, ['regex', 'not regex'])) {
             // Automatically convert regular expression strings to Regex objects.
             if (is_string($value)) {
                 // Detect the delimiter and validate the preg pattern
@@ -1070,7 +1080,7 @@ protected function compileWhereBasic(array $where): array
                 $value = new Regex($regstr, $flags);
             }
 
-            // For inverse regex operations, we can just use the $not operator and pass it a Regex instance.
+            // For inverse regex operations, we can just use the $not operatorwith the Regex
             $operator = $operator === 'regex' ? '=' : 'not';
         }
 

tests/Query/BuilderTest.php

@@ -601,12 +601,12 @@ function (Builder $builder) {
 
         yield 'where like %' => [
             ['find' => [['name' => new Regex('^.*ac.*me.*$', 'i')], []]],
-            fn (Builder $builder) => $builder->where('name', 'like', '%ac%me%'),
+            fn (Builder $builder) => $builder->where('name', 'like', '%ac%%me%'),
         ];
 
         yield 'where like _' => [
-            ['find' => [['name' => new Regex('^.ac.me.$', 'i')], []]],
-            fn (Builder $builder) => $builder->where('name', 'like', '_ac_me_'),
+            ['find' => [['name' => new Regex('^.ac..me.$', 'i')], []]],
+            fn (Builder $builder) => $builder->where('name', 'like', '_ac__me_'),
         ];
 
         $regex = new Regex('^acme$', 'si');

tests/QueryTest.php

@@ -70,6 +70,21 @@ public function testAndWhere(): void
         $this->assertCount(2, $users);
     }
 
+    public function testRegexp(): void
+    {
+        User::create(['name' => 'Simple', 'company' => 'acme']);
+        User::create(['name' => 'With slash', 'company' => 'oth/er']);
+
+        $users = User::where('company', 'regexp', '/^acme$/')->get();
+        $this->assertCount(1, $users);
+
+        $users = User::where('company', 'regexp', '/^ACME$/i')->get();
+        $this->assertCount(1, $users);
+
+        $users = User::where('company', 'regexp', '/^oth\/er$/')->get();
+        $this->assertCount(1, $users);
+    }
+
     public function testLike(): void
     {
         $users = User::where('name', 'like', '%doe')->get();
@@ -83,6 +98,12 @@ public function testLike(): void
 
         $users = User::where('name', 'like', 't%')->get();
         $this->assertCount(1, $users);
+
+        $users = User::where('name', 'like', 'j___ doe')->get();
+        $this->assertCount(2, $users);
+
+        $users = User::where('name', 'like', '_oh_ _o_')->get();
+        $this->assertCount(1, $users);
     }
 
     public function testNotLike(): void