Merge "mediawiki.Title: Remove redundant closure"

diff --git a/includes/jobqueue/JobQueueMemory.php b/includes/jobqueue/JobQueueMemory.php
index b6c4005..cbcd4fb 100644 (file)
--- a/includes/jobqueue/JobQueueMemory.php
+++ b/includes/jobqueue/JobQueueMemory.php
@@ -151,7 +151,7 @@ class JobQueueMemory extends JobQueue {
                }
 
                $claimed =& $this->getQueueData( 'claimed' );
-               $job->setMetadata( 'claimId', null );
+               unset( $claimed[$job->getMetadata( 'claimId' )] );
        }
 
        /**

diff --git a/includes/jobqueue/jobs/DeletePageJob.php b/includes/jobqueue/jobs/DeletePageJob.php
index 9b5cef4..e6dfae4 100644 (file)
--- a/includes/jobqueue/jobs/DeletePageJob.php
+++ b/includes/jobqueue/jobs/DeletePageJob.php
@@ -4,7 +4,7 @@
  * Class DeletePageJob
  */
 class DeletePageJob extends Job {
-       public function __construct( $title, $params ) {
+       public function __construct( $title, $params = [] ) {
                parent::__construct( 'deletePage', $title, $params );
        }
 

diff --git a/includes/jobqueue/jobs/UserGroupExpiryJob.php b/includes/jobqueue/jobs/UserGroupExpiryJob.php
index 0945e58..bd0df5b 100644 (file)
--- a/includes/jobqueue/jobs/UserGroupExpiryJob.php
+++ b/includes/jobqueue/jobs/UserGroupExpiryJob.php
@@ -22,7 +22,7 @@
  */
 
 class UserGroupExpiryJob extends Job {
-       public function __construct( $params = false ) {
+       public function __construct( $params = [] ) {
                parent::__construct( 'userGroupExpiry', Title::newMainPage(), $params );
                $this->removeDuplicates = true;
        }

diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index a8d4f1e..e25b4d2 100644 (file)
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -1013,6 +1013,7 @@ interface IDatabase {
         * @param string $valuename
         *
         * @return string
+        * @deprecated Since 1.33
         */
        public function aggregateValue( $valuedata, $valuename = 'value' );