Merge branch 'vrana-assert'

Author: forrest79

src/TypeValidator/PHPStan/Type/ReturnTypeExtension.php

@@ -44,11 +44,21 @@ public function setTypeSpecifier(Analyser\TypeSpecifier $typeSpecifier): void
 	 * @param array<Node\Arg> $args [0] = checked variable, [1] = type description
 	 */
 	protected function narrowTypes(array $args, Analyser\Scope $scope): Analyser\SpecifiedTypes
+	{
+		return $this->typeSpecifier->create(
+			$args[0]->value,
+			$this->prepareType($args[1]->value, $scope),
+			Analyser\TypeSpecifierContext::createTruthy(),
+			$scope,
+		);
+	}
+
+
+	protected function prepareType(Node\Expr $typeDescriptionArg, Analyser\Scope $scope): Type\Type
 	{
 		$filename = $scope->getFile();
 
-		$typeDescriptionArg = $args[1]->value;
-		$typeDescriptionType = $scope->getType($args[1]->value);
+		$typeDescriptionType = $scope->getType($typeDescriptionArg);
 		$typeDescriptionConstantStrings = $typeDescriptionType->getConstantStrings();
 
 		try {
@@ -61,12 +71,7 @@ protected function narrowTypes(array $args, Analyser\Scope $scope): Analyser\Spe
 					self::$cache[$filename][$typeDescription] = (new PHPStan\Helpers\TypeConverter($this->typeNodeResolver, $filename, $typeDescription))->convertToType();
 				}
 
-				return $this->typeSpecifier->create(
-					$args[0]->value,
-					self::$cache[$filename][$typeDescription],
-					Analyser\TypeSpecifierContext::createTruthy(),
-					$scope,
-				);
+				return self::$cache[$filename][$typeDescription];
 			} else {
 				self::error($filename, sprintf('Bad type description \'%s\' (only constant string type descriptions are allowed)', $typeDescriptionType->describe(Type\VerbosityLevel::precise())), $typeDescriptionArg);
 			}