From 67f8131534e8aa3c2085ed3ad3a8a2b0cf5dcbac Mon Sep 17 00:00:00 2001 From: Daimona Eaytoy Date: Tue, 17 Sep 2019 12:20:50 +0200 Subject: [PATCH] site: Make getPageUrl consistently return null This was pointed out in Ia8443e575c22f47a6d8c63038f4e7ac36815fc27. The method checks if $url is false, but that's never the case because getLinkPath returns string|null. Change-Id: I7850bff928f861d796879301ba0b4e575919407e --- includes/site/MediaWikiSite.php | 6 +++--- includes/site/Site.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php index 3e2a9a2b40..aa7a6d6caf 100644 --- a/includes/site/MediaWikiSite.php +++ b/includes/site/MediaWikiSite.php @@ -176,13 +176,13 @@ class MediaWikiSite extends Site { * * @param string|bool $pageName Page name or false (default: false) * - * @return string|bool|null + * @return string|null */ public function getPageUrl( $pageName = false ) { $url = $this->getLinkPath(); - if ( $url === false ) { - return false; + if ( $url === null ) { + return null; } if ( $pageName !== false ) { diff --git a/includes/site/Site.php b/includes/site/Site.php index 10711a6fbb..401f6e4829 100644 --- a/includes/site/Site.php +++ b/includes/site/Site.php @@ -354,7 +354,7 @@ class Site implements Serializable { /** * Returns the full URL for the given page on the site. - * Or false if the needed information is not known. + * Or null if the needed information is not known. * * This generated URL is usually based upon the path returned by getLinkPath(), * but this is not a requirement. @@ -365,13 +365,13 @@ class Site implements Serializable { * * @param bool|string $pageName * - * @return string|bool|null + * @return string|null */ public function getPageUrl( $pageName = false ) { $url = $this->getLinkPath(); - if ( $url === false ) { - return false; + if ( $url === null ) { + return null; } if ( $pageName !== false ) { -- 2.20.1