Add inline assertions for non-empty preg_match patterns

Signed-off-by: George Steel <[email protected]>
laminas · Oct 9, 2023 · 5062ef1 · 5062ef1
1 parent ec0cf50
commit 5062ef1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="src/Exception/ExtensionNotLoadedException.php">
     <UnusedClass>
       <code>ExtensionNotLoadedException</code>
@@ -533,9 +533,6 @@
     <MixedArgument>
       <code><![CDATA[$options['locale']]]></code>
     </MixedArgument>
-    <PossiblyFalseArgument>
-      <code>$lastStringGroup</code>
-    </PossiblyFalseArgument>
   </file>
   <file src="src/Validator/IsInt.php">
     <DocblockTypeContradiction>
@@ -560,8 +557,6 @@
       <code><![CDATA[$options['allow_possible']]]></code>
       <code><![CDATA[$options['allowed_types']]]></code>
       <code><![CDATA[$options['country']]]></code>
-      <code>$valueNoCountry</code>
-      <code>$valueNoCountry</code>
     </MixedArgument>
     <MixedAssignment>
       <code>static::$phone[$code]</code>

diff --git a/src/Validator/IsFloat.php b/src/Validator/IsFloat.php
@@ -18,6 +18,7 @@
 use function is_float;
 use function is_int;
 use function is_scalar;
+use function is_string;
 use function preg_match;
 use function preg_quote;
 use function str_replace;
@@ -237,6 +238,12 @@ public function isValid($value)
             $this->wrapper->substr($value, 0 - $groupSize) :
             $value;
 
+        assert(is_string($lastStringGroup));
+        assert($lastStringGroup !== '');
+        assert($lnumSearch !== '');
+        assert($dnumSearch !== '');
+        assert($expDnumSearch !== '');
+
         if (
             (preg_match($lnumSearch, $unGroupedValue)
             || preg_match($dnumSearch, $unGroupedValue)

diff --git a/src/Validator/PhoneNumber.php b/src/Validator/PhoneNumber.php
@@ -8,6 +8,7 @@
 use Traversable;
 
 use function array_key_exists;
+use function assert;
 use function file_exists;
 use function in_array;
 use function is_scalar;
@@ -226,6 +227,7 @@ public function isValid($value = null, $context = null)
          *   2) International double-O prefix
          *   3) Bare country prefix
          */
+        $valueNoCountry = null;
         if (0 === strpos((string) $value, '+' . $countryPattern['code'])) {
             $valueNoCountry = substr((string) $value, $codeLength + 1);
         } elseif (0 === strpos((string) $value, '00' . $countryPattern['code'])) {
@@ -236,6 +238,7 @@ public function isValid($value = null, $context = null)
 
         // check against allowed types strict match:
         foreach ($countryPattern['patterns']['national'] as $type => $pattern) {
+            assert($pattern !== '');
             if (in_array($type, $this->allowedTypes, true)) {
                 // check pattern:
                 if (preg_match($pattern, (string) $value)) {
@@ -252,6 +255,7 @@ public function isValid($value = null, $context = null)
         // check for possible match:
         if ($this->allowPossible()) {
             foreach ($countryPattern['patterns']['possible'] as $type => $pattern) {
+                assert($pattern !== '');
                 if (in_array($type, $this->allowedTypes, true)) {
                     // check pattern:
                     if (preg_match($pattern, (string) $value)) {