From 921979b0bc14892de44aaa82c7e8bf7df918a59d Mon Sep 17 00:00:00 2001 From: umherirrender Date: Thu, 14 Aug 2014 19:48:55 +0200 Subject: [PATCH] Remove wrong type from @param on ContentHandler::merge3 When the method has a type hint of Content, there is no way to pass a string, so remove that type from @param Change-Id: Ifbf89d52cfa3ea8801c94f2d1b336e784133cce9 --- includes/content/ContentHandler.php | 6 +++--- includes/content/TextContentHandler.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index c8a9f1e352..ac41722307 100644 --- 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 b728d312ca..0c9ee37577 100644 --- 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 */ -- 2.20.1