updates extensions to phpstan v2.1.41

Author: mvhirsch

src/Type/Php/PregMatchParameterOutTypeExtension.php

@@ -13,8 +13,10 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\FunctionParameterOutTypeExtension;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 use function in_array;
 
 final class PregMatchParameterOutTypeExtension implements FunctionParameterOutTypeExtension
@@ -50,7 +52,14 @@ public function getParameterOutTypeFromFunctionCall(FunctionReflection $function
         }
 
         if ($functionReflection->getName() === 'Safe\preg_match') {
-            return $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);
+            $matchedType = $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createYes(), $scope);
+            if ($matchedType === null) {
+                return null;
+            }
+            return TypeCombinator::union(
+                ConstantArrayTypeBuilder::createEmpty()->getArray(),
+                $matchedType,
+            );
         }
         return $this->regexShapeMatcher->matchAllExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);
     }

src/Type/Php/PregMatchTypeSpecifyingExtension.php

@@ -55,10 +55,18 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
             $flagsType = $scope->getType($flagsArg->value);
         }
 
+        if ($context->true() && $context->falsey()) {
+            $wasMatched = TrinaryLogic::createMaybe();
+        } elseif ($context->true()) {
+            $wasMatched = TrinaryLogic::createYes();
+        } else {
+            $wasMatched = TrinaryLogic::createNo();
+        }
+
         if ($functionReflection->getName() === 'Safe\preg_match') {
-            $matchedType = $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createFromBoolean($context->true()), $scope);
+            $matchedType = $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, $wasMatched, $scope);
         } else {
-            $matchedType = $this->regexShapeMatcher->matchAllExpr($patternArg->value, $flagsType, TrinaryLogic::createFromBoolean($context->true()), $scope);
+            $matchedType = $this->regexShapeMatcher->matchAllExpr($patternArg->value, $flagsType, $wasMatched, $scope);
         }
         if ($matchedType === null) {
             return new SpecifiedTypes();