From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 3 Mar 2016 18:53:30 +0000 (-0800)
Subject: registration: Improve error message for non-array attributes
X-Git-Tag: 1.31.0-rc.0~7638
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=79a86afccf29f700eae69e6d20851d65e86652df;p=lhc%2Fweb%2Fwiklou.git

registration: Improve error message for non-array attributes

Change-Id: I7cbf7353ebbbbbbf36500f86164e3b32d7723cca
---

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index fe9304fb61..7c60aa5af8 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -168,12 +168,12 @@ class ExtensionProcessor implements Processor {
 		$this->extractCredits( $path, $info );
 		foreach ( $info as $key => $val ) {
 			if ( in_array( $key, self::$globalSettings ) ) {
-				$this->storeToArray( "wg$key", $val, $this->globals );
+				$this->storeToArray( $path, "wg$key", $val, $this->globals );
 			// Ignore anything that starts with a @
 			} elseif ( $key[0] !== '@' && !in_array( $key, self::$notAttributes )
 				&& !in_array( $key, self::$creditsAttributes )
 			) {
-				$this->storeToArray( $key, $val, $this->attributes );
+				$this->storeToArray( $path, $key, $val, $this->attributes );
 			}
 		}
 	}
@@ -367,14 +367,15 @@ class ExtensionProcessor implements Processor {
 	}
 
 	/**
+	 * @param string $path
 	 * @param string $name
 	 * @param array $value
 	 * @param array &$array
 	 * @throws InvalidArgumentException
 	 */
-	protected function storeToArray( $name, $value, &$array ) {
+	protected function storeToArray( $path, $name, $value, &$array ) {
 		if ( !is_array( $value ) ) {
-			throw new InvalidArgumentException( "The value for '$name' should be an array" );
+			throw new InvalidArgumentException( "The value for '$name' should be an array (from $path)" );
 		}
 		if ( isset( $array[$name] ) ) {
 			$array[$name] = array_merge_recursive( $array[$name], $value );