X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fcontent%2FContent.php;h=8596619d13b8aa7fc211924b8dcd7ef4b3d5652b;hb=5d16571ffbdce2ad0ab0f092a126be9987055402;hp=bb3fb107d734670fdc36306760e61567f39c2630;hpb=7c4b637cca308651cb98d40b2bd7dca187160e81;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/content/Content.php b/includes/content/Content.php
index bb3fb107d7..8596619d13 100644
--- a/includes/content/Content.php
+++ b/includes/content/Content.php
@@ -77,6 +77,9 @@ interface Content {
 	 *
 	 * @since 1.21
 	 *
+	 * @deprecated since 1.33 use getText() for TextContent instances.
+	 *             For other content models, use specialized getters.
+	 *
 	 * @return mixed The native representation of the content. Could be a
 	 *    string, a nested array structure, an object, a binary blob...
 	 *    anything, really.
@@ -199,9 +202,11 @@ interface Content {
 	 *
 	 * - Will return false if $that is null.
 	 * - Will return true if $that === $this.
-	 * - Will return false if $that->getModel() != $this->getModel().
-	 * - Will return false if $that->getNativeData() is not equal to $this->getNativeData(),
-	 *   where the meaning of "equal" depends on the actual data model.
+	 * - Will return false if $that->getModel() !== $this->getModel().
+	 * - Will return false if get_class( $that ) !== get_class( $this )
+	 * - Should return false if $that->getModel() == $this->getModel() and
+	 *     $that is not semantically equivalent to $this, according to
+	 *     the data model defined by $this->getModel().
 	 *
 	 * Implementations should be careful to make equals() transitive and reflexive:
 	 *
@@ -241,6 +246,8 @@ interface Content {
 	 * that it's also in a countable location (e.g. a current revision in the
 	 * main namespace).
 	 *
+	 * @see SlotRoleHandler::supportsArticleCount
+	 *
 	 * @since 1.21
 	 *
 	 * @param bool|null $hasLinks If it is known whether this content contains
@@ -262,7 +269,8 @@ interface Content {
 	 *       may call ParserOutput::recordOption() on the output object.
 	 *
 	 * @param Title $title The page title to use as a context for rendering.
-	 * @param int|null $revId Optional revision ID being rendered.
+	 * @param int|null $revId ID of the revision being rendered.
+	 *  See Parser::parse() for the ramifications. (default: null)
 	 * @param ParserOptions|null $options Any parser options.
 	 * @param bool $generateHtml Whether to generate HTML (default: true). If false,
 	 *        the result of calling getText() on the ParserOutput object returned by
@@ -352,6 +360,8 @@ interface Content {
 	 * Returns whether this Content represents a redirect.
 	 * Shorthand for getRedirectTarget() !== null.
 	 *
+	 * @see SlotRoleHandler::supportsRedirects
+	 *
 	 * @since 1.21
 	 *
 	 * @return bool