From ed398c0253e36f85d39452b00d3273867fe0b8ef Mon Sep 17 00:00:00 2001 From: Daimona Eaytoy Date: Mon, 2 Sep 2019 16:13:02 +0000 Subject: [PATCH] preferences: Add typehint in saveFormData() for PreferencesFormOOUI This was temporarily removed in 3bcf5655870f for compat with the GlobalPreferences extension. The old typehint of HTMLForm was incorrect (as discovered by a Phan rule that was disabled for core), because getModifiedUser() only exists in the PreferencesFormOOUI subclass. Change-Id: I792286ed44f03467b5d875e61c52b1953252b55f Depends-On: I4fa3e6aad872434ca397325ed7a83f94973661d0 --- includes/preferences/DefaultPreferencesFactory.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index 8c44a5e609..c672b7b7d1 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -1586,12 +1586,11 @@ class DefaultPreferencesFactory implements PreferencesFactory { * Handle the form submission if everything validated properly * * @param array $formData - * @param HTMLForm $form + * @param PreferencesFormOOUI $form * @param array[] $formDescriptor * @return bool|Status|string */ - protected function saveFormData( $formData, HTMLForm $form, array $formDescriptor ) { - /** @var \User $user */ + protected function saveFormData( $formData, PreferencesFormOOUI $form, array $formDescriptor ) { $user = $form->getModifiedUser(); $hiddenPrefs = $this->options->get( 'HiddenPrefs' ); $result = true; -- 2.20.1