Include the constant name on PcreException message as preffix and fix…

… test
thecodingmachine · Mar 30, 2022 · 847f5b6 · 847f5b6
1 parent 6dd7c22
commit 847f5b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/generator/tests/SpecialCasesTest.php b/generator/tests/SpecialCasesTest.php
@@ -15,7 +15,7 @@ public function testPregReplace()
         require_once __DIR__.'/../../lib/Exceptions/PcreException.php';
 
         $this->expectException(PcreException::class);
-        $this->expectExceptionMessage('PREG_BAD_UTF8_ERROR: Invalid UTF8 character');
+        $this->expectExceptionMessage('PREG_BAD_UTF8_ERROR: Malformed UTF-8 characters, possibly incorrectly encoded');
         preg_replace("/([\s,]+)/u", "foo", "\xc3\x28");
     }
 }
diff --git a/lib/Exceptions/PcreException.php b/lib/Exceptions/PcreException.php
@@ -7,6 +7,15 @@ class PcreException extends \Exception implements SafeExceptionInterface
 {
     public static function createFromPhpError(): self
     {
-        return new self(\preg_last_error_msg(), \preg_last_error());
+        $errorConstantMap = [
+            PREG_INTERNAL_ERROR => 'PREG_INTERNAL_ERROR',
+            PREG_BACKTRACK_LIMIT_ERROR => 'PREG_BACKTRACK_LIMIT_ERROR',
+            PREG_RECURSION_LIMIT_ERROR => 'PREG_RECURSION_LIMIT_ERROR',
+            PREG_BAD_UTF8_ERROR => 'PREG_BAD_UTF8_ERROR',
+            PREG_BAD_UTF8_OFFSET_ERROR => 'PREG_BAD_UTF8_OFFSET_ERROR',
+            PREG_JIT_STACKLIMIT_ERROR => 'PREG_JIT_STACKLIMIT_ERROR',
+        ];
+
+        return new self(($errorConstantMap[\preg_last_error()] ?? 'Unknown Error') . ': ' . \preg_last_error_msg(), \preg_last_error());
     }
 }