matchesAll

Author: staabm

extension.neon

@@ -128,6 +128,11 @@ services:
 		tags:
 			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 
+	-
+		class: PHPStan\Type\Nette\StringsMatchTypeSpecifiyingExtension
+		tags:
+			- phpstan.typeSpecifier.staticMethodTypeSpecifyingExtension
+
 	-
 		class: PHPStan\Type\Nette\StringsReplaceCallbackClosureTypeExtension
 		tags:

src/Type/Nette/StringsMatchTypeSpecifiyingExtension.php

@@ -3,28 +3,20 @@
 namespace PHPStan\Type\Nette;
 
 use Nette\Utils\Strings;
-use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
+use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\TrinaryLogic;
-use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
-use PHPStan\Type\NullType;
 use PHPStan\Type\Php\RegexArrayShapeMatcher;
 use PHPStan\Type\StaticMethodTypeSpecifyingExtension;
-use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
-use function array_key_exists;
-use const PREG_OFFSET_CAPTURE;
-use const PREG_UNMATCHED_AS_NULL;
+use function in_array;
 
-class StringsMatchTypeSpecifiyingExtension implements StaticMethodTypeSpecifyingExtension
+class StringsMatchTypeSpecifiyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
+
 	private RegexArrayShapeMatcher $regexArrayShapeMatcher;
 
 	private TypeSpecifier $typeSpecifier;
@@ -46,7 +38,7 @@ public function getClass(): string
 
 	public function isStaticMethodSupported(MethodReflection $staticMethodReflection, StaticCall $node, TypeSpecifierContext $context): bool
 	{
-		return $context->true() && $staticMethodReflection->getName() === 'match';
+		return $context->true() && in_array($staticMethodReflection->getName(), ['match', 'matchAll'], true);
 	}
 
 	public function specifyTypes(MethodReflection $staticMethodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
@@ -78,4 +70,5 @@ public function specifyTypes(MethodReflection $staticMethodReflection, StaticCal
 
 		return $subjectTypes;
 	}
+
 }

…sMatchDynamicReturnTypeExtensionTest.php …ringsMatchTypeInferenceExtensionTest.phptests/Type/Nette/StringsMatchDynamicReturnTypeExtensionTest.php renamed to tests/Type/Nette/StringsMatchTypeInferenceExtensionTest.php tests/Type/Nette/StringsMatchDynamicReturnTypeExtensionTest.php renamed to tests/Type/Nette/StringsMatchTypeInferenceExtensionTest.php

@@ -4,13 +4,14 @@
 
 use PHPStan\Testing\TypeInferenceTestCase;
 
-class StringsMatchDynamicReturnTypeExtensionTest extends TypeInferenceTestCase
+class StringsMatchTypeInferenceExtensionTest extends TypeInferenceTestCase
 {
 
 	public function dataFileAsserts(): iterable
 	{
 		yield from self::gatherAssertTypes(__DIR__ . '/data/strings-match.php');
 		yield from self::gatherAssertTypes(__DIR__ . '/data/strings-match-74.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/strings-match-subject.php');
 	}
 
 	/**

tests/Type/Nette/data/strings-match-subject.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace StringsMatchSubject;
+
+use Nette\Utils\Strings;
+use function PHPStan\Testing\assertType;
+
+function (string $s): void {
+	if (Strings::match($s, '/foo/')) {
+		assertType("non-falsy-string", $s);
+	} else {
+		assertType("string", $s);
+	}
+	assertType("string", $s);
+
+	$matches = Strings::matchAll($s, '/foo/');
+	if (count($matches) !== 0) {
+		assertType("non-falsy-string", $s);
+	} else {
+		assertType("string", $s);
+	}
+	assertType("string", $s);
+};