Fix callable-string must be non-empty-string

Author: aivchen

src/Type/Accessory/AccessoryNonEmptyStringType.php

@@ -76,6 +76,9 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 
 public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
 {
+if ($type->isNonEmptyString()->yes()) {
+return AcceptsResult::createYes();
+}
 if ($type instanceof CompoundType) {
 return $type->isAcceptedWithReasonBy($this, $strictTypes);
 }

src/Type/IntersectionType.php

@@ -645,6 +645,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

@@ -1487,6 +1487,12 @@ public function testBug11913(): void
 $this->assertNoErrors($errors);
 }
 
+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());
+}
+}