Merge commit 'd8d994351'

# Conflicts:
#	composer.lock
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor
2020-06-14 19:47:21 +01:00
9 changed files with 68 additions and 41 deletions

View File

@@ -154,7 +154,10 @@ class NetworkSession{
/** @var PacketBatch|null */
private $sendBuffer;
/** @var \SplQueue|CompressBatchPromise[] */
/**
* @var \SplQueue|CompressBatchPromise[]
* @phpstan-var \SplQueue<CompressBatchPromise>
*/
private $compressedQueue;
/** @var Compressor */
private $compressor;