Rework

Author: VincentLanglet

src/Type/Php/MbConvertEncodingFunctionReturnTypeExtension.php

@@ -52,7 +52,7 @@ public function getTypeFromFunctionCall(
 
 		$result = TypeCombinator::intersect($initialReturnType, $this->generalizeStringType($argType));
 		if ($result instanceof NeverType) {
-			return null;
+			$result = TypeCombinator::remove($initialReturnType, new ConstantBooleanType(false));
 		}
 
 		if ($this->phpVersion->throwsValueErrorForInternalFunctions()) {
@@ -61,35 +61,35 @@ public function getTypeFromFunctionCall(
 			}
 			$fromEncodingArgType = $scope->getType($functionCall->getArgs()[2]->value);
 
-			$mayNotDetectEncoding = false;
+			$returnFalseIfCannotDetectEncoding = false;
 			if (!$fromEncodingArgType->isArray()->no()) {
 				$constantArrays = $fromEncodingArgType->getConstantArrays();
 				if (count($constantArrays) > 0) {
 					foreach ($constantArrays as $constantArray) {
 						if (count($constantArray->getValueTypes()) > 1) {
-							$mayNotDetectEncoding = true;
+							$returnFalseIfCannotDetectEncoding = true;
 							break;
 						}
 					}
 				} else {
-					$mayNotDetectEncoding = true;
+					$returnFalseIfCannotDetectEncoding = true;
 				}
 			}
-			if (!$mayNotDetectEncoding && !$fromEncodingArgType->isString()->no()) {
+			if (!$returnFalseIfCannotDetectEncoding && !$fromEncodingArgType->isString()->no()) {
 				$constantStrings = $fromEncodingArgType->getConstantStrings();
 				if (count($constantStrings) > 0) {
 					foreach ($constantStrings as $constantString) {
 						if (str_contains($constantString->getValue(), ',')) {
-							$mayNotDetectEncoding = true;
+							$returnFalseIfCannotDetectEncoding = true;
 							break;
 						}
 					}
 				} else {
-					$mayNotDetectEncoding = true;
+					$returnFalseIfCannotDetectEncoding = true;
 				}
 			}
 
-			if (!$mayNotDetectEncoding) {
+			if (!$returnFalseIfCannotDetectEncoding) {
 				return $result;
 			}
 		}

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -57,12 +57,6 @@ private static function findTestFiles(): iterable
 			yield __DIR__ . '/data/explode-php80.php';
 		}
 
-		if (PHP_VERSION_ID < 80000) {
-			yield __DIR__ . '/data/mb-convert-encoding-php7.php';
-		} else {
-			yield __DIR__ . '/data/mb-convert-encoding-php8.php';
-		}
-
 		if (PHP_VERSION_ID >= 80000) {
 			yield __DIR__ . '/../Reflection/data/unionTypes.php';
 			yield __DIR__ . '/../Reflection/data/mixedType.php';

…alyser/data/mb-convert-encoding-php7.php …alyser/nsrt/mb-convert-encoding-php7.phptests/PHPStan/Analyser/data/mb-convert-encoding-php7.php renamed to tests/PHPStan/Analyser/nsrt/mb-convert-encoding-php7.php tests/PHPStan/Analyser/data/mb-convert-encoding-php7.php renamed to tests/PHPStan/Analyser/nsrt/mb-convert-encoding-php7.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint <=7.4
 
 namespace MbConvertEncodingPHP7;
 

…alyser/data/mb-convert-encoding-php8.php …alyser/nsrt/mb-convert-encoding-php8.phptests/PHPStan/Analyser/data/mb-convert-encoding-php8.php renamed to tests/PHPStan/Analyser/nsrt/mb-convert-encoding-php8.php tests/PHPStan/Analyser/data/mb-convert-encoding-php8.php renamed to tests/PHPStan/Analyser/nsrt/mb-convert-encoding-php8.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 namespace MbConvertEncodingPHP8;
 
@@ -20,15 +20,15 @@ function test_mb_convert_encoding(
 	string|array|bool $union,
 	int $int,
 ): void {
-	\PHPStan\Testing\assertType('array|string|false', mb_convert_encoding($mixed, 'UTF-8'));
+	\PHPStan\Testing\assertType('array|string', mb_convert_encoding($mixed, 'UTF-8'));
 	\PHPStan\Testing\assertType('string', mb_convert_encoding($constantString, 'UTF-8'));
 	\PHPStan\Testing\assertType('string', mb_convert_encoding($string, 'UTF-8'));
 	\PHPStan\Testing\assertType('array', mb_convert_encoding($mixedArray, 'UTF-8'));
 	\PHPStan\Testing\assertType('array{foo: string, bar: int, baz: string}', mb_convert_encoding($structuredArray, 'UTF-8'));
 	\PHPStan\Testing\assertType('list<string>', mb_convert_encoding($stringList, 'UTF-8'));
 	\PHPStan\Testing\assertType('list<int>', mb_convert_encoding($intList, 'UTF-8'));
 	\PHPStan\Testing\assertType('array{foo: string, bar: int, baz: string}|string|false', mb_convert_encoding($union, 'UTF-8'));
-	\PHPStan\Testing\assertType('array|string|false', mb_convert_encoding($int, 'UTF-8'));
+	\PHPStan\Testing\assertType('array|string', mb_convert_encoding($int, 'UTF-8'));
 
 	\PHPStan\Testing\assertType('string', mb_convert_encoding($string, 'UTF-8', 'FOO'));
 	\PHPStan\Testing\assertType('string|false', mb_convert_encoding($string, 'UTF-8', $string));