diff --git a/.gitignore b/.gitignore
index 5ae2dd25..f453a613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,3 @@ project.index
 ## Sublime
 sublime-*
 sftp-config.json
-tests/phan/issues
diff --git a/.phan/config.php b/.phan/config.php
new file mode 100644
index 00000000..aa85e632
--- /dev/null
+++ b/.phan/config.php
@@ -0,0 +1,30 @@
+<?php
+
+$cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
+
+$cfg['file_list'][] = 'Scribunto.php';
+
+$cfg['directory_list'] = array_merge(
+	$cfg['directory_list'],
+	[
+		'vendor/mediawiki/lua-sandbox/stubs',
+		'../../extensions/SyntaxHighlight_GeSHi',
+	]
+);
+
+$cfg['exclude_analysis_directory_list'] = array_merge(
+	$cfg['exclude_analysis_directory_list'],
+	[
+		'vendor/mediawiki/lua-sandbox/stubs',
+		'../../extensions/SyntaxHighlight_GeSHi',
+	]
+);
+$cfg['suppress_issue_types'] = array_merge(
+	$cfg['suppress_issue_types'],
+	[
+		// \Parser->scribunto_engine
+		'PhanUndeclaredProperty',
+	]
+);
+
+return $cfg;
diff --git a/Scribunto.php b/Scribunto.php
index e75bab9d..a990b257 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -1,5 +1,5 @@
 <?php
-
+// @phan-file-suppress PhanUndeclaredVariableDim false positive
 if ( function_exists( 'wfLoadExtension' ) ) {
 	wfLoadExtension( 'Scribunto' );
 	// Keep i18n globals so mergeMessageFileList.php doesn't break
diff --git a/composer.json b/composer.json
index 85ca2306..c74bf27b 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 		"mediawiki/lua-sandbox": "3.0.1",
 		"mediawiki/minus-x": "0.3.1",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
-		"mediawiki/mediawiki-phan-config": "0.3.0"
+		"mediawiki/mediawiki-phan-config": "0.5.0"
 	},
 	"repositories": [
 		{
diff --git a/includes/common/Common.php b/includes/common/Common.php
index 65237d08..cd6af295 100644
--- a/includes/common/Common.php
+++ b/includes/common/Common.php
@@ -41,6 +41,7 @@ class Scribunto {
 			throw new MWException( 'Invalid scripting engine is specified in $wgScribuntoDefaultEngine' );
 		}
 		$options = $extraOptions + $wgScribuntoEngineConf[$wgScribuntoDefaultEngine];
+		// @phan-suppress-next-line PhanTypeMismatchArgument false positive
 		return self::newEngine( $options );
 	}
 
diff --git a/includes/common/Hooks.php b/includes/common/Hooks.php
index 10534903..8ea00c04 100644
--- a/includes/common/Hooks.php
+++ b/includes/common/Hooks.php
@@ -363,7 +363,6 @@ class ScribuntoHooks {
 			return true;
 		}
 
-		/** @suppress PhanUndeclaredMethod */
 		$validateStatus = $content->validate( $title );
 		if ( $validateStatus->isOK() ) {
 			return true;
diff --git a/includes/engines/LuaCommon/LuaCommon.php b/includes/engines/LuaCommon/LuaCommon.php
index 0faa1b3d..827e3bcd 100644
--- a/includes/engines/LuaCommon/LuaCommon.php
+++ b/includes/engines/LuaCommon/LuaCommon.php
@@ -567,7 +567,7 @@ abstract class Scribunto_LuaEngine extends ScribuntoEngineBase {
 
 		$module = $this->fetchModuleFromParser( $title );
 		if ( $module ) {
-			/** @suppress PhanUndeclaredMethod */
+			// @phan-suppress-next-line PhanUndeclaredMethod
 			return [ $module->getInitChunk() ];
 		} else {
 			return [];
@@ -1045,27 +1045,27 @@ class Scribunto_LuaError extends ScribuntoException {
 			}
 
 			if ( strval( $info['namewhat'] ) !== '' ) {
-				$function = wfMessage( 'scribunto-lua-in-function', wfEscapeWikiText( $info['name'] ) );
+				$functionMsg = wfMessage( 'scribunto-lua-in-function', wfEscapeWikiText( $info['name'] ) );
 				in_array( 'content', $msgOptions ) ?
-					$function = $function->inContentLanguage()->plain() :
-					$function = $function->plain();
+					$function = $functionMsg->inContentLanguage()->plain() :
+					$function = $functionMsg->plain();
 			} elseif ( $info['what'] == 'main' ) {
-				$function = wfMessage( 'scribunto-lua-in-main' );
+				$functionMsg = wfMessage( 'scribunto-lua-in-main' );
 				in_array( 'content', $msgOptions ) ?
-					$function = $function->inContentLanguage()->plain() :
-					$function = $function->plain();
+					$function = $functionMsg->inContentLanguage()->plain() :
+					$function = $functionMsg->plain();
 			} else {
 				// C function, tail call, or a Lua function where Lua can't
 				// guess the name
 				$function = '?';
 			}
 
-			$backtraceLine = wfMessage( 'scribunto-lua-backtrace-line' )
+			$backtraceLineMsg = wfMessage( 'scribunto-lua-backtrace-line' )
 				->rawParams( "<strong>$src</strong>" )
 				->params( $function );
 			in_array( 'content', $msgOptions ) ?
-				$backtraceLine = $backtraceLine->inContentLanguage()->parse() :
-				$backtraceLine = $backtraceLine->parse();
+				$backtraceLine = $backtraceLineMsg->inContentLanguage()->parse() :
+				$backtraceLine = $backtraceLineMsg->parse();
 
 			$s .= "<li>$backtraceLine</li>";
 		}
diff --git a/includes/engines/LuaCommon/UstringLibrary.php b/includes/engines/LuaCommon/UstringLibrary.php
index a053a5a9..82f1445a 100644
--- a/includes/engines/LuaCommon/UstringLibrary.php
+++ b/includes/engines/LuaCommon/UstringLibrary.php
@@ -476,6 +476,7 @@ class Scribunto_LuaUstringLibrary extends Scribunto_LuaLibraryBase {
 						// Because %f considers the beginning and end of the string
 						// to be \0, determine if $re2 matches that and take it
 						// into account with "^" and "$".
+						// @phan-suppress-next-line PhanParamSuspiciousOrder
 						if ( preg_match( "/$re2/us", "\0" ) ) {
 							$re .= "(?<!^)(?<!$re2)(?=$re2|$)";
 						} else {
diff --git a/includes/engines/LuaStandalone/LuaStandaloneEngine.php b/includes/engines/LuaStandalone/LuaStandaloneEngine.php
index 7295aa76..6bc6dd7a 100644
--- a/includes/engines/LuaStandalone/LuaStandaloneEngine.php
+++ b/includes/engines/LuaStandalone/LuaStandaloneEngine.php
@@ -6,6 +6,7 @@ use Psr\Log\NullLogger;
 
 class Scribunto_LuaStandaloneEngine extends Scribunto_LuaEngine {
 	protected static $clockTick;
+	/** @var array|bool */
 	public $initialStatus;
 
 	/**
@@ -73,7 +74,7 @@ class Scribunto_LuaStandaloneEngine extends Scribunto_LuaEngine {
 				$value = array_map( [ $lang, 'formatSize' ], $value );
 				break;
 			case 'scribunto-limitreport-estmemusage':
-				/** @suppress PhanTypeMismatchArgument */
+				// @phan-suppress-next-line PhanTypeMismatchArgument
 				$value = $lang->formatSize( $value );
 				break;
 		}
@@ -130,7 +131,7 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
 	public $enableDebug;
 
 	/**
-	 * @var resource
+	 * @var resource|bool
 	 */
 	public $proc;
 
@@ -684,6 +685,9 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
 		proc_terminate( $this->proc );
 		while ( true ) {
 			$status = proc_get_status( $this->proc );
+			// XXX: Should proc_get_status docs be changed so that
+			// its documented as possibly returning false?
+			// @phan-suppress-next-line PhanTypeComparisonFromArray
 			if ( $status === false ) {
 				// WTF? Let the caller throw an appropriate error.
 				return;
diff --git a/tests/phan/config.php b/tests/phan/config.php
deleted file mode 100644
index b5392165..00000000
--- a/tests/phan/config.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$cfg = require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';
-
-$cfg['directory_list'] = array_merge(
-	$cfg['directory_list'],
-	[
-		'./vendor/mediawiki/lua-sandbox/stubs',
-		'./../../extensions/SyntaxHighlight_GeSHi',
-	]
-);
-$cfg['file_list'][] = './Scribunto.php';
-
-$cfg['exclude_analysis_directory_list'] = array_merge(
-	$cfg['exclude_analysis_directory_list'],
-	[
-		'./vendor/mediawiki/lua-sandbox/stubs',
-		'./../../extensions/SyntaxHighlight_GeSHi',
-	]
-);
-$cfg['suppress_issue_types'] = array_merge(
-	$cfg['suppress_issue_types'],
-	[
-		// \Parser->scribunto_engine
-		'PhanUndeclaredProperty',
-		// \Scribunto_LuaInterpreter::callFunction()
-		'PhanParamTooMany',
-		// our version of phan doesn't support inheriting doc yet
-		'PhanParamSignatureMismatch',
-	]
-);
-
-return $cfg;