Improve string asserts that assume some othe property besides being a…

… non-empty-string

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -757,12 +757,22 @@ private function getExpressionResolvers(): array
 			];
 
 			foreach (['contains', 'startsWith', 'endsWith'] as $name) {
-				$this->resolvers[$name] = function (Scope $scope, Arg $value, Arg $subString) use ($name): array {
+				$this->resolvers[$name] = static function (Scope $scope, Arg $value, Arg $subString) use ($name): array {
 					if ($scope->getType($subString->value)->isNonEmptyString()->yes()) {
 						return self::createIsNonEmptyStringAndSomethingExprPair($name, [$value, $subString]);
 					}
 
-					return [$this->resolvers['string']($scope, $value), null];
+					$expr = new FuncCall(
+						new Name('is_string'),
+						[$value]
+					);
+
+					$rootExpr = new BooleanAnd(
+						$expr,
+						new FuncCall(new Name('FAUX_FUNCTION_ ' . $name), [$value, $subString])
+					);
+
+					return [$expr, $rootExpr];
 				};
 			}
 

tests/Type/WebMozartAssert/ImpossibleCheckTypeMethodCallRuleTest.php

@@ -105,6 +105,10 @@ public function testExtension(): void
 				'Call to static method Webmozart\Assert\Assert::isInstanceOf() with Exception and class-string<Exception> will always evaluate to true.',
 				119,
 			],
+			[
+				'Call to static method Webmozart\Assert\Assert::startsWith() with \'value\' and string will always evaluate to true.',
+				126,
+			],
 		]);
 	}
 

tests/Type/WebMozartAssert/data/impossible-check.php

@@ -119,6 +119,14 @@ public function testInstanceOfClassString(\Exception $e, string $name): void
 		Assert::isInstanceOf($e, $name);
 	}
 
+	public function testStartsWith(string $a): void
+	{
+		Assert::startsWith("value", "val");
+		Assert::startsWith("value", $a);
+		Assert::startsWith("value", $a);
+		Assert::startsWith("value", "bix");
+	}
+
 }
 
 interface Bar {};

tests/Type/WebMozartAssert/data/string.php

@@ -188,4 +188,11 @@ public function notWhitespaceOnly(string $a): void
 		assertType('non-empty-string', $a);
 	}
 
+	public function testStartsWithMixedHaystack($haystack, string $a): void
+	{
+		assertType('mixed', $haystack);
+		Assert::startsWith($haystack, $a);
+		assertType('string', $haystack);
+	}
+
 }