Improvements

Author: VincentLanglet

src/Analyser/ExprHandler/Helper/MethodCallReturnTypeHelper.php

@@ -93,20 +93,23 @@ public function methodCallReturnType(
 		}
 
 		if (count($resolvedTypes) > 0) {
-			$remainingType = $typeWithMethod;
-			foreach ($handledClassNames as $handledClassName) {
-				$remainingType = TypeCombinator::remove($remainingType, new ObjectType($handledClassName));
-			}
-			if ($remainingType->hasMethod($methodName)->yes()) {
-				$remainingMethod = $remainingType->getMethod($methodName, $scope);
-				$remainingParametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
-					$scope,
-					$methodCall->getArgs(),
-					$remainingMethod->getVariants(),
-					$remainingMethod->getNamedArgumentsVariants(),
-				);
-				$resolvedTypes[] = $remainingParametersAcceptor->getReturnType();
+			if (count($allClassNames) !== count($handledClassNames)) {
+				$remainingType = $typeWithMethod;
+				foreach ($handledClassNames as $handledClassName) {
+					$remainingType = TypeCombinator::remove($remainingType, new ObjectType($handledClassName));
+				}
+				if ($remainingType->hasMethod($methodName)->yes()) {
+					$remainingMethod = $remainingType->getMethod($methodName, $scope);
+					$remainingParametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
+						$scope,
+						$methodCall->getArgs(),
+						$remainingMethod->getVariants(),
+						$remainingMethod->getNamedArgumentsVariants(),
+					);
+					$resolvedTypes[] = $remainingParametersAcceptor->getReturnType();
+				}
 			}
+
 			return VoidToNullTypeTransformer::transform(TypeCombinator::union(...$resolvedTypes), $methodCall);
 		}
 

src/Type/Php/DateTimeModifyReturnTypeExtension.php

@@ -78,13 +78,10 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 
 			return null;
 		} elseif ($hasDateTime) {
-			$callerType = TypeCombinator::intersect($scope->getType($methodCall->var), new ObjectType(DateTimeInterface::class));
-
-			if ($callerType instanceof NeverType) {
-				return null;
-			}
-
-			return $callerType;
+			return TypeCombinator::intersect(
+				$scope->getType($methodCall->var),
+				new ObjectType(DateTimeInterface::class),
+			);
 		}
 
 		if ($this->phpVersion->hasDateTimeExceptions()) {