From 3ed2fa2f811b42752b4db7a03b65bfe08d32ae63 Mon Sep 17 00:00:00 2001
From: kagg-design <info@kagg.eu>
Date: Wed, 26 Jul 2023 17:35:51 +0300
Subject: [PATCH] Fix add_filter type hints in Settings.

---
 src/php/Settings/Abstracts/SettingsBase.php | 13 ++++++------
 src/php/Settings/Settings.php               | 22 +++++++++++++++++++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/php/Settings/Abstracts/SettingsBase.php b/src/php/Settings/Abstracts/SettingsBase.php
index 81fc07c6..1017f49c 100644
--- a/src/php/Settings/Abstracts/SettingsBase.php
+++ b/src/php/Settings/Abstracts/SettingsBase.php
@@ -270,13 +270,14 @@ protected function is_tab(): bool {
 	/**
 	 * Add link to plugin setting page on plugins page.
 	 *
-	 * @param array $actions An array of plugin action links.
-	 *                       By default, this can include 'activate', 'deactivate', and 'delete'.
-	 *                       With Multisite active this can also include 'network_active' and 'network_only' items.
+	 * @param array|mixed $actions An array of plugin action links.
+	 *                             By default, this can include 'activate', 'deactivate', and 'delete'.
+	 *                             With Multisite active this can also include 'network_active' and 'network_only'
+	 *                             items.
 	 *
 	 * @return array|string[] Plugin links
 	 */
-	public function add_settings_link( array $actions ): array {
+	public function add_settings_link( $actions ): array {
 		$new_actions = [
 			'settings' =>
 				'<a href="' . admin_url( $this->parent_slug() . '?page=' . $this->option_page() ) .
@@ -284,7 +285,7 @@ public function add_settings_link( array $actions ): array {
 				esc_html( $this->settings_link_text() ) . '</a>',
 		];
 
-		return array_merge( $new_actions, $actions );
+		return array_merge( $new_actions, (array) $actions );
 	}
 
 	/**
@@ -306,7 +307,7 @@ protected function init_settings() {
 		$settings_exist                       = is_array( $this->settings );
 		$this->settings                       = (array) $this->settings;
 		$form_fields                          = $this->form_fields();
-		$network_wide_setting                 = array_key_exists( self::NETWORK_WIDE, (array) $this->settings ) ?
+		$network_wide_setting                 = array_key_exists( self::NETWORK_WIDE, $this->settings ) ?
 			$this->settings[ self::NETWORK_WIDE ] :
 			$network_wide;
 		$this->settings[ self::NETWORK_WIDE ] = $network_wide_setting;
diff --git a/src/php/Settings/Settings.php b/src/php/Settings/Settings.php
index 5ccb7426..fbcbb115 100644
--- a/src/php/Settings/Settings.php
+++ b/src/php/Settings/Settings.php
@@ -31,6 +31,13 @@ class Settings implements SettingsInterface {
 	 */
 	protected $tabs = [];
 
+	/**
+	 * Screen ids of pages and tabs.
+	 *
+	 * @var array
+	 */
+	private $screen_ids = [];
+
 	/**
 	 * Settings constructor.
 	 *
@@ -61,8 +68,9 @@ protected function init() {
 				 *
 				 * @var PluginSettingsBase $tab
 				 */
-				$tab    = new $tab_class( null );
-				$tabs[] = $tab;
+				$tab                = new $tab_class( null );
+				$tabs[]             = $tab;
+				$this->screen_ids[] = $tab->screen_id();
 			}
 
 			/**
@@ -227,4 +235,14 @@ public function set_field( string $key, string $field_key, $value ) {
 			}
 		}
 	}
+
+	/**
+	 * Get screen ids of all settings pages and tabs.
+	 *
+	 * @return array
+	 * @noinspection PhpUnused
+	 */
+	public function screen_ids(): array {
+		return $this->screen_ids;
+	}
 }