Merge branch refs/heads/1.10.x into 1.11.x

Author: phpstan-bot

src/PhpDoc/ResolvedPhpDocBlock.php

@@ -281,14 +281,26 @@ public function changeParameterNamesByMapping(array $parameterNameMapping): self
 			return $this;
 		}
 
+		$mapParameterCb = static function (Type $type, callable $traverse) use ($parameterNameMapping): Type {
+			if ($type instanceof ConditionalTypeForParameter) {
+				$parameterName = substr($type->getParameterName(), 1);
+				if (array_key_exists($parameterName, $parameterNameMapping)) {
+					$type = $type->changeParameterName('$' . $parameterNameMapping[$parameterName]);
+				}
+			}
+
+			return $traverse($type);
+		};
+
 		$paramTags = $this->getParamTags();
 
 		$newParamTags = [];
 		foreach ($paramTags as $key => $paramTag) {
 			if (!array_key_exists($key, $parameterNameMapping)) {
 				continue;
 			}
-			$newParamTags[$parameterNameMapping[$key]] = $paramTag;
+			$transformedType = TypeTraverser::map($paramTag->getType(), $mapParameterCb);
+			$newParamTags[$parameterNameMapping[$key]] = $paramTag->withType($transformedType);
 		}
 
 		$paramOutTags = $this->getParamOutTags();
@@ -298,21 +310,14 @@ public function changeParameterNamesByMapping(array $parameterNameMapping): self
 			if (!array_key_exists($key, $parameterNameMapping)) {
 				continue;
 			}
-			$newParamOutTags[$parameterNameMapping[$key]] = $paramOutTag;
+
+			$transformedType = TypeTraverser::map($paramOutTag->getType(), $mapParameterCb);
+			$newParamOutTags[$parameterNameMapping[$key]] = $paramOutTag->withType($transformedType);
 		}
 
 		$returnTag = $this->getReturnTag();
 		if ($returnTag !== null) {
-			$transformedType = TypeTraverser::map($returnTag->getType(), static function (Type $type, callable $traverse) use ($parameterNameMapping): Type {
-				if ($type instanceof ConditionalTypeForParameter) {
-					$parameterName = substr($type->getParameterName(), 1);
-					if (array_key_exists($parameterName, $parameterNameMapping)) {
-						$type = $type->changeParameterName('$' . $parameterNameMapping[$parameterName]);
-					}
-				}
-
-				return $traverse($type);
-			});
+			$transformedType = TypeTraverser::map($returnTag->getType(), $mapParameterCb);
 			$returnTag = $returnTag->withType($transformedType);
 		}
 

stubs/socket_select.stub

@@ -7,5 +7,6 @@
  * @param-out ($read is not null ? array<resource> : null) $read
  * @param-out ($write is not null ? array<resource> : null) $write
  * @param-out ($except is not null ? array<resource> : null) $except
+ * @return int|false
  */
-function socket_select(?array &$read, ?array &$write, ?array &$except, ?int $seconds, int $microseconds = 0): int|false {}
+function socket_select(?array &$read, ?array &$write, ?array &$except, ?int $seconds, int $microseconds = 0) {}