Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

src/Type/Accessory/AccessoryNonEmptyStringType.php

@@ -72,6 +72,9 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		if ($type->isNonEmptyString()->yes()) {
+			return AcceptsResult::createYes();
+		}
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}

src/Type/IntersectionType.php

@@ -669,6 +669,9 @@ public function isNumericString(): TrinaryLogic
 
 	public function isNonEmptyString(): TrinaryLogic
 	{
+		if ($this->isCallable()->yes() && $this->isString()->yes()) {
+			return TrinaryLogic::createYes();
+		}
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isNonEmptyString());
 	}
 

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1600,6 +1600,12 @@ public function testBug12949(): void
 		$this->assertSame('Access to undefined constant object::0.', $errors[2]->getMessage());
 	}
 
+	public function testBug12979(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-12979.php');
+		$this->assertNoErrors($errors);
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]

tests/PHPStan/Analyser/data/bug-12979.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types = 1);
+
+namespace Bug12979;
+
+abstract class X
+{
+	/**
+	 * @return callable-string
+	 */
+	abstract public function callableString(): string;
+
+	/**
+	 * @param non-empty-string $nonEmptyString
+	 */
+	abstract public function acceptNonEmptyString(string $nonEmptyString): void;
+
+	public function test(): void
+	{
+		$this->acceptNonEmptyString($this->callableString());
+	}
+}