Skip to content

Commit 1b2e4f3

Browse files
committed
Merge branch 'stable' into ext-encoding
2 parents f1c22f6 + 7ae7926 commit 1b2e4f3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1111
strategy:
1212
matrix:
13-
php: ["8.1", "8.2", "8.3", "8.4"]
13+
php: ["8.1", "8.2", "8.3", "8.4", "8.5"]
1414
name: PHP ${{ matrix.php }}
1515
runs-on: ubuntu-22.04
1616
steps:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"pocketmine/log": "^0.3.0 || ^0.4.0"
1313
},
1414
"require-dev": {
15-
"phpstan/phpstan": "2.1.0",
15+
"phpstan/phpstan": "2.1.33",
1616
"phpstan/phpstan-strict-rules": "^2.0"
1717
},
1818
"autoload": {

tools/proxy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function serverToClientRelay(ClientSession $client, ServerSocket $clientProxySoc
146146
$buffer = $proxyToServerUnconnectedSocket->readPacket();
147147
if($buffer !== null && $buffer !== "" && ord($buffer[0]) === MessageIdentifiers::ID_UNCONNECTED_PONG){
148148
$mostRecentPong = $buffer;
149-
\GlobalLogger::get()->info("Caching ping response from server: " . $buffer);
149+
\GlobalLogger::get()->info("Caching ping response from server: " . preg_replace("/[[:^print:]]/", ".", $buffer));
150150
}
151151
}elseif($socket === $clientProxySocket->getSocket()){
152152
try{

0 commit comments

Comments
 (0)