Support string assertions resulting in non-empty-string

Author: herndlm

README.md

@@ -69,10 +69,22 @@ This extension specifies types of values passed to:
 * `Assert::methodExists`
 * `Assert::propertyExists`
 * `Assert::isArrayAccessible`
+* `Assert::unicodeLetters`
+* `Assert::alpha`
+* `Assert::digits`
+* `Assert::alnum`
+* `Assert::lower`
+* `Assert::upper`
 * `Assert::length`
 * `Assert::minLength`
 * `Assert::maxLength`
 * `Assert::lengthBetween`
+* `Assert::uuid`
+* `Assert::ip`
+* `Assert::ipv4`
+* `Assert::ipv6`
+* `Assert::email`
+* `Assert::notWhitespaceOnly`
 * `nullOr*` and `all*` variants of the above methods
 
 

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -28,6 +28,22 @@
 class AssertTypeSpecifyingExtension implements StaticMethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
 
+	private const ASSERTIONS_RESULTING_IN_NON_EMPTY_STRING = [
+		'stringNotEmpty',
+		'unicodeLetters',
+		'alpha',
+		'digits',
+		'alnum',
+		'lower',
+		'upper',
+		'uuid',
+		'ip',
+		'ipv4',
+		'ipv6',
+		'email',
+		'notWhitespaceOnly',
+	];
+
 	/** @var \Closure[] */
 	private static $resolvers;
 
@@ -50,6 +66,10 @@ public function isStaticMethodSupported(
 		TypeSpecifierContext $context
 	): bool
 	{
+		if (in_array($staticMethodReflection->getName(), self::ASSERTIONS_RESULTING_IN_NON_EMPTY_STRING, true)) {
+			return true;
+		}
+
 		if (substr($staticMethodReflection->getName(), 0, 6) === 'allNot') {
 			$methods = [
 				'allNotInstanceOf' => 2,
@@ -144,6 +164,11 @@ private static function createExpression(
 	): ?\PhpParser\Node\Expr
 	{
 		$trimmedName = self::trimName($name);
+
+		if (in_array($trimmedName, self::ASSERTIONS_RESULTING_IN_NON_EMPTY_STRING, true)) {
+			return self::createIsNonEmptyStringExpression($args);
+		}
+
 		$resolvers = self::getExpressionResolvers();
 		$resolver = $resolvers[$trimmedName];
 		$expression = $resolver($scope, ...$args);
@@ -195,18 +220,6 @@ private static function getExpressionResolvers(): array
 						[$value]
 					);
 				},
-				'stringNotEmpty' => function (Scope $scope, Arg $value): \PhpParser\Node\Expr {
-					return new BooleanAnd(
-						new \PhpParser\Node\Expr\FuncCall(
-							new \PhpParser\Node\Name('is_string'),
-							[$value]
-						),
-						new NotIdentical(
-							$value->value,
-							new String_('')
-						)
-					);
-				},
 				'float' => function (Scope $scope, Arg $value): \PhpParser\Node\Expr {
 					return new \PhpParser\Node\Expr\FuncCall(
 						new \PhpParser\Node\Name('is_float'),
@@ -674,4 +687,21 @@ private function arrayOrIterable(
 		);
 	}
 
+	/**
+	 * @param \PhpParser\Node\Arg[] $args
+	 */
+	private static function createIsNonEmptyStringExpression(array $args): \PhpParser\Node\Expr
+	{
+		return new BooleanAnd(
+			new \PhpParser\Node\Expr\FuncCall(
+				new \PhpParser\Node\Name('is_string'),
+				[$args[0]]
+			),
+			new NotIdentical(
+				$args[0]->value,
+				new String_('')
+			)
+		);
+	}
+
 }

tests/Type/WebMozartAssert/data/string.php

@@ -49,4 +49,76 @@ public function lengthBetween(string $a, string $b, string $c, string $d): void
 		\PHPStan\Testing\assertType('non-empty-string', $d);
 	}
 
+	public function unicodeLetters($a): void
+	{
+		Assert::unicodeLetters($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function alpha($a): void
+	{
+		Assert::alpha($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function digits(string $a): void
+	{
+		Assert::digits($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function alnum(string $a): void
+	{
+		Assert::alnum($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function lower(string $a): void
+	{
+		Assert::lower($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function upper(string $a): void
+	{
+		Assert::upper($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function uuid(string $a): void
+	{
+		Assert::uuid($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function ip($a): void
+	{
+		Assert::ip($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function ipv4($a): void
+	{
+		Assert::ipv4($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function ipv6($a): void
+	{
+		Assert::ipv6($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function email($a): void
+	{
+		Assert::email($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
+	public function notWhitespaceOnly(string $a): void
+	{
+		Assert::notWhitespaceOnly($a);
+		\PHPStan\Testing\assertType('non-empty-string', $a);
+	}
+
 }