Cover EmptyRule

Author: staabm

Diff for: src/Rules/IssetCheck.php

@@ -10,7 +10,6 @@
 use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\VerbosityLevel;
 use function is_string;
 use function sprintf;
@@ -150,16 +149,20 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, str
 					&& $expr->name instanceof Node\Identifier
 					&& $expr->var instanceof Expr\Variable
 					&& $expr->var->name === 'this'
-					&& !TypeCombinator::containsNull($propertyReflection->getNativeType())
+					&& $propertyReflection->getNativeType()->isNull()->no()
 					&& $scope->hasExpressionType(new PropertyInitializationExpr($propertyReflection->getName()))->yes()
 				) {
-					return RuleErrorBuilder::message(
+					return $this->generateError(
+						$propertyReflection->getNativeType(),
 						sprintf(
-							'%s cannot be null or uninitialized %s.',
+							'%s %s',
 							$this->propertyDescriptor->describeProperty($propertyReflection, $scope, $expr),
 							$operatorDescription,
 						),
-					)->identifier(sprintf('%s.neverNullOrUninitialized', $identifier))->build();
+						$typeMessageCallback,
+						$identifier,
+						'propertyNeverNullOrUninitialized',
+					);
 				}
 
 				if (!$scope->hasExpressionType($expr)->yes()) {
@@ -299,7 +302,7 @@ private function checkUndefined(Expr $expr, Scope $scope, string $operatorDescri
 	/**
 	 * @param callable(Type): ?string $typeMessageCallback
 	 * @param ErrorIdentifier $identifier
-	 * @param 'variable'|'offset'|'property'|'expr' $identifierSecondPart
+	 * @param 'variable'|'offset'|'property'|'expr'|'propertyNeverNullOrUninitialized' $identifierSecondPart
 	 */
 	private function generateError(Type $type, string $message, callable $typeMessageCallback, string $identifier, string $identifierSecondPart): ?IdentifierRuleError
 	{

Diff for: tests/PHPStan/Rules/Variables/EmptyRuleTest.php

@@ -32,6 +32,11 @@ protected function shouldTreatPhpDocTypesAsCertain(): bool
 		return $this->treatPhpDocTypesAsCertain;
 	}
 
+	public function shouldNarrowMethodScopeFromConstructor(): bool
+	{
+		return true;
+	}
+
 	public function testRule(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;
@@ -206,4 +211,20 @@ public function testBug12658(): void
 		$this->analyse([__DIR__ . '/data/bug-12658.php'], []);
 	}
 
+	public function testIssetAfterRememberedConstructor(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+
+		$this->analyse([__DIR__ . '/data/isset-after-remembered-constructor.php'], [
+			[
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\MoreEmptyCases::$false in empty() is always falsy.',
+				94,
+			],
+			[
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\MoreEmptyCases::$true in empty() is not falsy.',
+				96,
+			],
+		]);
+	}
+
 }

Diff for: tests/PHPStan/Rules/Variables/IssetRuleTest.php

@@ -491,7 +491,7 @@ public function testIssetAfterRememberedConstructor(): void
 
 		$this->analyse([__DIR__ . '/data/isset-after-remembered-constructor.php'], [
 			[
-				'Property IssetOrCoalesceOnNonNullableInitializedProperty\User::$string cannot be null or uninitialized in isset().',
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\User::$string in isset() is not nullable.',
 				36,
 			],
 		]);

Diff for: tests/PHPStan/Rules/Variables/NullCoalesceRuleTest.php

@@ -367,7 +367,7 @@ public function testIssetAfterRememberedConstructor(): void
 
 		$this->analyse([__DIR__ . '/data/isset-after-remembered-constructor.php'], [
 			[
-				'Property IssetOrCoalesceOnNonNullableInitializedProperty\User::$string cannot be null or uninitialized on left side of ??.',
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\User::$string on left side of ?? is not nullable.',
 				48,
 			],
 		]);

Diff for: tests/PHPStan/Rules/Variables/data/isset-after-remembered-constructor.php

@@ -1,4 +1,4 @@
-<?php // lint >= 7.4
+<?php // lint >= 8.2
 
 namespace IssetOrCoalesceOnNonNullableInitializedProperty;
 
@@ -12,9 +12,9 @@ class User
 
     private $untyped;
 
-    public function __construct(
-    ) {
-        if (rand(0,1)) {
+    public function __construct()
+    {
+        if (rand(0, 1)) {
             $this->nullableString = 'hello';
             $this->string = 'world';
             $this->maybeUninitializedString = 'something';
@@ -48,4 +48,53 @@ public function doBar(): void
         echo $this->string ?? 'default';
         echo $this->untyped ?? 'default';
     }
+
+    public function doFooBar(): void
+    {
+        if (empty($this->maybeUninitializedString)) {
+            echo $this->maybeUninitializedString;
+        }
+        if (empty($this->nullableString)) {
+            echo $this->nullableString;
+        }
+        if (empty($this->string)) {
+            echo $this->string;
+        }
+        if (empty($this->untyped)) {
+            echo $this->untyped;
+        }
+    }
+}
+
+class MoreEmptyCases
+{
+    private false|string $union;
+    private false $false;
+    private true $true;
+    private bool $bool;
+
+    public function __construct()
+    {
+        if (rand(0, 1)) {
+            $this->union = 'nope';
+            $this->bool = true;
+        } elseif (rand(10, 20)) {
+            $this->union = false;
+            $this->bool = false;
+        }
+        $this->false = false;
+        $this->true = true;
+    }
+
+    public function doFoo(): void
+    {
+        if (empty($this->union)) {
+        }
+        if (empty($this->bool)) {
+        }
+        if (empty($this->false)) {
+        }
+        if (empty($this->true)) {
+        }
+    }
 }