Cosmetic tweaks to propertyNeverNullOrUninitialized

Author: ondrejmirtes

src/Rules/IssetCheck.php

@@ -13,6 +13,7 @@
 use PHPStan\Type\VerbosityLevel;
 use function is_string;
 use function sprintf;
+use function str_starts_with;
 
 /**
  * @phpstan-type ErrorIdentifier = 'empty'|'isset'|'nullCoalesce'
@@ -149,7 +150,6 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, str
 					&& $expr->name instanceof Node\Identifier
 					&& $expr->var instanceof Expr\Variable
 					&& $expr->var->name === 'this'
-					&& $propertyReflection->getNativeType()->isNull()->no()
 					&& $scope->hasExpressionType(new PropertyInitializationExpr($propertyReflection->getName()))->yes()
 				) {
 					return $this->generateError(
@@ -159,9 +159,20 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, str
 							$this->propertyDescriptor->describeProperty($propertyReflection, $scope, $expr),
 							$operatorDescription,
 						),
-						$typeMessageCallback,
+						static function (Type $type) use ($typeMessageCallback): ?string {
+							$originalMessage = $typeMessageCallback($type);
+							if ($originalMessage === null) {
+								return null;
+							}
+
+							if (str_starts_with($originalMessage, 'is not')) {
+								return sprintf('%s nor uninitialized', $originalMessage);
+							}
+
+							return sprintf('%s and initialized', $originalMessage);
+						},
 						$identifier,
-						'propertyNeverNullOrUninitialized',
+						'initializedProperty',
 					);
 				}
 
@@ -302,7 +313,7 @@ private function checkUndefined(Expr $expr, Scope $scope, string $operatorDescri
 	/**
 	 * @param callable(Type): ?string $typeMessageCallback
 	 * @param ErrorIdentifier $identifier
-	 * @param 'variable'|'offset'|'property'|'expr'|'propertyNeverNullOrUninitialized' $identifierSecondPart
+	 * @param 'variable'|'offset'|'property'|'expr'|'initializedProperty' $identifierSecondPart
 	 */
 	private function generateError(Type $type, string $message, callable $typeMessageCallback, string $identifier, string $identifierSecondPart): ?IdentifierRuleError
 	{

tests/PHPStan/Rules/Variables/EmptyRuleTest.php

@@ -221,11 +221,11 @@ public function testIssetAfterRememberedConstructor(): void
 
 		$this->analyse([__DIR__ . '/data/isset-after-remembered-constructor.php'], [
 			[
-				'Property IssetOrCoalesceOnNonNullableInitializedProperty\MoreEmptyCases::$false in empty() is always falsy.',
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\MoreEmptyCases::$false in empty() is always falsy and initialized.',
 				93,
 			],
 			[
-				'Property IssetOrCoalesceOnNonNullableInitializedProperty\MoreEmptyCases::$true in empty() is not falsy.',
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\MoreEmptyCases::$true in empty() is not falsy nor uninitialized.',
 				95,
 			],
 		]);

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 in isset() is not nullable.',
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\User::$string in isset() is not nullable nor uninitialized.',
 				34,
 			],
 		]);

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 on left side of ?? is not nullable.',
+				'Property IssetOrCoalesceOnNonNullableInitializedProperty\User::$string on left side of ?? is not nullable nor uninitialized.',
 				46,
 			],
 		]);