allow numeric-strings beeing returned for non-empty-string

Author: staabm

src/Type/Accessory/AccessoryNumericStringType.php

@@ -78,6 +78,10 @@ public function isSubTypeOf(Type $otherType): TrinaryLogic
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLogic
 	{
+		if ($acceptingType->isNonEmptyString()->yes()) {
+			return TrinaryLogic::createYes();
+		}
+
 		return $this->isSubTypeOf($acceptingType);
 	}
 

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -695,4 +695,9 @@ public function testConditionalTypes(): void
 		]);
 	}
 
+	public function testBug7265(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-7265.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-7265.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Bug7265;
+
+class HelloWorld
+{
+	/**
+	 * @param literal-string $assetPath e.g. css/cmsfasttrack.css or js/fasttrack.js
+	 * @return non-empty-string
+	 */
+	static public function assetId(string $assetPath)
+	{
+		if (strpos($assetPath, 'css/') !== 0 && strpos($assetPath, 'js/') !== 0 && strpos($assetPath, 'img/') !== 0) {
+			throw new \RuntimeException('Invalid asset path "' . $assetPath . '"');
+		}
+
+		$mtime = filemtime($assetPath);
+
+		if ($mtime === false) {
+			throw new \RuntimeException('Unable to get filemtime for asset path "' . $assetPath . '"');
+		}
+
+		return (string)$mtime;
+	}
+}