Fix callable-string must be non-empty-string

Author: aivchen

src/PhpDoc/TypeNodeResolver.php

@@ -238,7 +238,7 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 				return new ClassStringType();
 
 			case 'callable-string':
-				return new IntersectionType([new StringType(), new CallableType()]);
+				return new IntersectionType([new StringType(), new AccessoryNonEmptyStringType(), new CallableType()]);
 
 			case 'array-key':
 				return new BenevolentUnionType([new IntegerType(), new StringType()]);

src/Type/IntersectionType.php

@@ -336,6 +336,7 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)
 
 		$nonEmptyStr = false;
 		$nonFalsyStr = false;
+		$callable = false;
 		foreach ($this->getSortedTypes() as $i => $type) {
 			if ($type instanceof AccessoryNonEmptyStringType
 				|| $type instanceof AccessoryLiteralStringType
@@ -367,6 +368,11 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)
 					}
 				}
 
+				// prevent redundant 'callable-string&non-empty-string'
+				if ($callable && $nonEmptyStr) {
+					continue;
+				}
+
 				$typesToDescribe[$i] = $type;
 				$skipTypeNames[] = 'string';
 				continue;
@@ -381,6 +387,7 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)
 				$typesToDescribe[$i] = $type;
 				$skipTypeNames[] = 'object';
 				$skipTypeNames[] = 'string';
+				$callable = true;
 				continue;
 			}
 

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1481,6 +1481,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());
+	}
+}

tests/PHPStan/Type/IntersectionTypeTest.php

@@ -8,6 +8,7 @@
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
+use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
 use PHPStan\Type\Accessory\HasOffsetType;
 use PHPStan\Type\Accessory\HasPropertyType;
@@ -481,6 +482,11 @@ public function dataDescribe(): iterable
 			VerbosityLevel::precise(),
 			'uppercase-string',
 		];
+		yield [
+			new IntersectionType([new StringType(), new AccessoryNonEmptyStringType(), new CallableType()]),
+			VerbosityLevel::value(),
+			'callable-string',
+		];
 	}
 
 	/**