thanks therealgaxbo

chevere · Feb 10, 2024 · bd637ee · bd637ee
1 parent a3b1991
commit bd637ee
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Regex.php b/src/Regex.php
@@ -33,7 +33,10 @@ public function __construct(
     ) {
         $this->assertPattern();
         $delimiter = $this->pattern[0];
-        $this->noDelimiters = trim($this->pattern, $delimiter);
+        $this->noDelimiters = substr($this->pattern, 1);
+        /** @var int $tailPos */
+        $tailPos = strrpos($this->noDelimiters, $delimiter);
+        $this->noDelimiters = substr($this->noDelimiters, 0, $tailPos);
         $this->noDelimitersNoAnchors = strval(
             preg_replace('#^\^(.*)\$$#', '$1', $this->noDelimiters)
         );

diff --git a/tests/RegexTest.php b/tests/RegexTest.php
@@ -37,6 +37,36 @@ public function testConstruct(): void
         $this->assertSame($pattern, $regex->noDelimitersNoAnchors());
     }
 
+    public function delimiterConflictDataProvider(): array
+    {
+        return [
+            ['abc\/', '/'],
+            ['\/abc\/', '/'],
+            ['abc\/i', '/'],
+            ['\/abc\/i', '/'],
+            ['\/ab🐞c\/i', '/'],
+        ];
+    }
+
+    /**
+     * @dataProvider delimiterConflictDataProvider
+     */
+    public function testDelimiterConflict(string $pattern, string $delimiter): void
+    {
+        $patternAnchors = "^{$pattern}$";
+        $patternDelimitersAnchors = "{$delimiter}{$patternAnchors}{$delimiter}";
+        $regex = new Regex($patternDelimitersAnchors);
+        $this->assertSame($patternDelimitersAnchors, $regex->__toString());
+        $this->assertSame($patternAnchors, $regex->noDelimiters());
+        $this->assertSame($pattern, $regex->noDelimitersNoAnchors());
+        $patternNoAnchors = "{$pattern}";
+        $patternDelimitersAnchors = "{$delimiter}{$patternNoAnchors}{$delimiter}";
+        $regex = new Regex($patternDelimitersAnchors);
+        $this->assertSame($patternDelimitersAnchors, $regex->__toString());
+        $this->assertSame($patternNoAnchors, $regex->noDelimiters());
+        $this->assertSame($pattern, $regex->noDelimitersNoAnchors());
+    }
+
     public function testMatch(): void
     {
         $test = 'Hello World!';