X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSiteConfiguration.php;h=5b9bdfa1b17ac529bb0e94eb718f38a11194f06a;hb=50001e250a075c32058b8e78e0425b0936170810;hp=8c1f26b82adb51560d89225ae59fffa00dc2cbfd;hpb=085ca26d696d63ecd33072c9b1a9efa0a89f706d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 8c1f26b82a..5b9bdfa1b1 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -119,22 +119,24 @@ class SiteConfiguration {
 	/**
 	 * Array of suffixes, for self::siteFromDB()
 	 */
-	public $suffixes = array();
+	public $suffixes = [];
 
 	/**
 	 * Array of wikis, should be the same as $wgLocalDatabases
 	 */
-	public $wikis = array();
+	public $wikis = [];
 
 	/**
 	 * The whole array of settings
 	 */
-	public $settings = array();
+	public $settings = [];
 
 	/**
 	 * Array of domains that are local and can be handled by the same server
+	 *
+	 * @deprecated since 1.25; use $wgLocalVirtualHosts instead.
 	 */
-	public $localVHosts = array();
+	public $localVHosts = [];
 
 	/**
 	 * Optional callback to load full configuration data.
@@ -165,7 +167,7 @@ class SiteConfiguration {
 	 * Configuration cache for getConfig()
 	 * @var array
 	 */
-	protected $cfgCache = array();
+	protected $cfgCache = [];
 
 	/**
 	 * Retrieves a configuration setting for a given wiki.
@@ -176,8 +178,8 @@ class SiteConfiguration {
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 * @return mixed The value of the setting requested.
 	 */
-	public function get( $settingName, $wiki, $suffix = null, $params = array(),
-		$wikiTags = array()
+	public function get( $settingName, $wiki, $suffix = null, $params = [],
+		$wikiTags = []
 	) {
 		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
 		return $this->getSetting( $settingName, $wiki, $params );
@@ -215,7 +217,7 @@ class SiteConfiguration {
 						break 2;
 					} elseif ( array_key_exists( "+$tag", $thisSetting ) && is_array( $thisSetting["+$tag"] ) ) {
 						if ( $retval === null ) {
-							$retval = array();
+							$retval = [];
 						}
 						$retval = self::arrayMerge( $retval, $thisSetting["+$tag"] );
 					}
@@ -234,7 +236,7 @@ class SiteConfiguration {
 						&& is_array( $thisSetting["+$suffix"] )
 					) {
 						if ( $retval === null ) {
-							$retval = array();
+							$retval = [];
 						}
 						$retval = self::arrayMerge( $retval, $thisSetting["+$suffix"] );
 					}
@@ -290,9 +292,9 @@ class SiteConfiguration {
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 * @return array Array of settings requested.
 	 */
-	public function getAll( $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
+	public function getAll( $wiki, $suffix = null, $params = [], $wikiTags = [] ) {
 		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
-		$localSettings = array();
+		$localSettings = [];
 		foreach ( $this->settings as $varname => $stuff ) {
 			$append = false;
 			$var = $varname;
@@ -320,8 +322,8 @@ class SiteConfiguration {
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 * @return bool The value of the setting requested.
 	 */
-	public function getBool( $setting, $wiki, $suffix = null, $wikiTags = array() ) {
-		return (bool)$this->get( $setting, $wiki, $suffix, array(), $wikiTags );
+	public function getBool( $setting, $wiki, $suffix = null, $wikiTags = [] ) {
+		return (bool)$this->get( $setting, $wiki, $suffix, [], $wikiTags );
 	}
 
 	/**
@@ -343,7 +345,7 @@ class SiteConfiguration {
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 */
 	public function extractVar( $setting, $wiki, $suffix, &$var,
-		$params = array(), $wikiTags = array()
+		$params = [], $wikiTags = []
 	) {
 		$value = $this->get( $setting, $wiki, $suffix, $params, $wikiTags );
 		if ( !is_null( $value ) ) {
@@ -360,7 +362,7 @@ class SiteConfiguration {
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 */
 	public function extractGlobal( $setting, $wiki, $suffix = null,
-		$params = array(), $wikiTags = array()
+		$params = [], $wikiTags = []
 	) {
 		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
 		$this->extractGlobalSetting( $setting, $wiki, $params );
@@ -394,8 +396,8 @@ class SiteConfiguration {
 	 * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 */
-	public function extractAllGlobals( $wiki, $suffix = null, $params = array(),
-		$wikiTags = array()
+	public function extractAllGlobals( $wiki, $suffix = null, $params = [],
+		$wikiTags = []
 	) {
 		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
 		foreach ( $this->settings as $varName => $setting ) {
@@ -412,18 +414,18 @@ class SiteConfiguration {
 	 * @return array
 	 */
 	protected function getWikiParams( $wiki ) {
-		static $default = array(
+		static $default = [
 			'suffix' => null,
 			'lang' => null,
-			'tags' => array(),
-			'params' => array(),
-		);
+			'tags' => [],
+			'params' => [],
+		];
 
 		if ( !is_callable( $this->siteParamsCallback ) ) {
 			return $default;
 		}
 
-		$ret = call_user_func_array( $this->siteParamsCallback, array( $this, $wiki ) );
+		$ret = call_user_func_array( $this->siteParamsCallback, [ $this, $wiki ] );
 		# Validate the returned value
 		if ( !is_array( $ret ) ) {
 			return $default;
@@ -482,7 +484,7 @@ class SiteConfiguration {
 		// Allow override
 		$def = $this->getWikiParams( $db );
 		if ( !is_null( $def['suffix'] ) && !is_null( $def['lang'] ) ) {
-			return array( $def['suffix'], $def['lang'] );
+			return [ $def['suffix'], $def['lang'] ];
 		}
 
 		$site = null;
@@ -499,7 +501,7 @@ class SiteConfiguration {
 			}
 		}
 		$lang = str_replace( '_', '-', $lang );
-		return array( $site, $lang );
+		return [ $site, $lang ];
 	}
 
 	/**
@@ -519,7 +521,7 @@ class SiteConfiguration {
 		$multi = is_array( $settings );
 		$settings = (array)$settings;
 		if ( $wiki === wfWikiID() ) { // $wiki is this wiki
-			$res = array();
+			$res = [];
 			foreach ( $settings as $name ) {
 				if ( !preg_match( '/^wg[A-Z]/', $name ) ) {
 					throw new MWException( "Variable '$name' does start with 'wg'." );
@@ -537,19 +539,19 @@ class SiteConfiguration {
 			} elseif ( !in_array( $wiki, $this->wikis ) ) {
 				throw new MWException( "No such wiki '$wiki'." );
 			} else {
-				$this->cfgCache[$wiki] = array();
+				$this->cfgCache[$wiki] = [];
 			}
 			$retVal = 1;
 			$cmd = wfShellWikiCmd(
 				"$IP/maintenance/getConfiguration.php",
-				array(
+				[
 					'--wiki', $wiki,
 					'--settings', implode( ' ', $settings ),
 					'--format', 'PHP'
-				)
+				]
 			);
 			// ulimit5.sh breaks this call
-			$data = trim( wfShellExec( $cmd, $retVal, array(), array( 'memory' => 0 ) ) );
+			$data = trim( wfShellExec( $cmd, $retVal, [], [ 'memory' => 0 ] ) );
 			if ( $retVal != 0 || !strlen( $data ) ) {
 				throw new MWException( "Failed to run getConfiguration.php." );
 			}
@@ -563,15 +565,6 @@ class SiteConfiguration {
 		return $multi ? $res : current( $res );
 	}
 
-	/**
-	 * Returns true if the given vhost is handled locally.
-	 * @param string $vhost
-	 * @return bool
-	 */
-	public function isLocalVHost( $vhost ) {
-		return in_array( $vhost, $this->localVHosts );
-	}
-
 	/**
 	 * Merge multiple arrays together.
 	 * On encountering duplicate keys, merge the two, but ONLY if they're arrays.