Merge "Remove bogus field references in DerivedPageDataUpdater"

diff --git a/includes/Category.php b/includes/Category.php
index ca16536..77f1212 100644 (file)
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -25,8 +25,6 @@
  * Category objects are immutable, strictly speaking. If you call methods that change the database,
  * like to refresh link counts, the objects will be appropriately reinitialized.
  * Member variables are lazy-initialized.
- *
- * @todo Move some stuff from CategoryPage.php to here, and use that.
  */
 class Category {
        /** Name of the category, normalized to DB-key form */

diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index 45d6e1f..1fc56bb 100644 (file)
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -104,7 +104,11 @@ class LogPage {
                        'log_page' => $this->target->getArticleID(),
                        'log_params' => $this->params
                ];
-               $data += CommentStore::getStore()->insert( $dbw, 'log_comment', $this->comment );
+               $data += MediaWikiServices::getInstance()->getCommentStore()->insert(
+                       $dbw,
+                       'log_comment',
+                       $this->comment
+               );
                $data += ActorMigration::newMigration()->getInsertValues( $dbw, 'log_user', $this->doer );
                $dbw->insert( 'logging', $data, __METHOD__ );
                $newId = $dbw->insertId();

diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index dfce0a0..a845047 100644 (file)
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -1760,7 +1760,8 @@ class PPNode_Hash_Tree implements PPNode {
         *
         * @param array $store
         * @param int $index
-        * @return PPNode_Hash_Tree|PPNode_Hash_Attr|PPNode_Hash_Text
+        * @return PPNode_Hash_Tree|PPNode_Hash_Attr|PPNode_Hash_Text|false
+        * @throws MWException
         */
        public static function factory( array $store, $index ) {
                if ( !isset( $store[$index] ) ) {
@@ -1784,6 +1785,7 @@ class PPNode_Hash_Tree implements PPNode {
 
        /**
         * Convert a node to XML, for debugging
+        * @return string
         */
        public function __toString() {
                $inner = '';