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
*
* @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.
*/
*
* 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
*/