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

@@ -23,11 +23,18 @@ declare(strict_types=1);
namespace pocketmine\utils;
/**
* @phpstan-template TPriority
* @phpstan-template TValue
* @phpstan-extends \SplPriorityQueue<TPriority, TValue>
*/
class ReversePriorityQueue extends \SplPriorityQueue{
/**
* @param mixed $priority1
* @param mixed $priority2
* @phpstan-param TPriority $priority1
* @phpstan-param TPriority $priority2
*
* @return int
*/