From 55497cdc1a645a58d7e9d2968a081a5350d7eb3a Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem.wiki@gmail.com>
Date: Tue, 23 Jan 2018 09:31:13 -0800
Subject: [PATCH] Phan: resolve and reenable PhanAccessMethodProtected

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

diff --git a/includes/Preferences.php b/includes/Preferences.php
index f08b155058..f65b2ce15e 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -303,6 +303,8 @@ class Preferences {
 	/**
 	 * 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 f8ca7e5aef..9c367af5ad 100644
--- a/includes/libs/filebackend/FileBackendMultiWrite.php
+++ b/includes/libs/filebackend/FileBackendMultiWrite.php
@@ -87,6 +87,9 @@ class FileBackendMultiWrite extends FileBackend {
 	 *                      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 0391b301a7..a23d6446a1 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -1617,7 +1617,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 	 * @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 52a565c5fa..84132b9682 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -294,8 +294,6 @@ return [
 	 * 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
-- 
2.20.1