Merge "Remove wrong type from @param on ContentHandler::merge3"

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index c8a9f1e..ac41722 100644 (file)
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -743,9 +743,9 @@ abstract class ContentHandler {
         *
         * @since 1.21
         *
-        * @param Content|string $oldContent The page's previous content.
-        * @param Content|string $myContent One of the page's conflicting contents.
-        * @param Content|string $yourContent One of the page's conflicting contents.
+        * @param Content $oldContent The page's previous content.
+        * @param Content $myContent One of the page's conflicting contents.
+        * @param Content $yourContent One of the page's conflicting contents.
         *
         * @return Content|bool Always false.
         */

diff --git a/includes/content/TextContentHandler.php b/includes/content/TextContentHandler.php
index b728d31..0c9ee37 100644 (file)
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -60,9 +60,9 @@ class TextContentHandler extends ContentHandler {
         *
         * This text-based implementation uses wfMerge().
         *
-        * @param Content|string $oldContent The page's previous content.
-        * @param Content|string $myContent One of the page's conflicting contents.
-        * @param Content|string $yourContent One of the page's conflicting contents.
+        * @param Content $oldContent The page's previous content.
+        * @param Content $myContent One of the page's conflicting contents.
+        * @param Content $yourContent One of the page's conflicting contents.
         *
         * @return Content|bool
         */