From 9bd93469a7b4eee243069c7a4da4cb780ac6716c Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Mon, 10 Jun 2019 12:48:13 -0700 Subject: [PATCH] build: Updating mediawiki/mediawiki-phan-config to 0.6.1 Change-Id: I370fed5248c8b243527cafb77d80ddb6f4bc7064 --- RELEASE-NOTES-1.34 | 1 + composer.json | 2 +- includes/historyblob/ConcatenatedGzipHistoryBlob.php | 1 + includes/historyblob/HistoryBlobCurStub.php | 1 + includes/historyblob/HistoryBlobStub.php | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 297ce28f90..f5d49dc652 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -85,6 +85,7 @@ For notes on 1.33.x and older releases, see HISTORY. * Updated wikimedia/object-factory from 1.0.0 to 2.0.0. * Updated wikimedia/timestamp from 2.2.0 to 3.0.0. * Updated wikimedia/xmp-reader from 0.6.2 to 0.6.3. +* Updated mediawiki/mediawiki-phan-config from 0.6.0 to 0.6.1 (dev-only). * … ==== Removed external libraries ==== diff --git a/composer.json b/composer.json index 35e451de62..ee3d2c4766 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,7 @@ "wikimedia/avro": "1.8.0", "wikimedia/testing-access-wrapper": "~1.0", "wmde/hamcrest-html-matchers": "^0.1.0", - "mediawiki/mediawiki-phan-config": "0.6.0", + "mediawiki/mediawiki-phan-config": "0.6.1", "symfony/yaml": "3.4.28", "johnkary/phpunit-speedtrap": "^1.0 | ^2.0" }, diff --git a/includes/historyblob/ConcatenatedGzipHistoryBlob.php b/includes/historyblob/ConcatenatedGzipHistoryBlob.php index f6ca2f5a36..7824872815 100644 --- a/includes/historyblob/ConcatenatedGzipHistoryBlob.php +++ b/includes/historyblob/ConcatenatedGzipHistoryBlob.php @@ -142,5 +142,6 @@ if ( false ) { // autoload entries for the lowercase variants of these classes (T166759). // The code below is never executed, but it is picked up by the AutoloadGenerator // parser, which scans for class_alias() calls. + // @phan-suppress-next-line PhanRedefineClassAlias class_alias( ConcatenatedGzipHistoryBlob::class, 'concatenatedgziphistoryblob' ); } diff --git a/includes/historyblob/HistoryBlobCurStub.php b/includes/historyblob/HistoryBlobCurStub.php index 8858c8d1e2..cd2a935e6d 100644 --- a/includes/historyblob/HistoryBlobCurStub.php +++ b/includes/historyblob/HistoryBlobCurStub.php @@ -69,5 +69,6 @@ if ( false ) { // autoload entries for the lowercase variants of these classes (T166759). // The code below is never executed, but it is picked up by the AutoloadGenerator // parser, which scans for class_alias() calls. + // @phan-suppress-next-line PhanRedefineClassAlias class_alias( HistoryBlobCurStub::class, 'historyblobcurstub' ); } diff --git a/includes/historyblob/HistoryBlobStub.php b/includes/historyblob/HistoryBlobStub.php index 9a4df1f81d..c92e1b5494 100644 --- a/includes/historyblob/HistoryBlobStub.php +++ b/includes/historyblob/HistoryBlobStub.php @@ -149,5 +149,6 @@ if ( false ) { // autoload entries for the lowercase variants of these classes (T166759). // The code below is never executed, but it is picked up by the AutoloadGenerator // parser, which scans for class_alias() calls. + // @phan-suppress-next-line PhanRedefineClassAlias class_alias( HistoryBlobStub::class, 'historyblobstub' ); } -- 2.20.1