From 6963f406f821cccb1079afc26e8c0077d2b55379 Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Wed, 12 Jun 2019 20:10:25 +0100 Subject: [PATCH] PHPDoc: Fix non-carnonical order of elements in phpdoc Change-Id: I21330e14629b5cd085f55c1b6c6232a4a6f4afcf --- includes/libs/objectcache/WANObjectCache.php | 2 +- includes/page/WikiFilePage.php | 2 +- tests/phpunit/includes/title/NamespaceInfoTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index dac3421786..1d8662a3c8 100644 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -1464,7 +1464,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface { * @param string $kClass * @param float $elapsed Seconds spent regenerating the value * @param float $lockTSE - * @param $hasLock bool + * @param bool $hasLock * @return bool Whether it is OK to proceed with a key set operation */ private function checkAndSetCooloff( $key, $kClass, $elapsed, $lockTSE, $hasLock ) { diff --git a/includes/page/WikiFilePage.php b/includes/page/WikiFilePage.php index 8df9ab242a..013dd75384 100644 --- a/includes/page/WikiFilePage.php +++ b/includes/page/WikiFilePage.php @@ -152,7 +152,7 @@ class WikiFilePage extends WikiPage { $size = $this->mFile->getSize(); /** - * @var $file File + * @var File $file */ foreach ( $dupes as $index => $file ) { $key = $file->getRepoName() . ':' . $file->getName(); diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php index b1262a33a9..7eb8fd5243 100644 --- a/tests/phpunit/includes/title/NamespaceInfoTest.php +++ b/tests/phpunit/includes/title/NamespaceInfoTest.php @@ -402,7 +402,7 @@ class NamespaceInfoTest extends MediaWikiTestCase { } /** - * @param $contentNamespaces To pass to constructor + * @param mixed $contentNamespaces To pass to constructor * @param array $expected * @dataProvider provideGetContentNamespaces * @covers NamespaceInfo::getContentNamespaces -- 2.20.1