Update TypeSpecifier.php

Author: staabm

src/Analyser/TypeSpecifier.php

@@ -331,21 +331,6 @@ public function specifyTypesInCondition(
 				}
 			}
 
-			if (
-				!$context->null()
-				&& $expr->right instanceof FuncCall
-				&& count($expr->right->getArgs()) >= 3
-				&& $expr->right->name instanceof Name
-				&& in_array(strtolower((string) $expr->right->name), ['preg_match'], true)
-				&& IntegerRangeType::fromInterval(0, null)->isSuperTypeOf($leftType)->yes()
-			) {
-				return $this->specifyTypesInCondition(
-					$scope,
-					new Expr\BinaryOp\NotIdentical($expr->right, new ConstFetch(new Name('false'))),
-					$context,
-				)->setRootExpr($expr);
-			}
-
 			if (
 				!$context->null()
 				&& $expr->right instanceof FuncCall
@@ -466,6 +451,21 @@ public function specifyTypesInCondition(
 				}
 			}
 
+			if (
+				!$context->null()
+				&& $expr->right instanceof FuncCall
+			) {
+				$newScope = $scope->filterBySpecifiedTypes($result);
+				$callType = $newScope->getType($expr->right);
+				$newContext = $this->createSpecifierContextReturnType($callType, $context);
+
+				return $this->specifyTypesInCondition(
+					$scope,
+					$expr->right,
+					$newContext,
+				)->setRootExpr($expr);
+			}
+
 			return $result;
 
 		} elseif ($expr instanceof Node\Expr\BinaryOp\Greater) {
@@ -1949,6 +1949,20 @@ private function getTypeSpecifyingExtensionsForType(array $extensions, string $c
 		return array_merge(...$extensionsForClass);
 	}
 
+	private function createSpecifierContextReturnType(
+		Type $contextReturnType,
+		TypeSpecifierContext $context,
+	): TypeSpecifierContext
+	{
+			if ($context->true()) {
+				return TypeSpecifierContext::createTrue($contextReturnType);
+			} elseif ($context->false()) {
+				return TypeSpecifierContext::createFalse($contextReturnType);
+			}
+
+		return $context;
+	}
+
 	public function resolveEqual(Expr\BinaryOp\Equal $expr, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
 	{
 		$expressions = $this->findTypeExpressionsFromBinaryOperation($scope, $expr);