Merge "Fix order of @var parameter in PHP"

diff --combined includes/installer/DatabaseUpdater.php
index 54ffa5a,24f7dc8..b32be39
--- 1/includes/installer/DatabaseUpdater.php
--- 2/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@@ -20,6 -20,7 +20,6 @@@
   * @file
   * @ingroup Deployment
   */
 -use Wikimedia\Rdbms\Database;
  use Wikimedia\Rdbms\IDatabase;
  use Wikimedia\Rdbms\IMaintainableDatabase;
  use MediaWiki\MediaWikiServices;
@@@ -59,7 -60,7 +59,7 @@@ abstract class DatabaseUpdater 
        /**
         * Handle to the database subclass
         *
 -       * @var Database
 +       * @var IMaintainableDatabase
         */
        protected $db;
  
@@@ -110,15 -111,11 +110,15 @@@
        protected $holdContentHandlerUseDB = true;
  
        /**
 -       * @param Database &$db To perform updates on
 +       * @param IMaintainableDatabase &$db To perform updates on
         * @param bool $shared Whether to perform updates on shared tables
         * @param Maintenance|null $maintenance Maintenance object which created us
         */
 -      protected function __construct( Database &$db, $shared, Maintenance $maintenance = null ) {
 +      protected function __construct(
 +              IMaintainableDatabase &$db,
 +              $shared,
 +              Maintenance $maintenance = null
 +      ) {
                $this->db = $db;
                $this->db->setFlag( DBO_DDLMODE ); // For Oracle's handling of schema files
                $this->shared = $shared;
@@@ -206,7 -203,7 +206,7 @@@
        /**
         * Get a database connection to run updates
         *
 -       * @return Database
 +       * @return IMaintainableDatabase
         */
        public function getDB() {
                return $this->db;
@@@ -1227,7 -1224,7 +1227,7 @@@
         */
        protected function rebuildLocalisationCache() {
                /**
-                * @var $cl RebuildLocalisationCache
+                * @var RebuildLocalisationCache $cl
                 */
                $cl = $this->maintenance->runChild(
                        RebuildLocalisationCache::class, 'rebuildLocalisationCache.php'

diff --combined tests/phpunit/includes/page/WikiPageDbTestBase.php
index 5487556,fbe0356..3a3feee
--- 1/tests/phpunit/includes/page/WikiPageDbTestBase.php
--- 2/tests/phpunit/includes/page/WikiPageDbTestBase.php
+++ b/tests/phpunit/includes/page/WikiPageDbTestBase.php
@@@ -71,7 -71,7 +71,7 @@@ abstract class WikiPageDbTestBase exten
  
        protected function tearDown() {
                foreach ( $this->pagesToDelete as $p ) {
-                       /* @var $p WikiPage */
+                       /* @var WikiPage $p */
  
                        try {
                                if ( $p->exists() ) {
@@@ -483,7 -483,7 +483,7 @@@
                                'delete',
                                'delete',
                                'testing user 0 deletion',
 -                              '0',
 +                              null,
                                '127.0.0.1',
                                (string)$page->getTitle()->getNamespace(),
                                $page->getTitle()->getDBkey(),