X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fregistration%2FExtensionProcessor.php;h=5dc0b400fb9f763f7faff7797326dcabb46e917f;hb=4be80912c8a2217344bddde64824f93d19d094db;hp=ce262bd23e4797fd5e3263d435fec430395dd3fc;hpb=43a548a5c3436b5d07091b504bbf5eb80d1ed215;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index ce262bd23e..5dc0b400fb 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -450,7 +450,7 @@ class ExtensionProcessor implements Processor {
 			}
 			foreach ( $info['config'] as $key => $val ) {
 				if ( $key[0] !== '@' ) {
-					$this->globals["$prefix$key"] = $val;
+					$this->addConfigGlobal( "$prefix$key", $val );
 				}
 			}
 		}
@@ -478,11 +478,26 @@ class ExtensionProcessor implements Processor {
 				if ( isset( $data['path'] ) && $data['path'] ) {
 					$value = "$dir/$value";
 				}
-				$this->globals["$prefix$key"] = $value;
+				$this->addConfigGlobal( "$prefix$key", $value );
 			}
 		}
 	}
 
+	/**
+	 * Helper function to set a value to a specific global, if it isn't set already.
+	 *
+	 * @param string $key The config key with the prefix and anything
+	 * @param mixed $value The value of the config
+	 */
+	private function addConfigGlobal( $key, $value ) {
+		if ( array_key_exists( $key, $this->globals ) ) {
+			throw new RuntimeException(
+				"The configuration setting '$key' was already set by another extension,"
+				. " and cannot be set again." );
+		}
+		$this->globals[$key] = $value;
+	}
+
 	protected function extractServiceWiringFiles( $dir, array $info ) {
 		if ( isset( $info['ServiceWiringFiles'] ) ) {
 			foreach ( $info['ServiceWiringFiles'] as $path ) {
@@ -520,10 +535,7 @@ class ExtensionProcessor implements Processor {
 	public function getExtraAutoloaderPaths( $dir, array $info ) {
 		$paths = [];
 		if ( isset( $info['load_composer_autoloader'] ) && $info['load_composer_autoloader'] === true ) {
-			$path = "$dir/vendor/autoload.php";
-			if ( file_exists( $path ) ) {
-				$paths[] = $path;
-			}
+			$paths[] = "$dir/vendor/autoload.php";
 		}
 		return $paths;
 	}