Revert "Add support for contains, startsWith, startsWithLetter and endsWith"

This reverts commit 19b869e.

Author: herndlm

README.md

@@ -69,10 +69,6 @@ This extension specifies types of values passed to:
 * `Assert::methodExists`
 * `Assert::propertyExists`
 * `Assert::isArrayAccessible`
-* `Assert::contains`
-* `Assert::startsWith`
-* `Assert::startsWithLetter`
-* `Assert::endsWith`
 * `Assert::unicodeLetters`
 * `Assert::alpha`
 * `Assert::digits`

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -30,7 +30,6 @@ class AssertTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtensi
 
 	private const ASSERTIONS_RESULTING_IN_NON_EMPTY_STRING = [
 		'stringNotEmpty',
-		'startsWithLetter',
 		'unicodeLetters',
 		'alpha',
 		'digits',
@@ -486,27 +485,6 @@ private static function getExpressionResolvers(): array
 						)
 					);
 				},
-				'contains' => function (Scope $scope, Arg $value, Arg $subString): \PhpParser\Node\Expr {
-					if ($scope->getType($subString->value)->isNonEmptyString()->yes()) {
-						return self::createIsNonEmptyStringExpression([$value]);
-					}
-
-					return self::createIsStringExpression([$value]);
-				},
-				'startsWith' => function (Scope $scope, Arg $value, Arg $prefix): \PhpParser\Node\Expr {
-					if ($scope->getType($prefix->value)->isNonEmptyString()->yes()) {
-						return self::createIsNonEmptyStringExpression([$value]);
-					}
-
-					return self::createIsStringExpression([$value]);
-				},
-				'endsWith' => function (Scope $scope, Arg $value, Arg $suffix): \PhpParser\Node\Expr {
-					if ($scope->getType($suffix->value)->isNonEmptyString()->yes()) {
-						return self::createIsNonEmptyStringExpression([$value]);
-					}
-
-					return self::createIsStringExpression([$value]);
-				},
 				'length' => function (Scope $scope, Arg $value, Arg $length): \PhpParser\Node\Expr {
 					return new BooleanAnd(
 						new \PhpParser\Node\Expr\FuncCall(
@@ -709,17 +687,6 @@ private function arrayOrIterable(
 		);
 	}
 
-	/**
-	 * @param \PhpParser\Node\Arg[] $args
-	 */
-	private static function createIsStringExpression(array $args): \PhpParser\Node\Expr
-	{
-		return new \PhpParser\Node\Expr\FuncCall(
-			new \PhpParser\Node\Name('is_string'),
-			[$args[0]]
-		);
-	}
-
 	/**
 	 * @param \PhpParser\Node\Arg[] $args
 	 */

tests/Type/WebMozartAssert/data/string.php

@@ -7,48 +7,6 @@
 class TestStrings
 {
 
-	/**
-	 * @param non-empty-string $b
-	 */
-	public function contains(string $a, string $b): void
-	{
-		Assert::contains($a, $a);
-		\PHPStan\Testing\assertType('string', $a);
-
-		Assert::contains($a, $b);
-		\PHPStan\Testing\assertType('non-empty-string', $a);
-	}
-
-	/**
-	 * @param non-empty-string $b
-	 */
-	public function startsWith(string $a, string $b): void
-	{
-		Assert::startsWith($a, $a);
-		\PHPStan\Testing\assertType('string', $a);
-
-		Assert::startsWith($a, $b);
-		\PHPStan\Testing\assertType('non-empty-string', $a);
-	}
-
-	public function startsWithLetter(string $a): void
-	{
-		Assert::startsWithLetter($a);
-		\PHPStan\Testing\assertType('non-empty-string', $a);
-	}
-
-	/**
-	 * @param non-empty-string $b
-	 */
-	public function endsWith(string $a, string $b): void
-	{
-		Assert::endsWith($a, $a);
-		\PHPStan\Testing\assertType('string', $a);
-
-		Assert::endsWith($a, $b);
-		\PHPStan\Testing\assertType('non-empty-string', $a);
-	}
-
 	public function length(string $a, string $b): void
 	{
 		Assert::length($a, 0);