Merge branch 'stable'

src/MemoryManager.php

@@ -485,9 +485,9 @@ class MemoryManager{
 
 	/**
 	 * @param mixed    $from
-	 * @param mixed    &$data
+	 * @param mixed    $data reference parameter
-	 * @param object[] &$objects
+	 * @param object[] $objects reference parameter
-	 * @param int[]    &$refCounts
+	 * @param int[]    $refCounts reference parameter
 	 * @param int      $recursion
 	 * @param int      $maxNesting
 	 * @param int      $maxStringSize

src/command/SimpleCommandMap.php

@@ -224,8 +224,8 @@ class SimpleCommandMap implements CommandMap{
 	 * This method is intended to provide capability for handling commands with spaces in their name.
 	 * The referenced parameters will be modified accordingly depending on the resulting matched command.
 	 *
-	 * @param string   &$commandName
+	 * @param string   $commandName reference parameter
-	 * @param string[] &$args
+	 * @param string[] $args reference parameter
 	 *
 	 * @return Command|null
 	 */

src/network/mcpe/serializer/NetworkBinaryStream.php

@@ -436,9 +436,9 @@ class NetworkBinaryStream extends BinaryStream{
 	/**
 	 * Reads an block position with unsigned Y coordinate.
 	 *
-	 * @param int &$x
+	 * @param int $x reference parameter
-	 * @param int &$y
+	 * @param int $y reference parameter
-	 * @param int &$z
+	 * @param int $z reference parameter
 	 *
 	 * @throws BinaryDataException
 	 */
@@ -464,9 +464,9 @@ class NetworkBinaryStream extends BinaryStream{
 	/**
 	 * Reads a block position with a signed Y coordinate.
 	 *
-	 * @param int &$x
+	 * @param int $x reference parameter
-	 * @param int &$y
+	 * @param int $y reference parameter
-	 * @param int &$z
+	 * @param int $z reference parameter
 	 *
 	 * @throws BinaryDataException
 	 */

src/utils/Config.php

@@ -492,7 +492,7 @@ class Config{
 
 	/**
 	 * @param array $default
-	 * @param array &$data
+	 * @param array $data reference parameter
 	 *
 	 * @return int
 	 */

src/utils/Git.php

@@ -37,7 +37,7 @@ final class Git{
 	 * Returns the git hash of the currently checked out head of the given repository, or null on failure.
 	 *
 	 * @param string $dir
-	 * @param bool   &$dirty Output, set to whether the repo has local changes
+	 * @param bool   $dirty reference parameter, set to whether the repo has local changes
 	 *
 	 * @return string|null
 	 */

src/utils/Internet.php

@@ -138,9 +138,9 @@ class Internet{
 	 * @param string  $page
 	 * @param int     $timeout default 10
 	 * @param array   $extraHeaders
-	 * @param string  &$err Will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
+	 * @param string  $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
-	 * @param array[] &$headers
+	 * @param array[] $headers reference parameter
-	 * @param int     &$httpCode
+	 * @param int     $httpCode reference parameter
 	 *
 	 * @return bool|mixed false if an error occurred, mixed data if successful.
 	 */
@@ -162,9 +162,9 @@ class Internet{
 	 * @param array|string $args
 	 * @param int          $timeout
 	 * @param array        $extraHeaders
-	 * @param string       &$err Will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
+	 * @param string       $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
-	 * @param array[]      &$headers
+	 * @param array[]      $headers reference parameter
-	 * @param int          &$httpCode
+	 * @param int          $httpCode reference parameter
 	 *
 	 * @return bool|mixed false if an error occurred, mixed data if successful.
 	 */

src/utils/Process.php

@@ -141,8 +141,8 @@ final class Process{
 
 	/**
 	 * @param string      $command Command to execute
-	 * @param string|null &$stdout Reference parameter to write stdout to
+	 * @param string|null $stdout Reference parameter to write stdout to
-	 * @param string|null &$stderr Reference parameter to write stderr to
+	 * @param string|null $stderr Reference parameter to write stderr to
 	 *
 	 * @return int process exit code
 	 */

src/world/World.php

@@ -1555,7 +1555,7 @@ class World implements ChunkManager{
 	 * It'll try to lower the durability if Item is a tool, and set it to Air if broken.
 	 *
 	 * @param Vector3 $vector
-	 * @param Item    &$item (if null, can break anything)
+	 * @param Item    $item reference parameter (if null, can break anything)
 	 * @param Player  $player
 	 * @param bool    $createParticles
 	 *

src/world/format/io/region/RegionLoader.php

@@ -234,8 +234,8 @@ class RegionLoader{
 
 	/**
 	 * @param int $offset
-	 * @param int &$x
+	 * @param int $x reference parameter
-	 * @param int &$z
+	 * @param int $z reference parameter
 	 */
 	protected static function getChunkCoords(int $offset, ?int &$x, ?int &$z) : void{
 		$x = $offset & 0x1f;

src/world/format/io/region/RegionWorldProvider.php

@@ -107,8 +107,8 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
 	/**
 	 * @param int $chunkX
 	 * @param int $chunkZ
-	 * @param int &$regionX
+	 * @param int $regionX reference parameter
-	 * @param int &$regionZ
+	 * @param int $regionZ reference parameter
 	 */
 	public static function getRegionIndex(int $chunkX, int $chunkZ, &$regionX, &$regionZ) : void{
 		$regionX = $chunkX >> 5;

tests/phpstan/configs/phpstan-bugs.neon

@@ -1,9 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(.+\\)\\: Unexpected token \"&\", expected variable at offset \\d+$#"
-			path: ../../../src
-
 		-
 			message: "#^Default value of the parameter \\#\\d+ \\$[A-Za-z\\d_]+ \\(\\-?\\d+\\) of method .+\\(\\) is incompatible with type float\\.$#"
 			path: ../../../src