Merge "Hard deprecate ParserOutput::{get,set}CategoryLinks()"

RELEASE-NOTES-1.38

@@ -215,15 +215,14 @@ because of Phabricator reports.
 * Instantiating the MessageContent class now emits deprecation notices.
 * Message::content() now triggers deprecation warnings.
 * The following methods from the ParserOutput class now emit deprecation logs:
-   - ::hideNewSection() - use ::setHideNewSection()
+   - ::hideNewSection()      - use ::setHideNewSection()
    - ::preventClickjacking() - use ::{get,set}PreventClickjacking()
-   - ::getProperty()   - use ::getPageProperty()
-   - ::setProperty()   - use ::setPageProperty()
-   - ::unsetProperty() - use ::unsetPageProperties()
-   - ::getProperties() - use ::getPageProperties()
-* The following methods from the ParserOutput class were deprecated:
-   - ::getCategoryLinks() - use ::getCategoryNames()
-   - ::setCategoryLinks() - use ::setCategories()
+   - ::getProperty()         - use ::getPageProperty()
+   - ::setProperty()         - use ::setPageProperty()
+   - ::unsetProperty()       - use ::unsetPageProperties()
+   - ::getProperties()       - use ::getPageProperties()
+   - ::getCategoryLinks()    - use ::getCategoryNames()
+   - ::setCategoryLinks()    - use ::setCategories()
 * The following methods were deprecated; use ::setPreventClickjacking() instead:
    - OutputPage::preventClickjacking()
    - OutputPage::allowClickjacking()

includes/parser/ParserOutput.php

@@ -602,6 +602,7 @@ class ParserOutput extends CacheTime {
 	 * @deprecated since 1.38, use ::getCategoryNames() instead.
 	 */
 	public function getCategoryLinks() {
+		wfDeprecated( __METHOD__, '1.38' );
 		return $this->getCategoryNames();
 	}
 
@@ -770,6 +771,7 @@ class ParserOutput extends CacheTime {
 	 * @deprecated since 1.38, use ::setCategories() instead.
 	 */
 	public function setCategoryLinks( $cl ) {
+		wfDeprecated( __METHOD__, '1.38' );
 		return wfSetVar( $this->mCategories, $cl );
 	}