From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 4 Sep 2019 17:13:11 +0000 (+0200)
Subject: resourceloader: Document encodeJsonForScript() type as mixed
X-Git-Tag: 1.34.0-rc.0~393^2
X-Git-Url: https://git.cyclocoop.org/admin/%7B%7Blocalurl:Special:UserLogin%7D%7D?a=commitdiff_plain;h=8e7b469a124d1d616964a5e6546f232bfc750467;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Document encodeJsonForScript() type as mixed

Objects passed to it since 23d066618def55361aa32a60ef9
json_encode allows mixed type, so use it also here.

Change-Id: I0897a6a144fd1c90b3ead205cedf21c19682b9df
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index ca83ff357d..693afcf62a 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1323,7 +1323,7 @@ MESSAGE;
 	 *
 	 * @internal
 	 * @since 1.32
-	 * @param bool|string|array $data
+	 * @param mixed $data
 	 * @return string JSON
 	 */
 	public static function encodeJsonForScript( $data ) {