fix tests

webmozarts · Oct 20, 2024 · 471072b · 471072b
1 parent a211931
commit 471072b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -165,6 +165,7 @@ Method                                              | Description
 `ipv6($value, $message = '')`                       | Check that a string is a valid IPv6
 `email($value, $message = '')`                      | Check that a string is a valid e-mail address
 `notWhitespaceOnly($value, $message = '')`          | Check that a string contains at least one non-whitespace character
+`validRegexPattern($value, $message = '')`          | Check that a string is a valid regular expression pattern
 
 ### File Assertions
 

diff --git a/src/Assert.php b/src/Assert.php
@@ -1242,7 +1242,7 @@ public static function validRegexPattern($value, $message = 'The value %s must b
         if (@\preg_match($value, '') === false) {
             static::reportInvalidArgument(\sprintf(
                 $message,
-                static::valueToString($value)
+                $value
             ));
         }
     }

diff --git a/src/Mixin.php b/src/Mixin.php
@@ -3200,6 +3200,59 @@ public static function allNullOrNotRegex($value, $pattern, $message = '')
         }
     }
 
+    /**
+     * @psalm-pure
+     *
+     * @param string|null $value
+     * @param string      $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function nullOrValidRegexPattern($value, $message = 'The value %s must be a valid regex pattern.')
+    {
+        null === $value || static::validRegexPattern($value, $message);
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string> $value
+     * @param string           $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allValidRegexPattern($value, $message = 'The value %s must be a valid regex pattern.')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            static::validRegexPattern($entry, $message);
+        }
+    }
+
+    /**
+     * @psalm-pure
+     *
+     * @param iterable<string|null> $value
+     * @param string                $message
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function allNullOrValidRegexPattern($value, $message = 'The value %s must be a valid regex pattern.')
+    {
+        static::isIterable($value);
+
+        foreach ($value as $entry) {
+            null === $entry || static::validRegexPattern($entry, $message);
+        }
+    }
+
     /**
      * @psalm-pure
      *
@@ -5207,57 +5260,4 @@ public static function allNullOrThrows($expression, $class = 'Exception', $messa
             null === $entry || static::throws($entry, $class, $message);
         }
     }
-
-    /**
-     * @psalm-pure
-     *
-     * @param string|null $value
-     * @param string      $message
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function nullOrValidRegexPattern($value, $message = '')
-    {
-        null === $value || static::validRegexPattern($value, $message);
-    }
-
-    /**
-     * @psalm-pure
-     *
-     * @param iterable<string> $value
-     * @param string           $message
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function allValidRegexPattern($value, $message = '')
-    {
-        static::isIterable($value);
-
-        foreach ($value as $entry) {
-            static::validRegexPattern($entry, $message);
-        }
-    }
-
-    /**
-     * @psalm-pure
-     *
-     * @param iterable<string|null> $value
-     * @param string                $message
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function allNullOrValidRegexPattern($value, $message = '')
-    {
-        static::isIterable($value);
-
-        foreach ($value as $entry) {
-            null === $entry || static::validRegexPattern($entry, $message);
-        }
-    }
 }
diff --git a/tests/AssertTest.php b/tests/AssertTest.php
@@ -597,9 +597,9 @@ public function getTests()
             array('uniqueValues', array(array(123, '123')), false),
             array('validRegexPattern', array('/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/'), true),
             array('validRegexPattern', array('/^\(\d{3}\) \d{3}-\d{4}$/'), true),
-            array('validRegexPattern', array('/^https?:\/\/[^\s/$.?#].[^\s]*$/i'), true),
+            array('validRegexPattern', array('/^https?:\/\/[^\s\/$.?#].[^\s]*$/i'), true),
             array('validRegexPattern', array('/^(abc/'), false), // Unclosed parenthesis
-            array('validRegexPattern', array('/[a-z-]/'), false), // Improper character class
+            array('validRegexPattern', array('/\p{Foo}/'), false), // Improper Unicode category
             array('validRegexPattern', array('/(?:abc)\1/'), false), // Backreference to non-capturing group
         );
     }