Improve assert for contains / startsWith / endsWith

Author: kamil-zacek

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -754,18 +754,17 @@ private function getExpressionResolvers(): array
 						)
 					);
 				},
+				'contains' => static function (Scope $scope, Arg $value, Arg $subString): array {
+					return self::createContainsResolver($scope, $value, $subString);
+				},
+				'startsWith' => static function (Scope $scope, Arg $value, Arg $subString): array {
+					return self::createStartsWithResolver($scope, $value, $subString);
+				},
+				'endsWith' => static function (Scope $scope, Arg $value, Arg $subString): array {
+					return self::createEndsWithResolver($scope, $value, $subString);
+				},
 			];
 
-			foreach (['contains', 'startsWith', 'endsWith'] as $name) {
-				$this->resolvers[$name] = 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];
-				};
-			}
-
 			$assertionsResultingAtLeastInNonEmptyString = [
 				'startsWithLetter',
 				'unicodeLetters',
@@ -1022,4 +1021,143 @@ private function specifyRootExprIfSet(?Expr $rootExpr, SpecifiedTypes $specified
 		);
 	}
 
+	/**
+	 * @return array{Expr, Expr}
+	 */
+	private static function createContainsResolver(Scope $scope, Arg $value, Arg $subString): array
+	{
+		$stringExpr = $scope->getType($subString->value)->isNonEmptyString()->yes()
+			? new BooleanAnd(
+				new FuncCall(
+					new Name('is_string'),
+					[$value]
+				),
+				new NotIdentical(
+					$value->value,
+					new String_('')
+				)
+			)
+			: new FuncCall(
+				new Name('is_string'),
+				[$value]
+			);
+
+		$expr = new BooleanOr(
+			$stringExpr,
+			new BooleanAnd(
+				$stringExpr,
+				new GreaterOrEqual(
+					new FuncCall(
+						new Name('strpos'),
+						[$value]
+					),
+					new LNumber(0)
+				)
+			)
+		);
+
+		$rootExpr = new BooleanAnd(
+			$expr,
+			new FuncCall(new Name('FAUX_FUNCTION_ contains'), [$value, $subString])
+		);
+
+		return [$expr, $rootExpr];
+	}
+
+	/**
+	 * @return array{Expr, Expr}
+	 */
+	private static function createStartsWithResolver(Scope $scope, Arg $value, Arg $subString): array
+	{
+		$stringExpr = $scope->getType($subString->value)->isNonEmptyString()->yes()
+			? new BooleanAnd(
+				new FuncCall(
+					new Name('is_string'),
+					[$value]
+				),
+				new NotIdentical(
+					$value->value,
+					new String_('')
+				)
+			)
+			: new FuncCall(
+				new Name('is_string'),
+				[$value]
+			);
+
+
+		$expr = new BooleanOr(
+			$stringExpr,
+			new BooleanAnd(
+				$stringExpr,
+				new Identical(
+					new FuncCall(
+						new Name('strpos'),
+						[$value, $subString]
+					),
+					new LNumber(0)
+				)
+			)
+		);
+
+		$rootExpr = new BooleanAnd(
+			$expr,
+			new FuncCall(new Name('FAUX_FUNCTION_ startsWith'), [$value, $subString])
+		);
+
+		return [$expr, $rootExpr];
+	}
+
+	/**
+	 * @return array{Expr, Expr}
+	 */
+	private static function createEndsWithResolver(Scope $scope, Arg $value, Arg $subString): array
+	{
+		$stringExpr = $scope->getType($subString->value)->isNonEmptyString()->yes()
+			? new BooleanAnd(
+				new FuncCall(
+					new Name('is_string'),
+					[$value]
+				),
+				new NotIdentical(
+					$value->value,
+					new String_('')
+				)
+			)
+			: new FuncCall(
+				new Name('is_string'),
+				[$value]
+			);
+
+		$expr = new BooleanOr(
+			$stringExpr,
+			new BooleanAnd(
+				$stringExpr,
+				new Identical(
+					new FuncCall(
+						new Name('strpos'),
+						[$value, $subString]
+					),
+					new BinaryOp\Minus(
+						new FuncCall(
+							new Name('strlen'),
+							[$value]
+						),
+						new FuncCall(
+							new Name('strlen'),
+							[$subString]
+						)
+					)
+				)
+			)
+		);
+
+		$rootExpr = new BooleanAnd(
+			$expr,
+			new FuncCall(new Name('FAUX_FUNCTION_ endsWith'), [$value, $subString])
+		);
+
+		return [$expr, $rootExpr];
+	}
+
 }