From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Thu, 3 Jul 2014 19:48:08 +0000 (+0200)
Subject: Force array parameters in SiteConfiguration
X-Git-Tag: 1.31.0-rc.0~15088^2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=5ef43924c914b9d902280053555834a7c04bce79;p=lhc%2Fweb%2Fwiklou.git

Force array parameters in SiteConfiguration

Now that we require PHP 5.1 (for quite some time actually)
we can force method parameters to be array.

Change-Id: Ia4a262320344e05cc1625c041a3aa4ec41034ad7
---

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index b99840fb4b..3c32ce21e9 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -191,7 +191,7 @@ class SiteConfiguration {
 	 * @param array $params Array of parameters.
 	 * @return mixed The value of the setting requested.
 	 */
-	protected function getSetting( $settingName, $wiki, /*array*/ $params ) {
+	protected function getSetting( $settingName, $wiki, array $params ) {
 		$retval = null;
 		if ( array_key_exists( $settingName, $this->settings ) ) {
 			$thisSetting =& $this->settings[$settingName];
@@ -450,7 +450,7 @@ class SiteConfiguration {
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 * @return array
 	 */
-	protected function mergeParams( $wiki, $suffix, /*array*/ $params, /*array*/ $wikiTags ) {
+	protected function mergeParams( $wiki, $suffix, array $params, array $wikiTags ) {
 		$ret = $this->getWikiParams( $wiki );
 
 		if ( is_null( $ret['suffix'] ) ) {