Fix regex dot/backslash issue (#206)

* fix regex backslash * fix regex backslash * fix regex backslash * run make cs
FakerPHP · Dec 21, 2020 · 3328cb9 · 3328cb9
1 parent 830891d
commit 3328cb9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
@@ -530,9 +530,21 @@ public static function regexify($regex = '')
         // replace \d with number and \w with letter and . with ascii
         $regex = preg_replace_callback('/\\\w/', 'static::randomLetter', $regex);
         $regex = preg_replace_callback('/\\\d/', 'static::randomDigit', $regex);
-        $regex = preg_replace_callback('/(?<!\\\)\./', 'static::randomAscii', $regex);
-        // remove remaining backslashes
+        //replace . with ascii except backslash
+        $regex = preg_replace_callback('/(?<!\\\)\./', static function () {
+            $chr = static::asciify('*');
+
+            if ($chr === '\\') {
+                $chr .= '\\';
+            }
+
+            return $chr;
+        }, $regex);
+        // remove remaining single backslashes
+        $regex = str_replace('\\\\', '[:escaped_backslash:]', $regex);
         $regex = str_replace('\\', '', $regex);
+        $regex = str_replace('[:escaped_backslash:]', '\\', $regex);
+
         // phew
         return $regex;
     }

diff --git a/test/Faker/Provider/BaseTest.php b/test/Faker/Provider/BaseTest.php
@@ -339,6 +339,7 @@ public function regexifyDataProvider()
             ['\.\*\?\+', 'escaped characters'],
             ['[.]', 'literal dot in character class'],
             ['.', 'catch-all dot'],
+            ['\\\\', 'escaped backslash'],
             ['[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}', 'complex regex'],
         ];
     }