Merge branch 'stable' into next-minor

src/command/CommandSender.php

@@ -41,11 +41,13 @@ interface CommandSender extends Permissible{
 	/**
 	 * Returns the line height of the command-sender's screen. Used for determining sizes for command output pagination
 	 * such as in the /help command.
+	 * @phpstan-return positive-int
 	 */
 	public function getScreenLineHeight() : int;
 
 	/**
 	 * Sets the line height used for command output pagination for this command sender. `null` will reset it to default.
+	 * @phpstan-param positive-int|null $height
 	 */
 	public function setScreenLineHeight(?int $height) : void;
 }