Add mediawiki/mediawiki-phan-config

reedy · reedy · commit 269f67a2143c · 2021-02-11T17:26:16.000Z
Change-Id: Ie744ba8c755c1f7e58de43dd0bf5e9668546ba91
diff --git a/.phan/config.php b/.phan/config.php
@@ -0,0 +1,3 @@
+<?php
+
+return require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
diff --git a/composer.json b/composer.json
@@ -28,6 +28,7 @@
 	},
 	"require-dev": {
 		"mediawiki/mediawiki-codesniffer": "35.0.0",
+		"mediawiki/mediawiki-phan-config": "0.10.6",
 		"mediawiki/minus-x": "1.1.1",
 		"ockcyp/covers-validator": "1.3.3",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
@@ -40,12 +41,14 @@
 			"phpunit",
 			"covers-validator",
 			"phpcs -sp",
+			"phan --allow-polyfill-parser --long-progress-bar",
 			"minus-x check ."
 		],
 		"cover": "phpunit --coverage-html coverage",
 		"fix": [
 			"minus-x fix .",
 			"phpcbf"
-		]
+		],
+		"phan": "phan -d . --long-progress-bar"
 	}
 }
diff --git a/src/Converter.php b/src/Converter.php
@@ -144,7 +144,9 @@ protected function doConvert() {
 					$token->error( 'unexpected operator' );
 				}
 				// Resolve higher precedence levels
+				/** @var Operator $lastOp */
 				$lastOp = end( $this->operators );
+				// @phan-suppress-next-line PhanUndeclaredProperty
 				while ( $lastOp && self::$precedence[$token->name] <= self::$precedence[$lastOp->name] ) {
 					$this->doOperation( $lastOp );
 					array_pop( $this->operators );
@@ -260,6 +262,7 @@ protected function nextToken() {
 		}
 
 		// The single-character operand symbols
+		// @phan-suppress-next-line PhanParamSuspiciousOrder
 		if ( strpos( self::OPERAND_SYMBOLS, $word1 ) !== false ) {
 			$token = $this->newNumber( $word1, $this->pos );
 			$this->pos++;
diff --git a/src/Evaluator.php b/src/Evaluator.php
@@ -50,7 +50,7 @@ public static function compile( array $rules ) {
 	 * Evaluate a compiled set of rules returned by compile(). Do not allow
 	 * the user to edit the compiled form, or else PHP errors may result.
 	 *
-	 * @param string $number The number to be evaluated against the rules, in English, or it
+	 * @param string|int $number The number to be evaluated against the rules, in English, or it
 	 *   may be a type convertible to string.
 	 * @param array $rules The associative array of plural rules in pluralform => rule format.
 	 * @return int The index of the plural form which passed the evaluation

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+return require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static function compile( array $rules ) {`
`50`	`50`	`* Evaluate a compiled set of rules returned by compile(). Do not allow`
`51`	`51`	`* the user to edit the compiled form, or else PHP errors may result.`
`52`	`52`	`*`
`53`		`- * @param string $number The number to be evaluated against the rules, in English, or it`
	`53`	`+ * @param string\|int $number The number to be evaluated against the rules, in English, or it`
`54`	`54`	`* may be a type convertible to string.`
`55`	`55`	`* @param array $rules The associative array of plural rules in pluralform => rule format.`
`56`	`56`	`* @return int The index of the plural form which passed the evaluation`