One more wrong tip

Author: ondrejmirtes

src/Type/Accessory/NonEmptyArrayType.php

@@ -25,7 +25,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
-use function sprintf;
 
 class NonEmptyArrayType implements CompoundType, AccessoryType
 {
@@ -86,17 +85,8 @@ public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
 
 $isArray = $type->isArray();
 $isIterableAtLeastOnce = $type->isIterableAtLeastOnce();
-$reasons = [];
-if ($isArray->yes() && !$isIterableAtLeastOnce->yes()) {
-$verbosity = VerbosityLevel::getRecommendedLevelByType($this, $type);
-$reasons[] = sprintf(
-'%s %s empty.',
-$type->describe($verbosity),
-$isIterableAtLeastOnce->no() ? 'is' : 'might be',
-);
-}
 
-return new AcceptsResult($isArray->and($isIterableAtLeastOnce), $reasons);
+return new AcceptsResult($isArray->and($isIterableAtLeastOnce), []);
 }
 
 public function isSuperTypeOf(Type $type): TrinaryLogic

src/Type/IntersectionType.php

@@ -191,15 +191,27 @@ public function acceptsWithReason(Type $otherType, bool $strictTypes): AcceptsRe
 
 if (!$result->yes()) {
 $isList = $otherType->isList();
+$reasons = [];
+$verbosity = VerbosityLevel::getRecommendedLevelByType($this, $otherType);
 if ($this->isList()->yes() && !$isList->yes()) {
-$verbosity = VerbosityLevel::getRecommendedLevelByType($this, $otherType);
-return new AcceptsResult($result->result, [
-sprintf(
-'%s %s a list.',
-$otherType->describe($verbosity),
-$isList->no() ? 'is not' : 'might not be',
-),
-]);
+$reasons[] = sprintf(
+'%s %s a list.',
+$otherType->describe($verbosity),
+$isList->no() ? 'is not' : 'might not be',
+);
+}
+
+$isNonEmpty = $otherType->isIterableAtLeastOnce();
+if ($this->isIterableAtLeastOnce()->yes() && !$isNonEmpty->yes()) {
+$reasons[] = sprintf(
+'%s %s empty.',
+$otherType->describe($verbosity),
+$isNonEmpty->no() ? 'is' : 'might be',
+);
+}
+
+if (count($reasons) > 0) {
+return new AcceptsResult($result->result, $reasons);
 }
 }
 

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -962,6 +962,15 @@ public function testWrongListTip(): void
 'Method WrongListTip\Test::doFoo() should return list<WrongListTip\Foo> but returns list<WrongListTip\Bar>.',
 23,
 ],
+[
+'Method WrongListTip\Test2::doFoo() should return non-empty-array<WrongListTip\Foo> but returns non-empty-array<WrongListTip\Bar>.',
+44,
+],
+[
+'Method WrongListTip\Test3::doFoo() should return non-empty-list<WrongListTip\Foo> but returns array<WrongListTip\Bar>.',
+67,
+"• array<WrongListTip\Bar> might not be a list.\n• array<WrongListTip\Bar> might be empty.",
+],
 ]);
 }
 

tests/PHPStan/Rules/Methods/data/wrong-list-tip.php

@@ -32,3 +32,47 @@ public function listOfBars(): array
 }
 
 }
+
+class Test2
+{
+
+/**
+ * @return non-empty-array<Foo>
+ */
+public function doFoo(): array
+{
+return $this->nonEmptyArrayOfBars();
+}
+
+/**
+ * @return non-empty-array<Bar>
+ */
+public function nonEmptyArrayOfBars(): array
+{
+/** @var Bar $b */
+$b = doFoo();
+return [$b];
+}
+
+}
+
+class Test3
+{
+
+/**
+ * @return non-empty-list<Foo>
+ */
+public function doFoo(): array
+{
+return $this->nonEmptyArrayOfBars();
+}
+
+/**
+ * @return array<Bar>
+ */
+public function nonEmptyArrayOfBars(): array
+{
+return [];
+}
+
+}