From: James D. Forrester <jforrester@wikimedia.org>
Date: Sat, 9 Feb 2019 01:36:01 +0000 (-0800)
Subject: Drop JsonContent->getJsonData(), deprecated in 1.25 and unused
X-Git-Tag: 1.34.0-rc.0~2883
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=631d2df66494c6cc5ffe3302618ae10c5a281999;p=lhc%2Fweb%2Fwiklou.git

Drop JsonContent->getJsonData(), deprecated in 1.25 and unused

Change-Id: I2cac3a1d2cda799c302ca2364fb91916c3240c11
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index ee4f215d33..12f915b4c2 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -217,6 +217,8 @@ because of Phabricator reports.
   use MediaWikiServices::getInstance()->getEventRelayerGroup() directly.
 * LinkCache->addLink(), deprecated in 1.27, has been removed. It is thought to
   be unused, and is distinct from OutputPage->addLink(), which remains.
+* JsonContent->getJsonData(), deprecated in 1.25, has been removed. Instead, use
+  JsonContent->getData().
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 0f8a9a945a..2cd1fb3b50 100644
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -28,17 +28,6 @@ class JsonContent extends TextContent {
 		parent::__construct( $text, $modelId );
 	}
 
-	/**
-	 * Decodes the JSON into a PHP associative array.
-	 *
-	 * @deprecated since 1.25 Use getData instead.
-	 * @return array|null
-	 */
-	public function getJsonData() {
-		wfDeprecated( __METHOD__, '1.25' );
-		return FormatJson::decode( $this->getText(), true );
-	}
-
 	/**
 	 * Decodes the JSON string.
 	 *