(phan) Run phan tests with PHP 8.1

edwardspec · Sep 8, 2024 · 28365ea · 28365ea
1 parent a3c29e6
commit 28365ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-            php-version: '7.4'
+            php-version: '8.1'
             extensions: ast
             tools: composer
       - uses: actions/cache@v4

diff --git a/.phan/config.php b/.phan/config.php
@@ -23,9 +23,9 @@
 	# These interfaces exist both in "extensions/AWS/vendor/" and in "vendor/" of MediaWiki core.
 	# They are identical, but let's exclude one to not confuse Phan.
 	'vendor/psr/http-message/src/RequestInterface.php',
-	'vendor/psr/log/Psr/Log/LoggerInterface.php',
-	'vendor/psr/log/Psr/Log/LogLevel.php',
-	'vendor/psr/log/Psr/Log/NullLogger.php'
+	'vendor/psr/log/src/LoggerInterface.php',
+	'vendor/psr/log/src/LogLevel.php',
+	'vendor/psr/log/src/NullLogger.php'
 ] );
 
 # Temporarily suppressed warnings.

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 		"php-parallel-lint/php-console-highlighter": "0.5",
 		"mediawiki/minus-x": "1.1.0",
 		"mediawiki/mediawiki-codesniffer": "42.0.0",
-		"mediawiki/mediawiki-phan-config": "0.11.0"
+		"mediawiki/mediawiki-phan-config": "0.14.0"
 	},
 	"scripts": {
 		"test": [

diff --git a/s3/AmazonS3SubdirectoryIterator.php b/s3/AmazonS3SubdirectoryIterator.php
@@ -58,6 +58,7 @@ public function accept(): bool {
 	}
 
 	public function current(): string {
+		// @phan-suppress-next-line PhanUndeclaredMethod <--- false positive
 		return dirname( $this->getInnerIterator()->current() );
 	}
 }