Fix Assert::stringNotEmpty

Author: ondrejmirtes

composer.json

@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "~7.1",
-		"phpstan/phpstan": "^0.12"
+		"phpstan/phpstan": "^0.12.6"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^3.7",

src/Type/WebMozartAssert/AssertTypeSpecifyingExtension.php

@@ -3,7 +3,10 @@
 namespace PHPStan\Type\WebMozartAssert;
 
 use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
+use PhpParser\Node\Expr\BinaryOp\NotIdentical;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
@@ -181,9 +184,15 @@ private static function getExpressionResolvers(): array
 					);
 				},
 				'stringNotEmpty' => function (Scope $scope, Arg $value): \PhpParser\Node\Expr {
-					return new \PhpParser\Node\Expr\FuncCall(
-						new \PhpParser\Node\Name('is_string'),
-						[$value]
+					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 {

tests/Type/WebMozartAssert/ImpossibleCheckTypeMethodCallRuleTest.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\WebMozartAssert;
+
+use PHPStan\Rules\Comparison\ImpossibleCheckTypeHelper;
+use PHPStan\Rules\Comparison\ImpossibleCheckTypeStaticMethodCallRule;
+use PHPStan\Rules\Rule;
+
+/**
+ * @extends \PHPStan\Testing\RuleTestCase<ImpossibleCheckTypeStaticMethodCallRule>
+ */
+class ImpossibleCheckTypeMethodCallRuleTest extends \PHPStan\Testing\RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new ImpossibleCheckTypeStaticMethodCallRule(new ImpossibleCheckTypeHelper($this->createBroker(), $this->getTypeSpecifier(), []), true);
+	}
+
+	/**
+	 * @return \PHPStan\Type\StaticMethodTypeSpecifyingExtension[]
+	 */
+	protected function getStaticMethodTypeSpecifyingExtensions(): array
+	{
+		return [
+			new AssertTypeSpecifyingExtension(),
+		];
+	}
+
+	public function testExtension(): void
+	{
+		$this->analyse([__DIR__ . '/data/impossible-check.php'], [
+			[
+				'Call to static method Webmozart\Assert\Assert::stringNotEmpty() with \'\' will always evaluate to false.',
+				13,
+			],
+		]);
+	}
+
+}

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace WebmozartAssertImpossibleCheck;
+
+use Webmozart\Assert\Assert;
+
+class Foo
+{
+
+	public function doFoo(string $s): void
+	{
+		Assert::stringNotEmpty($s);
+		Assert::stringNotEmpty('');
+	}
+
+}