From 1d5430937f8855ac0e0d86e031cce5642623a50b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 17 May 2022 21:54:45 +0100
Subject: [PATCH] Modernize private property declarations in src/timings

---
 src/timings/Timings.php        |  3 +--
 src/timings/TimingsHandler.php | 26 ++++++++------------------
 src/timings/TimingsRecord.php  | 30 +++++++++++-------------------
 3 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/src/timings/Timings.php b/src/timings/Timings.php
index c0176cc60..d3dd85578 100644
--- a/src/timings/Timings.php
+++ b/src/timings/Timings.php
@@ -34,8 +34,7 @@ use function dechex;
 abstract class Timings{
 	public const INCLUDED_BY_OTHER_TIMINGS_PREFIX = "** ";
 
-	/** @var bool */
-	private static $initialized = false;
+	private static bool $initialized = false;
 
 	/** @var TimingsHandler */
 	public static $fullTick;
diff --git a/src/timings/TimingsHandler.php b/src/timings/TimingsHandler.php
index eef7cd091..5a28b6664 100644
--- a/src/timings/TimingsHandler.php
+++ b/src/timings/TimingsHandler.php
@@ -29,10 +29,8 @@ use function count;
 use function hrtime;
 
 class TimingsHandler{
-	/** @var bool */
-	private static $enabled = false;
-	/** @var int */
-	private static $timingStart = 0;
+	private static bool $enabled = false;
+	private static int $timingStart = 0;
 
 	/** @return string[] */
 	public static function printTimings() : array{
@@ -99,21 +97,13 @@ class TimingsHandler{
 		}
 	}
 
-	/** @var string */
-	private $name;
-	/** @var TimingsHandler|null */
-	private $parent = null;
+	private ?TimingsRecord $record = null;
+	private int $timingDepth = 0;
 
-	/** @var TimingsRecord|null */
-	private $record = null;
-
-	/** @var int */
-	private $timingDepth = 0;
-
-	public function __construct(string $name, ?TimingsHandler $parent = null){
-		$this->name = $name;
-		$this->parent = $parent;
-	}
+	public function __construct(
+		private string $name,
+		private ?TimingsHandler $parent = null
+	){}
 
 	public function getName() : string{ return $this->name; }
 
diff --git a/src/timings/TimingsRecord.php b/src/timings/TimingsRecord.php
index 1150e55f4..fb2e05e1a 100644
--- a/src/timings/TimingsRecord.php
+++ b/src/timings/TimingsRecord.php
@@ -36,7 +36,7 @@ final class TimingsRecord{
 	 * @var self[]
 	 * @phpstan-var array<int, self>
 	 */
-	private static $records = [];
+	private static array $records = [];
 
 	public static function clearRecords() : void{
 		foreach(self::$records as $record){
@@ -71,26 +71,18 @@ final class TimingsRecord{
 		}
 	}
 
-	/** @var TimingsHandler */
-	private $handler;
+	private int $count = 0;
+	private int $curCount = 0;
+	private int $start = 0;
+	private int $totalTime = 0;
+	private int $curTickTotal = 0;
+	private int $violations = 0;
 
-	/** @var int */
-	private $count = 0;
-	/** @var int */
-	private $curCount = 0;
-	/** @var int */
-	private $start = 0;
-	/** @var int */
-	private $totalTime = 0;
-	/** @var int */
-	private $curTickTotal = 0;
-	/** @var int */
-	private $violations = 0;
-
-	public function __construct(TimingsHandler $handler){
-		self::$records[spl_object_id($this)] = $this;
+	public function __construct(
 		//I'm not the biggest fan of this cycle, but it seems to be the most effective way to avoid leaking anything.
-		$this->handler = $handler;
+		private TimingsHandler $handler
+	){
+		self::$records[spl_object_id($this)] = $this;
 	}
 
 	public function getName() : string{ return $this->handler->getName(); }