diff options
| author | Daimona Eaytoy <daimona.wiki@gmail.com> | 2019-12-07 19:32:45 +0100 |
|---|---|---|
| committer | Daimona Eaytoy <daimona.wiki@gmail.com> | 2019-12-07 20:16:19 +0000 |
| commit | 598c4d7fcb68ab2b3ef8d895ef97224fe14d4832 (patch) | |
| tree | bd7e7770cde36b384e3e1b74d37cf8bb808a6397 /maintenance/storage | |
| parent | 3077097b77c19046918a9cd27f326eccbe49841f (diff) | |
| download | mediawikicore-598c4d7fcb68ab2b3ef8d895ef97224fe14d4832.tar.gz mediawikicore-598c4d7fcb68ab2b3ef8d895ef97224fe14d4832.zip | |
build: Upgrade phan to 0.9.0
Scalar casts are still allowed (for now), because there's a huge amount
of false positives. Ditto for invalid array offsets.
Thoughts about the rest: luckily, many false positives with array offsets
have gone. Moreover, since *Internal issues are suppressed in the base
config, we can remove inline suppressions.
Unfortunately, there are a couple of new issues about array additions
with only false positives, because apparently they don't take
branches into account.
Change-Id: I5a3913c6e762f77bfdae55051a395fae95d1f841
Diffstat (limited to 'maintenance/storage')
| -rw-r--r-- | maintenance/storage/checkStorage.php | 4 | ||||
| -rw-r--r-- | maintenance/storage/compressOld.php | 2 | ||||
| -rw-r--r-- | maintenance/storage/recompressTracked.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php index 5b99d7787752..d72dc2bca77d 100644 --- a/maintenance/storage/checkStorage.php +++ b/maintenance/storage/checkStorage.php @@ -143,6 +143,7 @@ class CheckStorage { $id = $row->old_id; // Create flagStats row if it doesn't exist + // @phan-suppress-next-line PhanSuspiciousBinaryAddLists $flagStats = $flagStats + [ $flags => 0 ]; // Increment counter $flagStats[$flags]++; @@ -282,6 +283,7 @@ class CheckStorage { continue; } + // @phan-suppress-next-line PhanSuspiciousBinaryAddLists $objectStats = $objectStats + [ $className => 0 ]; $objectStats[$className]++; @@ -568,7 +570,7 @@ class CheckStorage { [], [ 'content' => [ 'INNER JOIN', [ 'content_id = slot_content_id' ] ] ] ); - // @phan-suppress-next-line PhanAccessMethodInternal + $blobStore = MediaWikiServices::getInstance() ->getBlobStoreFactory() ->newSqlBlobStore(); diff --git a/maintenance/storage/compressOld.php b/maintenance/storage/compressOld.php index c4779b948a09..b216d0b0cd2b 100644 --- a/maintenance/storage/compressOld.php +++ b/maintenance/storage/compressOld.php @@ -239,7 +239,7 @@ class CompressOld extends Maintenance { /** @var ExternalStoreDB $storeObj */ $storeObj = $esFactory->getStore( 'DB' ); } - // @phan-suppress-next-line PhanAccessMethodInternal + $blobStore = MediaWikiServices::getInstance() ->getBlobStoreFactory() ->newSqlBlobStore(); diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index 8285851df7aa..b9d94749dc39 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -123,7 +123,7 @@ class RecompressTracked { $this->pageBlobClass = function_exists( 'xdiff_string_bdiff' ) ? DiffHistoryBlob::class : ConcatenatedGzipHistoryBlob::class; $this->orphanBlobClass = ConcatenatedGzipHistoryBlob::class; - // @phan-suppress-next-line PhanAccessMethodInternal + $this->blobStore = MediaWikiServices::getInstance() ->getBlobStoreFactory() ->newSqlBlobStore(); |