From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 8 Apr 2018 19:49:59 +0000 (+0000)
Subject: Merge "phpunit: Create class aliases for interfaces in PHPUnit 4/6 compat layer"
X-Git-Tag: 1.31.0-rc.0~159
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=0e7d0dc82a07239b94cda24e8e99728a2ad66020;hp=96bbe7cb4c8ab5ecd78cc65985633cec14a65839;p=lhc%2Fweb%2Fwiklou.git

Merge "phpunit: Create class aliases for interfaces in PHPUnit 4/6 compat layer"
---

diff --git a/includes/site/MediaWikiPageNameNormalizer.php b/includes/site/MediaWikiPageNameNormalizer.php
index c4e490a4c7..3e073f0882 100644
--- a/includes/site/MediaWikiPageNameNormalizer.php
+++ b/includes/site/MediaWikiPageNameNormalizer.php
@@ -53,7 +53,7 @@ class MediaWikiPageNameNormalizer {
 	/**
 	 * Returns the normalized form of the given page title, using the
 	 * normalization rules of the given site. If the given title is a redirect,
-	 * the redirect weill be resolved and the redirect target is returned.
+	 * the redirect will be resolved and the redirect target is returned.
 	 *
 	 * @note This actually makes an API request to the remote site, so beware
 	 *   that this function is slow and depends on an external service.
@@ -65,7 +65,7 @@ class MediaWikiPageNameNormalizer {
 	 * @param string $pageName
 	 * @param string $apiUrl
 	 *
-	 * @return string
+	 * @return string|false
 	 * @throws \MWException
 	 */
 	public function normalizePageName( $pageName, $apiUrl ) {
diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index f31a77d3a4..0ff7e8bad4 100644
--- a/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@ -64,7 +64,7 @@ class MediaWikiSite extends Site {
 	/**
 	 * Returns the normalized form of the given page title, using the
 	 * normalization rules of the given site. If the given title is a redirect,
-	 * the redirect weill be resolved and the redirect target is returned.
+	 * the redirect will be resolved and the redirect target is returned.
 	 *
 	 * @note This actually makes an API request to the remote site, so beware
 	 *   that this function is slow and depends on an external service.
@@ -79,7 +79,7 @@ class MediaWikiSite extends Site {
 	 *
 	 * @param string $pageName
 	 *
-	 * @return string
+	 * @return string|false
 	 * @throws MWException
 	 */
 	public function normalizePageName( $pageName ) {
diff --git a/includes/site/Site.php b/includes/site/Site.php
index a6e63391da..55aad77831 100644
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@ -391,7 +391,7 @@ class Site implements Serializable {
 	 *
 	 * @param string $pageName
 	 *
-	 * @return string
+	 * @return string|false
 	 */
 	public function normalizePageName( $pageName ) {
 		return $pageName;