Mailing List Archive

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405908 )

Change subject: Phan: resolve and reenable PhanAccessMethodProtected
......................................................................


Phan: resolve and reenable PhanAccessMethodProtected

Change-Id: I2bd7c787012f4f54600f3289d9d0d725f87788bc
---
M includes/Preferences.php
M includes/libs/filebackend/FileBackendMultiWrite.php
M includes/preferences/DefaultPreferencesFactory.php
M tests/phan/config.php
4 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified



diff --git a/includes/Preferences.php b/includes/Preferences.php
index f08b155..f65b2ce 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -303,6 +303,8 @@
/**
* Handle the form submission if everything validated properly
*
+ * @deprecated since 1.31, use PreferencesFactory
+ *
* @param array $formData
* @param PreferencesForm $form
* @return bool|Status|string
diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php b/includes/libs/filebackend/FileBackendMultiWrite.php
index f8ca7e5..9c367af 100644
--- a/includes/libs/filebackend/FileBackendMultiWrite.php
+++ b/includes/libs/filebackend/FileBackendMultiWrite.php
@@ -87,6 +87,9 @@
* This will apply such updates post-send for web requests. Note that
* any checks from "syncChecks" are still synchronous.
*
+ * Bogus warning
+ * @suppress PhanAccessMethodProtected
+ *
* @param array $config
* @throws FileBackendError
*/
diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index 0391b30..a23d644 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -1617,7 +1617,7 @@
* @param PreferencesForm $form
* @return bool|Status|string
*/
- protected function legacySaveFormData( $formData, PreferencesForm $form ) {
+ public function legacySaveFormData( $formData, PreferencesForm $form ) {
return $this->saveFormData( $formData, $form );
}

diff --git a/tests/phan/config.php b/tests/phan/config.php
index 52a565c..84132b9 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -294,8 +294,6 @@
* to this black-list to inhibit them from being reported.
*/
'suppress_issue_types' => [
- // approximate error count: 1
- "PhanAccessMethodProtected",
// approximate error count: 29
"PhanCommentParamOnEmptyParamList",
// approximate error count: 33

--
To view, visit https://gerrit.wikimedia.org/r/405908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bd7c787012f4f54600f3289d9d0d725f87788bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.wiki@gmail.com>
Gerrit-Reviewer: Brian Wolff <bawolff+wn@gmail.com>
Gerrit-Reviewer: Samwilson <sam@samwilson.id.au>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits