From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 6 Oct 2015 16:20:57 +0000 (+0000)
Subject: Merge "Sort MWNamespace::getValidNamespaces list numerically"
X-Git-Tag: 1.31.0-rc.0~9533
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=4c4deabac0811bacb8dc4f006d20e6c2be20a6dd;hp=578bcde7d92fe90a28691eff3d5469aee879337f;p=lhc%2Fweb%2Fwiklou.git

Merge "Sort MWNamespace::getValidNamespaces list numerically"
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 86ea0c4e95..f044002d3f 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -4307,6 +4307,9 @@ abstract class DatabaseBase implements IDatabase {
 	}
 }
 
+/**
+ * @since 1.27
+ */
 abstract class Database extends DatabaseBase {
 	// B/C until nothing type hints for DatabaseBase
 	// @TODO: finish renaming DatabaseBase => Database
diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php
index 6af3ed5168..49966cf7bc 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -55,6 +55,8 @@ class MultiHttpClient {
 	protected $maxConnsPerHost = 50;
 	/** @var string|null proxy */
 	protected $proxy;
+	/** @var string */
+	protected $userAgent = 'MW-MultiHttpClient';
 
 	/**
 	 * @param array $options
@@ -63,6 +65,7 @@ class MultiHttpClient {
 	 *   - proxy           : HTTP proxy to use
 	 *   - usePipelining   : whether to use HTTP pipelining if possible (for all hosts)
 	 *   - maxConnsPerHost : maximum number of concurrent connections (per host)
+	 *   - userAgent       : The User-Agent header value to send
 	 * @throws Exception
 	 */
 	public function __construct( array $options ) {
@@ -73,7 +76,7 @@ class MultiHttpClient {
 			}
 		}
 		static $opts = array(
-			'connTimeout', 'reqTimeout', 'usePipelining', 'maxConnsPerHost', 'proxy'
+			'connTimeout', 'reqTimeout', 'usePipelining', 'maxConnsPerHost', 'proxy', 'userAgent'
 		);
 		foreach ( $opts as $key ) {
 			if ( isset( $options[$key] ) ) {
@@ -343,6 +346,10 @@ class MultiHttpClient {
 			$req['headers']['content-length'] = 0;
 		}
 
+		if ( !isset( $req['headers']['user-agent'] ) ) {
+			$req['headers']['user-agent'] = $this->userAgent;
+		}
+
 		$headers = array();
 		foreach ( $req['headers'] as $name => $value ) {
 			if ( strpos( $name, ': ' ) ) {
diff --git a/includes/search/SearchResult.php b/includes/search/SearchResult.php
index 7bfcd4546f..765cfc1938 100644
--- a/includes/search/SearchResult.php
+++ b/includes/search/SearchResult.php
@@ -179,7 +179,8 @@ class SearchResult {
 	}
 
 	/**
-	 * @return Title|null Title object (pagename+fragment) for the section, null if none or not supported
+	 * @return Title|null Title object (pagename+fragment) for the section,
+	 *  null if none or not supported
 	 */
 	function getSectionTitle() {
 		return null;
diff --git a/phpcs.xml b/phpcs.xml
index bebed2855c..a4fb301000 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,7 +2,6 @@
 <ruleset name="MediaWiki">
 	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
 		<!-- Disable failing rules -->
-		<exclude name="Generic.Files.LineLength"/>
 		<exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment"/>