Merge branch 'stable' into minor-next

Author: dktapps

composer.json

@@ -37,7 +37,7 @@
       "pocketmine/bedrock-block-upgrade-schema": "~5.2.0+bedrock-1.21.110",
       "pocketmine/bedrock-data": "~6.5.0+bedrock-1.26.10",
       "pocketmine/bedrock-item-upgrade-schema": "~1.16.0+bedrock-1.21.110",
-      "pocketmine/bedrock-protocol": "~56.0.0+bedrock-1.26.10",
+      "pocketmine/bedrock-protocol": "~56.1.0+bedrock-1.26.10",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "~1.0.4",
       "pocketmine/color": "^0.3.0",
@@ -52,7 +52,7 @@
       "symfony/filesystem": "~6.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "2.1.42",
+      "phpstan/phpstan": "2.1.46",
       "phpstan/phpstan-phpunit": "^2.0.0",
       "phpstan/phpstan-strict-rules": "^2.0.0",
       "phpunit/phpunit": "^10.5.24"

composer.lock

@@ -457,7 +457,7 @@ public function handleEncoded(string $payload) : void{
 					try{
 						$this->handleDataPacket($packet, $buffer);
 					}catch(PacketHandlingException $e){
-						$this->logger->debug($packet->getName() . ": " . base64_encode($buffer));
+						$this->unhandledPacketDebug($packet, $buffer, "Packet processing error");
 						throw PacketHandlingException::wrap($e, "Error processing " . $packet->getName());
 					}catch(FilterNoisyPacketException){
 						$this->noisyPacketBuffer = $buffer;
@@ -478,7 +478,11 @@ public function handleEncoded(string $payload) : void{
 	}
 
 	private function unhandledPacketDebug(Packet $packet, string $buffer, string $label) : void{
-		$this->logger->debug($label . ": " . $packet->getName() . ": " . base64_encode($buffer));
+		$debugSegment = substr($buffer, 0, 1024);
+		$debugSegmentLength = strlen($debugSegment);
+		$fullLength = strlen($buffer);
+		$truncatedLabel = $debugSegmentLength === $fullLength ? "" : " ... (" . ($fullLength - $debugSegmentLength) . " bytes not shown)";
+		$this->logger->debug($label . ": " . $packet->getName() . " ($fullLength bytes): " . base64_encode($debugSegment) . $truncatedLabel);
 	}
 
 	/**

src/network/mcpe/NetworkSession.php

@@ -344,8 +344,15 @@ private function defaultJsonMapper(string $logContext) : \JsonMapper{
 	 * @phpstan-return \Closure(object, string, mixed) : void
 	 */
 	private function warnUndefinedJsonPropertyHandler(string $context) : \Closure{
-		return fn(object $object, string $name, mixed $value) => $this->session->getLogger()->warning(
-			"$context: Unexpected JSON property for " . (new \ReflectionClass($object))->getShortName() . ": " . Utils::printable(substr($name, 0, 80))
-		);
+		return function(object $object, string $name, mixed $value) use ($context) : void{
+			static $count = 0;
+			if($count++ < 10){
+				$this->session->getLogger()->warning(
+					"$context: Unexpected JSON property for " . (new \ReflectionClass($object))->getShortName() . ": " . Utils::printable(substr($name, 0, 80))
+				);
+			}else{
+				throw new PacketHandlingException("$context: Too many unexpected JSON properties");
+			}
+		};
 	}
 }

src/network/mcpe/handler/LoginPacketHandler.php

@@ -60,18 +60,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/convert/LegacySkinAdapter.php
 
-		-
-			message: '#^Property pocketmine\\network\\mcpe\\raklib\\PthreadsChannelWriter\:\:\$buffer is never read, only written\.$#'
-			identifier: property.onlyWritten
-			count: 1
-			path: ../../../src/network/mcpe/raklib/PthreadsChannelWriter.php
-
-		-
-			message: '#^Property pocketmine\\network\\mcpe\\raklib\\SnoozeAwarePthreadsChannelWriter\:\:\$buffer is never read, only written\.$#'
-			identifier: property.onlyWritten
-			count: 1
-			path: ../../../src/network/mcpe/raklib/SnoozeAwarePthreadsChannelWriter.php
-
 		-
 			message: '#^Dead catch \- RuntimeException is never thrown in the try block\.$#'
 			identifier: catch.neverThrown