Modernize private property declarations in src/scheduler

src/scheduler/AsyncPool.php

@@ -42,47 +42,40 @@ use const PTHREADS_INHERIT_INI;
 class AsyncPool{
 	private const WORKER_START_OPTIONS = PTHREADS_INHERIT_INI;
 
-	/** @var \ClassLoader */
-	private $classLoader;
-	/** @var \ThreadedLogger */
-	private $logger;
 	/** @var int */
 	protected $size;
-	/** @var int */
-	private $workerMemoryLimit;
 
 	/**
 	 * @var \SplQueue[]|AsyncTask[][]
 	 * @phpstan-var array<int, \SplQueue<AsyncTask>>
 	 */
-	private $taskQueues = [];
+	private array $taskQueues = [];
 
 	/**
 	 * @var AsyncWorker[]
 	 * @phpstan-var array<int, AsyncWorker>
 	 */
-	private $workers = [];
+	private array $workers = [];
 	/**
 	 * @var int[]
 	 * @phpstan-var array<int, int>
 	 */
-	private $workerLastUsed = [];
+	private array $workerLastUsed = [];
 
 	/**
 	 * @var \Closure[]
 	 * @phpstan-var (\Closure(int $workerId) : void)[]
 	 */
-	private $workerStartHooks = [];
+	private array $workerStartHooks = [];
 
-	/** @var SleeperHandler */
+	public function __construct(
-	private $eventLoop;
+		int $size,
-
+		private int $workerMemoryLimit,
-	public function __construct(int $size, int $workerMemoryLimit, \ClassLoader $classLoader, \ThreadedLogger $logger, SleeperHandler $eventLoop){
+		private \ClassLoader $classLoader,
+		private \ThreadedLogger $logger,
+		private SleeperHandler $eventLoop
+	){
 		$this->size = $size;
-		$this->workerMemoryLimit = $workerMemoryLimit;
-		$this->classLoader = $classLoader;
-		$this->logger = $logger;
-		$this->eventLoop = $eventLoop;
 	}
 
 	/**

src/scheduler/AsyncTask.php

@@ -54,7 +54,7 @@ abstract class AsyncTask extends \Threaded{
 	 *
 	 * Used to store objects which are only needed on one thread and should not be serialized.
 	 */
-	private static $threadLocalStorage = null;
+	private static ?\ArrayObject $threadLocalStorage = null;
 
 	/** @var AsyncWorker|null $worker */
 	public $worker = null;

src/scheduler/AsyncWorker.php

@@ -30,25 +30,14 @@ use function ini_set;
 
 class AsyncWorker extends Worker{
 	/** @var mixed[] */
-	private static $store = [];
+	private static array $store = [];
 
-	/** @var \ThreadedLogger */
+	public function __construct(
-	private $logger;
+		private \ThreadedLogger $logger,
-	/** @var int */
+		private int $id,
-	private $id;
+		private int $memoryLimit,
-
+		private SleeperNotifier $notifier
-	/** @var int */
+	){}
-	private $memoryLimit;
-
-	/** @var SleeperNotifier */
-	private $notifier;
-
-	public function __construct(\ThreadedLogger $logger, int $id, int $memoryLimit, SleeperNotifier $notifier){
-		$this->logger = $logger;
-		$this->id = $id;
-		$this->memoryLimit = $memoryLimit;
-		$this->notifier = $notifier;
-	}
 
 	public function getNotifier() : SleeperNotifier{
 		return $this->notifier;

src/scheduler/BulkCurlTaskOperation.php

@@ -24,34 +24,18 @@ declare(strict_types=1);
 namespace pocketmine\scheduler;
 
 final class BulkCurlTaskOperation{
-
-	/** @var string */
-	private $page;
-	/** @var float */
-	private $timeout;
-	/**
-	 * @var string[]
-	 * @phpstan-var list<string>
-	 */
-	private $extraHeaders;
-	/**
-	 * @var mixed[]
-	 * @phpstan-var array<int, mixed>
-	 */
-	private $extraOpts;
-
 	/**
 	 * @param string[] $extraHeaders
 	 * @param mixed[] $extraOpts
 	 * @phpstan-param list<string> $extraHeaders
 	 * @phpstan-param array<int, mixed> $extraOpts
 	 */
-	public function __construct(string $page, float $timeout = 10, array $extraHeaders = [], array $extraOpts = []){
+	public function __construct(
-		$this->page = $page;
+		private string $page,
-		$this->timeout = $timeout;
+		private float $timeout = 10,
-		$this->extraHeaders = $extraHeaders;
+		private array $extraHeaders = [],
-		$this->extraOpts = $extraOpts;
+		private array $extraOpts = []
-	}
+	){}
 
 	public function getPage() : string{ return $this->page; }
 

src/scheduler/ClosureTask.php

@@ -39,20 +39,14 @@ use pocketmine\utils\Utils;
  * ```
  */
 class ClosureTask extends Task{
-
-	/**
-	 * @var \Closure
-	 * @phpstan-var \Closure() : void
-	 */
-	private $closure;
-
 	/**
 	 * @param \Closure $closure Must accept zero parameters
 	 * @phpstan-param \Closure() : void $closure
 	 */
-	public function __construct(\Closure $closure){
+	public function __construct(
+		private \Closure $closure
+	){
 		Utils::validateCallableSignature(new CallbackType(new ReturnType()), $closure);
-		$this->closure = $closure;
 	}
 
 	public function getName() : string{

src/scheduler/Task.php

@@ -26,14 +26,9 @@ namespace pocketmine\scheduler;
 use pocketmine\utils\Utils;
 
 abstract class Task{
+	private ?TaskHandler $taskHandler = null;
 
-	/** @var TaskHandler|null */
+	final public function getHandler() : ?TaskHandler{
-	private $taskHandler = null;
-
-	/**
-	 * @return TaskHandler|null
-	 */
-	final public function getHandler(){
 		return $this->taskHandler;
 	}
 

src/scheduler/TaskHandler.php

@@ -43,13 +43,10 @@ class TaskHandler{
 	/** @var bool */
 	protected $cancelled = false;
 
-	/** @var TimingsHandler */
+	private TimingsHandler $timings;
-	private $timings;
 
-	/** @var string */
+	private string $taskName;
-	private $taskName;
+	private string $ownerName;
-	/** @var string */
-	private $ownerName;
 
 	public function __construct(Task $task, int $delay = -1, int $period = -1, ?string $ownerName = null){
 		if($task->getHandler() !== null){

src/scheduler/TaskScheduler.php

@@ -31,11 +31,7 @@ use pocketmine\utils\ObjectSet;
 use pocketmine\utils\ReversePriorityQueue;
 
 class TaskScheduler{
-	/** @var string|null */
+	private bool $enabled = true;
-	private $owner;
-
-	/** @var bool */
-	private $enabled = true;
 
 	/**
 	 * @var ReversePriorityQueue
@@ -52,8 +48,9 @@ class TaskScheduler{
 	/** @var int */
 	protected $currentTick = 0;
 
-	public function __construct(?string $owner = null){
+	public function __construct(
-		$this->owner = $owner;
+		private ?string $owner = null
+	){
 		$this->queue = new ReversePriorityQueue();
 		$this->tasks = new ObjectSet();
 	}