From add15ab277f608606325ac4d5731874a4750c9e1 Mon Sep 17 00:00:00 2001
From: Andrey Savchenko <contact@rarst.net>
Date: Wed, 28 Dec 2022 14:46:50 +0200
Subject: [PATCH] Refreshed Psalm annotations.

---
 src/Mustache_Cache_FrozenCache.php                | 2 --
 src/Record/Collector/Core_Load_Collector.php      | 2 ++
 src/Record/Collector/Hook_Collector.php           | 1 -
 src/Record/Collector/Http_Collector.php           | 4 ++--
 src/Record/Collector/Sql_Collector.php            | 1 +
 src/Record/Collector/Stopwatch_Collector.php      | 1 +
 src/Record/Iterator/Recursive_Record_Iterator.php | 2 ++
 src/Record/Iterator/Timeline_Iterator.php         | 4 ++--
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Mustache_Cache_FrozenCache.php b/src/Mustache_Cache_FrozenCache.php
index 1eb8449..a38fef5 100644
--- a/src/Mustache_Cache_FrozenCache.php
+++ b/src/Mustache_Cache_FrozenCache.php
@@ -11,8 +11,6 @@ class Mustache_Cache_FrozenCache extends \Mustache_Cache_FilesystemCache {
 	/**
 	 * Cache and load a compiled Mustache_Template class.
 	 *
-	 * @psalm-suppress InvalidScalarArgument
-	 *
 	 * @param string $key   Key.
 	 * @param string $value Value.
 	 *
diff --git a/src/Record/Collector/Core_Load_Collector.php b/src/Record/Collector/Core_Load_Collector.php
index 55e7fe5..a8f8189 100644
--- a/src/Record/Collector/Core_Load_Collector.php
+++ b/src/Record/Collector/Core_Load_Collector.php
@@ -27,6 +27,8 @@ class Core_Load_Collector implements Record_Collector_Interface {
 
 	/**
 	 * @return Record_Interface[]
+	 *
+	 * @psalm-suppress PossiblyUndefinedArrayOffset
 	 */
 	public function get_records(): array {
 
diff --git a/src/Record/Collector/Hook_Collector.php b/src/Record/Collector/Hook_Collector.php
index 6bda186..068fae9 100644
--- a/src/Record/Collector/Hook_Collector.php
+++ b/src/Record/Collector/Hook_Collector.php
@@ -103,7 +103,6 @@ class Hook_Collector extends Stopwatch_Collector {
 	 * @param int         $start_priority Start hook priority (defaults to -1).
 	 * @param int         $stop_priority  Stop hook priority (defaults to max int).
 	 *
-	 * @psalm-suppress MissingClosureReturnType
 	 * @psalm-suppress MissingClosureParamType
 	 */
 	private function add_event(
diff --git a/src/Record/Collector/Http_Collector.php b/src/Record/Collector/Http_Collector.php
index f246f42..4d2e0c1 100644
--- a/src/Record/Collector/Http_Collector.php
+++ b/src/Record/Collector/Http_Collector.php
@@ -44,7 +44,7 @@ class Http_Collector extends Stopwatch_Collector {
 	 *
 	 * @return false|array|\WP_Error
 	 *
-	 * @psalm-suppress RedundantConditionGivenDocblockType
+	 * @psalm-suppress RedundantCondition
 	 * @noinspection   PhpUnusedParameterInspection
 	 */
 	public function pre_http_request( $false, $args, $url ) {
@@ -68,7 +68,7 @@ class Http_Collector extends Stopwatch_Collector {
 	 *
 	 * @return array|\WP_Error
 	 *
-	 * @psalm-suppress RedundantConditionGivenDocblockType
+	 * @psalm-suppress RedundantCondition
 	 * @noinspection   PhpUnusedParameterInspection
 	 */
 	public function http_api_debug( $response, $type, $class, $args, $url ) {
diff --git a/src/Record/Collector/Sql_Collector.php b/src/Record/Collector/Sql_Collector.php
index f156f49..4c6828e 100644
--- a/src/Record/Collector/Sql_Collector.php
+++ b/src/Record/Collector/Sql_Collector.php
@@ -65,6 +65,7 @@ class Sql_Collector implements Record_Collector_Interface {
 
 		/** @var array $wpdb->queries */
 		/** @psalm-var array<int, QueryData> $wpdb->queries */
+		/** @psalm-suppress PossiblyInvalidArgument */
 		$records = array_filter( array_map( [ $this, 'transform' ], array_keys( $wpdb->queries ), $wpdb->queries ) );
 
 		return $records;
diff --git a/src/Record/Collector/Stopwatch_Collector.php b/src/Record/Collector/Stopwatch_Collector.php
index 7f4a240..20319fe 100644
--- a/src/Record/Collector/Stopwatch_Collector.php
+++ b/src/Record/Collector/Stopwatch_Collector.php
@@ -61,6 +61,7 @@ class Stopwatch_Collector implements Record_Collector_Interface {
 			}
 		}
 
+		/** @psalm-suppress PossiblyInvalidArgument */
 		return array_map( [ $this, 'transform' ], array_keys( $events ), $events );
 	}
 
diff --git a/src/Record/Iterator/Recursive_Record_Iterator.php b/src/Record/Iterator/Recursive_Record_Iterator.php
index 2fd2913..55e6797 100644
--- a/src/Record/Iterator/Recursive_Record_Iterator.php
+++ b/src/Record/Iterator/Recursive_Record_Iterator.php
@@ -10,6 +10,8 @@ use Rarst\Laps\Record\Record_Interface;
  *
  * @template-extends \ArrayIterator<array-key,Record_Interface>
  * @template-implements \RecursiveIterator<array-key,Record_Interface>
+ *
+ * @psalm-suppress TooManyTemplateParams
  */
 class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIterator {
 
diff --git a/src/Record/Iterator/Timeline_Iterator.php b/src/Record/Iterator/Timeline_Iterator.php
index 2498c19..885772a 100644
--- a/src/Record/Iterator/Timeline_Iterator.php
+++ b/src/Record/Iterator/Timeline_Iterator.php
@@ -11,7 +11,7 @@ use Rarst\Laps\Record\Record_Interface;
  *
  * @template-implements \Iterator<array>
  *
- * @psalm-suppress PropertyNotSetInConstructor
+ * @psalm-suppress PropertyNotSetInConstructor, TooManyTemplateParams
  */
 class Timeline_Iterator implements \Iterator {
 
@@ -30,7 +30,7 @@ class Timeline_Iterator implements \Iterator {
 	/**
 	 * @param Recursive_Record_Iterator $iterator Record iterator.
 	 *
-	 * @psalm-suppress PossiblyFalsePropertyAssignmentValue
+	 * @psalm-suppress PossiblyFalsePropertyAssignmentValue, PossiblyUndefinedArrayOffset
 	 */
 	public function __construct( Recursive_Record_Iterator $iterator ) {