[JsonType] Fixed issue #5320

Author: Naktibalda

src/Codeception/Util/JsonType.php

@@ -130,7 +130,7 @@ protected function typeComparison($data, $jsonType)
                 continue;
             }
 
-            $regexMatcher = '/:regex\((.*?)\)(?:\|(boolean|integer|double|float|string|array|object|resource|resource \(closed\)|null|unknown type)|$)/';
+            $regexMatcher = '/:regex\(((.).*?\2)\)/';
             $regexes = [];
 
             // Match the string ':regex(' and any characters until a regex delimiter (matches 99.999% use cases) followed by character ')'

tests/unit/Codeception/Util/JsonTypeTest.php

@@ -216,4 +216,27 @@ public function testMatchesArrayReturnedByFetchBoth()
             'b' => 'integer',
         ]));
     }
+
+    public function testRegexFilterWithPrefixedAlternatives()
+    {
+        $jsonType = new JsonType(['test' => null]);
+        $this->assertTrue($jsonType->matches(['test'    => 'null|string:regex(~^(\d\d@):\d\d$~)']));
+        $this->assertNotTrue($jsonType->matches(['test' => 'integer|string:regex(~^(\d\d@):\d\d$~)']));
+
+        $jsonType = new JsonType(['test' => 12345]);
+        $this->assertTrue($jsonType->matches(['test'    => 'integer|null|string:regex(~^(\d\d@):\d\d$~)']));
+    }
+
+    public function testRegexFilterWithPostfixedAlternatives()
+    {
+        $jsonType = new JsonType(['test' => null]);
+        // currently produces a false positive
+        $this->assertNotTrue($jsonType->matches(['test' => 'string:regex(~^(\d\d@):\d\d$~)|integer']));
+        // currently produces a false negative
+        $this->assertTrue($jsonType->matches(['test'    => 'string:regex(~^(\d\d@):\d\d$~)|null']));
+
+        $jsonType = new JsonType(['test' => 12345]);
+        // currently produces a false negative
+        $this->assertTrue($jsonType->matches(['test'    => 'string:regex(~^(\d\d@):\d\d$~)|integer']));
+    }
 }