build: Upgrade mediawiki-phan-config for PHP 8.5 support

Bug: T406326
Change-Id: I90a2fd1aa8fd1a644ef831e19d0cea67687a44e8

Author: umherirrender

.phan/config.php

@@ -1,16 +1,5 @@
 <?php
 
-// NOTE: Automatically re-enable after each update unless someone updates
-// this str_contains check, to avoid forgetting and losing Phan coverage.
-$composerJson = file_get_contents( __DIR__ . '/../composer.json' );
-if (
-	version_compare( PHP_VERSION, '8.5.0' ) >= 0
-	&& str_contains( $composerJson, '"mediawiki/mediawiki-phan-config": "0.18.0"' )
-) {
-	print "Skipping Phan on PHP 8.5. https://phabricator.wikimedia.org/T406326\n\n";
-	exit( 0 );
-}
-
 return [
 
 	'target_php_version' => '8.1',

composer.json

@@ -45,7 +45,7 @@
 	},
 	"require-dev": {
 		"mediawiki/mediawiki-codesniffer": "48.0.0",
-		"mediawiki/mediawiki-phan-config": "0.18.0",
+		"mediawiki/mediawiki-phan-config": "0.19.0",
 		"mediawiki/minus-x": "1.1.3",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
 		"php-parallel-lint/php-parallel-lint": "1.4.0",

lib/Less/ImportVisitor.php

@@ -122,6 +122,7 @@ public function processImportNode( $importNode, $env, &$importParent ) {
 			}
 
 			$e = null;
+			$root = null;
 			try {
 				if ( $importNode->options['inline'] ) {
 					if ( !file_exists( $fullPath ) ) {

lib/Less/Parser.php

@@ -226,6 +226,7 @@ public function getCss() {
 		$locale = setlocale( LC_NUMERIC, 0 );
 		setlocale( LC_NUMERIC, "C" );
 
+		$css = '';
 		try {
 			$root = new Less_Tree_Ruleset( null, $this->rules );
 			$root->root = true;
@@ -340,7 +341,6 @@ private function getVariableValue( Less_Tree $var ) {
 				$return = [];
 				if ( is_array( $var->value ) ) {
 					// in compilation phase, Less_Tree_Anonymous::$val can be a Less_Tree[]
-					// @phan-suppress-next-line PhanTypeMismatchForeach
 					foreach ( $var->value as $value ) {
 						/** @var Less_Tree $value */
 						$return[ $value->name ] = $this->getVariableValue( $value );

lib/Less/Tree.php

@@ -140,7 +140,6 @@ public static function nodeCompare( $a, $b ) {
 		) {
 			// for "symmetric results" force toCSS-based comparison via b.compare()
 			// of Quoted or Anonymous if either value is one of those
-			// @phan-suppress-next-line PhanUndeclaredMethod
 			return $a->compare( $b );
 		} elseif ( $bHasCompare ) {
 			$res = $b->compare( $a );
@@ -153,7 +152,6 @@ public static function nodeCompare( $a, $b ) {
 		}
 
 		// Less_Tree subclasses that have an array value: Less_Tree_Expression, Less_Tree_Value
-		// @phan-suppress-next-line PhanUndeclaredProperty
 		$aval = $a->value ?? [];
 		$bval = $b->value ?? [];
 		if ( !( $a instanceof Less_Tree_Expression || $a instanceof Less_Tree_Value ) ) {

lib/Less/Tree/Attribute.php

@@ -4,15 +4,15 @@
  * @see less-2.5.3.js#Attribute.prototype
  */
 class Less_Tree_Attribute extends Less_Tree implements Less_Tree_HasValueProperty {
-	/** @var string */
+	/** @var string|Less_Tree */
 	public $key;
 	/** @var null|string */
 	public $op;
 	/** @var null|string|Less_Tree */
 	public $value;
 
 	/**
-	 * @param string $key
+	 * @param string|Less_Tree $key
 	 * @param null|string $op
 	 * @param null|string|Less_Tree $value
 	 */

lib/Less/Tree/Declaration.php

@@ -8,7 +8,7 @@ class Less_Tree_Declaration extends Less_Tree implements Less_Tree_HasValuePrope
 
 	/** @var string|array<Less_Tree_Keyword|Less_Tree_Variable> */
 	public $name;
-	/** @var Less_Tree[]|Less_Tree_Anonymous */
+	/** @var Less_Tree */
 	public $value;
 	/** @var string */
 	public $important;
@@ -171,6 +171,7 @@ public function mark( $value ) {
 		if ( !is_array( $this->value ) ) {
 
 			if ( method_exists( $value, 'markReferenced' ) ) {
+				// @phan-suppress-next-line PhanUndeclaredMethod
 				$value->markReferenced();
 			}
 		} else {

lib/Less/Tree/Expression.php

@@ -12,6 +12,10 @@ class Less_Tree_Expression extends Less_Tree implements Less_Tree_HasValueProper
 	/** @var true|null */
 	public $parens = null;
 
+	/**
+	 * @param Less_Tree[] $value
+	 * @param bool $noSpacing
+	 */
 	public function __construct( $value, $noSpacing = false ) {
 		$this->value = $value;
 		$this->noSpacing = $noSpacing;
@@ -71,8 +75,10 @@ public function genCSS( $output ) {
 			$this->value[$i]->genCSS( $output );
 			if ( !$this->noSpacing && ( $i + 1 < $val_len ) ) {
 				// NOTE: Comma handling backported from Less.js 4.2.1 (T386077)
-				if ( !( $this->value[$i + 1] instanceof Less_Tree_Anonymous )
-					|| ( $this->value[$i + 1] instanceof Less_Tree_Anonymous && $this->value[$i + 1]->value !== ',' )
+				// Local variable helps phan to infer types on this condition
+				$nextVal = $this->value[$i + 1];
+				if ( !$nextVal instanceof Less_Tree_Anonymous
+					|| $nextVal->value !== ','
 				) {
 					$output->add( ' ' );
 				}

lib/Less/Tree/Mixin/Definition.php

@@ -106,6 +106,7 @@ public function compileParams( $env, $mixinFrames, $args = [], &$evaldArguments
 					$expression = new Less_Tree_Expression( $varargs );
 					array_unshift( $frame->rules, new Less_Tree_Declaration( $name, $expression->compile( $env ) ) );
 				} else {
+					// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
 					$val = ( $arg && $arg['value'] ) ? $arg['value'] : false;
 
 					if ( $val ) {

lib/Less/Tree/Operation.php

@@ -14,6 +14,8 @@ class Less_Tree_Operation extends Less_Tree {
 
 	/**
 	 * @param string $op
+	 * @param Less_Tree[] $operands
+	 * @param bool $isSpaced
 	 */
 	public function __construct( $op, $operands, $isSpaced = false ) {
 		$this->op = trim( $op );