From bfbfe6fd1978be73a25cbd9ca3afedb64a24e88c Mon Sep 17 00:00:00 2001
From: Daniel Schmelz <daniel@schmelz.org>
Date: Mon, 21 Dec 2020 15:53:57 +0100
Subject: [PATCH 1/4] fix regex backslash

---
 src/Faker/Provider/Base.php      | 15 +++++++++++++--
 test/Faker/Provider/BaseTest.php |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
index 6aa0cc683..7e99b4372 100644
--- a/src/Faker/Provider/Base.php
+++ b/src/Faker/Provider/Base.php
@@ -539,9 +539,20 @@ 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('/(?<!\\\)\./', function() {
+            do {
+                $chr = chr(mt_rand(33, 126));
+            } while ($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
index d01024be1..c34b49338 100644
--- 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']
         ];
     }

From abdfa8e3359996809943da66110cc2075bfd689f Mon Sep 17 00:00:00 2001
From: Daniel Schmelz <daniel@schmelz.org>
Date: Mon, 21 Dec 2020 16:15:05 +0100
Subject: [PATCH 2/4] fix regex backslash

---
 src/Faker/Provider/Base.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
index 7e99b4372..f8aa8c547 100644
--- a/src/Faker/Provider/Base.php
+++ b/src/Faker/Provider/Base.php
@@ -540,14 +540,15 @@ public static function regexify($regex = '')
         $regex = preg_replace_callback('/\\\w/', 'static::randomLetter', $regex);
         $regex = preg_replace_callback('/\\\d/', 'static::randomDigit', $regex);
         //replace . with ascii except backslash
-        $regex = preg_replace_callback('/(?<!\\\)\./', function() {
-            do {
-                $chr = chr(mt_rand(33, 126));
-            } while ($chr === '\\');
+        $regex = preg_replace_callback('/(?<!\\\)\./', function () {
+            $chr = chr(mt_rand(33, 126));
+
+            if ($chr === '\\') {
+                $chr .= '\\';
+            }
 
             return $chr;
         }, $regex);
-
         // remove remaining single backslashes
         $regex = str_replace('\\\\', '[:escaped_backslash:]', $regex);
         $regex = str_replace('\\', '', $regex);

From bcb73067e664d10578143c7331b59e2a49aee208 Mon Sep 17 00:00:00 2001
From: Daniel Schmelz <daniel@schmelz.org>
Date: Mon, 21 Dec 2020 16:35:01 +0100
Subject: [PATCH 3/4] fix regex backslash

---
 src/Faker/Provider/Base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
index f8aa8c547..5f4f7bcde 100644
--- a/src/Faker/Provider/Base.php
+++ b/src/Faker/Provider/Base.php
@@ -541,7 +541,7 @@ public static function regexify($regex = '')
         $regex = preg_replace_callback('/\\\d/', 'static::randomDigit', $regex);
         //replace . with ascii except backslash
         $regex = preg_replace_callback('/(?<!\\\)\./', function () {
-            $chr = chr(mt_rand(33, 126));
+            $chr = static::asciify('*');
 
             if ($chr === '\\') {
                 $chr .= '\\';

From 004a34866e1c1aa4edf20a4a38a6690ab8b5689e Mon Sep 17 00:00:00 2001
From: Daniel Schmelz <daniel@schmelz.org>
Date: Mon, 21 Dec 2020 20:36:07 +0100
Subject: [PATCH 4/4] run make cs

---
 src/Faker/Provider/Base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
index ba59bd74b..753b50314 100644
--- a/src/Faker/Provider/Base.php
+++ b/src/Faker/Provider/Base.php
@@ -531,7 +531,7 @@ public static function regexify($regex = '')
         $regex = preg_replace_callback('/\\\w/', 'static::randomLetter', $regex);
         $regex = preg_replace_callback('/\\\d/', 'static::randomDigit', $regex);
         //replace . with ascii except backslash
-        $regex = preg_replace_callback('/(?<!\\\)\./', function () {
+        $regex = preg_replace_callback('/(?<!\\\)\./', static function () {
             $chr = static::asciify('*');
 
             if ($chr === '\\') {