widen the scope to str_starts_with, str_ends_with

phpstan · Mar 13, 2022 · 46a7c35 · 46a7c35
1 parent 91fd591
commit 46a7c35
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/conf/config.neon b/conf/config.neon
@@ -1179,7 +1179,7 @@ services:
 			- phpstan.dynamicStaticMethodThrowTypeExtension
 
 	-
-		class: PHPStan\Type\Php\StrContainsTypeSpecifyingExtension
+		class: PHPStan\Type\Php\StrContainingTypeSpecifyingExtension
 		tags:
 			- phpstan.typeSpecifier.functionTypeSpecifyingExtension
 

diff --git a/...hp/StrContainsTypeSpecifyingExtension.php → .../StrContainingTypeSpecifyingExtension.php b/...hp/StrContainsTypeSpecifyingExtension.php → .../StrContainingTypeSpecifyingExtension.php
@@ -16,11 +16,19 @@
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\StringType;
 use function count;
+use function in_array;
 use function strtolower;
 
-final class StrContainsTypeSpecifyingExtension implements FunctionTypeSpecifyingExtension, TypeSpecifierAwareExtension
+final class StrContainingTypeSpecifyingExtension implements FunctionTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
 
+	/** @var string[] */
+	private array $strContainingFunctions = [
+		'str_contains',
+		'str_starts_with',
+		'str_ends_with',
+	];
+
 	private TypeSpecifier $typeSpecifier;
 
 	public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
@@ -30,7 +38,7 @@ public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
 
 	public function isFunctionSupported(FunctionReflection $functionReflection, FuncCall $node, TypeSpecifierContext $context): bool
 	{
-		return strtolower($functionReflection->getName()) === 'str_contains'
+		return in_array(strtolower($functionReflection->getName()), $this->strContainingFunctions, true)
 			&& $context->true();
 	}
 

diff --git a/tests/PHPStan/Analyser/data/non-empty-string-str-contains.php b/tests/PHPStan/Analyser/data/non-empty-string-str-contains.php
@@ -45,4 +45,16 @@ public function sayHello(string $s, string $s2, $nonES, $numS, $literalS, $nonEA
 			assertType('int', $i);
 		}
 	}
+
+	public function variants(string $s) {
+		if (str_starts_with($s, ':')) {
+			assertType('non-empty-string', $s);
+		}
+		assertType('string', $s);
+
+		if (str_ends_with($s, ':')) {
+			assertType('non-empty-string', $s);
+		}
+		assertType('string', $s);
+	}
 }