From 1413279c26285cc10cf6b670da07617e2507d740 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Sat, 29 Jun 2024 19:20:27 +0000
Subject: [PATCH] Directly access the properties with non-static functions

Change-Id: Id9dbb20f39695f5d75839a2ae14003c6dde9c21e
---
 includes/PopupsHooks.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index 70fd24fc9..53dd548f1 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -101,12 +101,12 @@ class PopupsHooks implements
 		}
 
 		$skinPosition = array_search( 'skin', array_keys( $prefs ) );
-		$readingOptions = self::getPagePreviewPrefToggle( $user, $this->popupsContext );
+		$readingOptions = $this->getPagePreviewPrefToggle( $user );
 
 		if ( $this->config->get( 'PopupsReferencePreviews' ) ) {
 			$readingOptions = array_merge(
 				$readingOptions,
-				self::getReferencePreviewPrefToggle( $user, $this->popupsContext )
+				$this->getReferencePreviewPrefToggle( $user )
 			);
 		}
 
@@ -124,10 +124,9 @@ class PopupsHooks implements
 	 * Get Page Preview option
 	 *
 	 * @param User $user User whose preferences are being modified
-	 * @param PopupsContext $context
 	 * @return array[]
 	 */
-	private static function getPagePreviewPrefToggle( User $user, PopupsContext $context ) {
+	private function getPagePreviewPrefToggle( User $user ) {
 		$option = [
 			'type' => 'toggle',
 			'label-message' => 'popups-prefs-optin',
@@ -135,7 +134,7 @@ class PopupsHooks implements
 			'section' => self::PREVIEWS_PREFERENCES_SECTION
 		];
 
-		if ( $context->conflictsWithNavPopupsGadget( $user ) ) {
+		if ( $this->popupsContext->conflictsWithNavPopupsGadget( $user ) ) {
 			$option[ 'disabled' ] = true;
 			$option[ 'help-message' ] = [ 'popups-prefs-disable-nav-gadgets-info',
 				'Special:Preferences#mw-prefsection-gadgets' ];
@@ -150,10 +149,9 @@ class PopupsHooks implements
 	 * Get Reference Preview option
 	 *
 	 * @param User $user User whose preferences are being modified
-	 * @param PopupsContext $context
 	 * @return array[]
 	 */
-	private static function getReferencePreviewPrefToggle( User $user, PopupsContext $context ) {
+	private function getReferencePreviewPrefToggle( User $user ) {
 		$option = [
 			'type' => 'toggle',
 			'label-message' => 'popups-refpreview-user-preference-label',
@@ -161,8 +159,8 @@ class PopupsHooks implements
 			'section' => self::PREVIEWS_PREFERENCES_SECTION
 		];
 
-		$isNavPopupsGadgetEnabled = $context->conflictsWithNavPopupsGadget( $user );
-		$isRefTooltipsGadgetEnabled = $context->conflictsWithRefTooltipsGadget( $user );
+		$isNavPopupsGadgetEnabled = $this->popupsContext->conflictsWithNavPopupsGadget( $user );
+		$isRefTooltipsGadgetEnabled = $this->popupsContext->conflictsWithRefTooltipsGadget( $user );
 
 		if ( $isNavPopupsGadgetEnabled && $isRefTooltipsGadgetEnabled ) {
 			$option[ 'disabled' ] = true;