From 577f4dab93be7a7d07507ad1c8bc792573c16707 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Sat, 23 Feb 2019 21:29:18 -0800
Subject: [PATCH] Migrate to new phan

Bug: T216904
Change-Id: I30864bd3d7f9b9ab674bf6589cd9e5e3aed5bb8d
---
 .gitignore                                  | 1 -
 {tests/phan => .phan}/config.php            | 6 +++---
 composer.json                               | 2 +-
 includes/AbuseFilterVariableHolder.php      | 3 ---
 includes/Views/AbuseFilterViewTestBatch.php | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)
 rename {tests/phan => .phan}/config.php (56%)

diff --git a/.gitignore b/.gitignore
index d08bf099b..3361170a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,3 @@ project.index
 ## Sublime
 sublime-*
 sftp-config.json
-/tests/phan/issues
diff --git a/tests/phan/config.php b/.phan/config.php
similarity index 56%
rename from tests/phan/config.php
rename to .phan/config.php
index 99685d088..177b4eb8e 100644
--- a/tests/phan/config.php
+++ b/.phan/config.php
@@ -1,18 +1,18 @@
 <?php
 
-$cfg = require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';
+$cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
 
 $cfg['directory_list'] = array_merge(
 	$cfg['directory_list'],
 	[
-		'./../../extensions/CheckUser',
+		'../../extensions/CheckUser',
 	]
 );
 
 $cfg['exclude_analysis_directory_list'] = array_merge(
 	$cfg['exclude_analysis_directory_list'],
 	[
-		'./../../extensions/CheckUser',
+		'../../extensions/CheckUser',
 	]
 );
 
diff --git a/composer.json b/composer.json
index 3dc206238..8b6150b0c 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
 		"mediawiki/mediawiki-codesniffer": "24.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.2",
-		"mediawiki/mediawiki-phan-config": "0.3.0"
+		"mediawiki/mediawiki-phan-config": "0.5.0"
 	},
 	"scripts": {
 		"fix": [
diff --git a/includes/AbuseFilterVariableHolder.php b/includes/AbuseFilterVariableHolder.php
index f99241198..9a8e01a8d 100644
--- a/includes/AbuseFilterVariableHolder.php
+++ b/includes/AbuseFilterVariableHolder.php
@@ -206,9 +206,6 @@ class AbuseFilterVariableHolder {
 	/**
 	 * Compute all vars which need DB access. Useful for vars which are going to be saved
 	 * cross-wiki or used for offline analysis.
-	 *
-	 * @suppress PhanUndeclaredProperty for $value->mMethod (phan thinks $value is always AFPData)
-	 * @suppress PhanUndeclaredMethod for $value->compute (phan thinks $value is always AFPData)
 	 */
 	public function computeDBVars() {
 		static $dbTypes = [
diff --git a/includes/Views/AbuseFilterViewTestBatch.php b/includes/Views/AbuseFilterViewTestBatch.php
index 13eda3402..1972be7a3 100644
--- a/includes/Views/AbuseFilterViewTestBatch.php
+++ b/includes/Views/AbuseFilterViewTestBatch.php
@@ -195,7 +195,7 @@ class AbuseFilterViewTestBatch extends AbuseFilterView {
 			if ( $result || $this->mShowNegative ) {
 				// Stash result in RC item
 				$rc = RecentChange::newFromRow( $row );
-				/** @suppress PhanUndeclaredProperty for $rc->filterResult, which isn't a big deal */
+				// @phan-suppress-next-line PhanUndeclaredProperty not a big deal
 				$rc->filterResult = $result;
 				$rc->counter = $counter++;
 				$output .= $changesList->recentChangesLine( $rc, false );