Improve assert for contains / startsWith / endsWith

Author: kamil-zacek

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -754,17 +754,136 @@ private function getExpressionResolvers(): array
 						)
 					);
 				},
-			];
+				'contains' => static function (Scope $scope, Arg $value, Arg $subString): Expr {
+					if ($scope->getType($subString->value)->isNonEmptyString()->yes()) {
+						return new BooleanAnd(
+							new BooleanAnd(
+								new FuncCall(
+									new Name('is_string'),
+									[$value]
+								),
+								new NotIdentical(
+									$value->value,
+									new String_('')
+								)
+							),
+							new GreaterOrEqual(
+								new FuncCall(
+									new Name('strpos'),
+									[$value]
+								),
+								new LNumber(0)
+							)
+						);
+					}
 
-			foreach (['contains', 'startsWith', 'endsWith'] as $name) {
-				$this->resolvers[$name] = function (Scope $scope, Arg $value, Arg $subString) use ($name): array {
+					return new BooleanAnd(
+						new FuncCall(
+							new Name('is_string'),
+							[$value]
+						),
+						new GreaterOrEqual(
+							new FuncCall(
+								new Name('strpos'),
+								[$value]
+							),
+							new LNumber(0)
+						)
+					);
+				},
+				'startsWith' => static function (Scope $scope, Arg $value, Arg $subString): Expr {
 					if ($scope->getType($subString->value)->isNonEmptyString()->yes()) {
-						return self::createIsNonEmptyStringAndSomethingExprPair($name, [$value, $subString]);
+						return new BooleanAnd(
+							new BooleanAnd(
+								new FuncCall(
+									new Name('is_string'),
+									[$value]
+								),
+								new NotIdentical(
+									$value->value,
+									new String_('')
+								)
+							),
+							new Identical(
+								new FuncCall(
+									new Name('strpos'),
+									[$value, $subString]
+								),
+								new LNumber(0)
+							)
+						);
 					}
 
-					return [$this->resolvers['string']($scope, $value), null];
-				};
-			}
+					return new BooleanAnd(
+						new FuncCall(
+							new Name('is_string'),
+							[$value]
+						),
+						new Identical(
+							new FuncCall(
+								new Name('strpos'),
+								[$value, $subString]
+							),
+							new LNumber(0)
+						)
+					);
+				},
+				'endsWith' => static function (Scope $scope, Arg $value, Arg $subString): Expr {
+					if ($scope->getType($subString->value)->isNonEmptyString()->yes()) {
+						return new BooleanAnd(
+							new BooleanAnd(
+								new FuncCall(
+									new Name('is_string'),
+									[$value]
+								),
+								new NotIdentical(
+									$value->value,
+									new String_('')
+								)
+							),
+							new Identical(
+								new FuncCall(
+									new Name('strpos'),
+									[$value, $subString]
+								),
+								new BinaryOp\Minus(
+									new FuncCall(
+										new Name('strlen'),
+										[$value]
+									),
+									new FuncCall(
+										new Name('strlen'),
+										[$subString]
+									)
+								)
+							)
+						);
+					}
+
+					return new BooleanAnd(
+						new FuncCall(
+							new Name('is_string'),
+							[$value]
+						),
+						new Identical(
+							new FuncCall(
+								new Name('strpos'),
+								[$value, $subString]
+							),
+							new BinaryOp\Minus(
+								new FuncCall(
+									new Name('strlen'),
+									[$value]
+								),
+								new FuncCall(
+									new Name('strlen'),
+									[$subString]
+								)
+							)
+						)
+					);
+				},
+			];
 
 			$assertionsResultingAtLeastInNonEmptyString = [
 				'startsWithLetter',