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

diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index 3e2a9a2..aa7a6d6 100644 (file)
--- 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)
         *
         *
         * @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();
 
         */
        public function getPageUrl( $pageName = false ) {
                $url = $this->getLinkPath();
 

-               if ( $url === false ) {
-                       return false;
+               if ( $url === null ) {
+                       return null;

                }
 
                if ( $pageName !== false ) {
                }
 
                if ( $pageName !== false ) {

diff --git a/includes/site/Site.php b/includes/site/Site.php
index 10711a6..401f6e4 100644 (file)
--- 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.
 
        /**
         * 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.
         *
         * 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
         *
         *
         * @param bool|string $pageName
         *

-        * @return string|bool|null
+        * @return string|null

         */
        public function getPageUrl( $pageName = false ) {
                $url = $this->getLinkPath();
 
         */
        public function getPageUrl( $pageName = false ) {
                $url = $this->getLinkPath();
 

-               if ( $url === false ) {
-                       return false;
+               if ( $url === null ) {
+                       return null;

                }
 
                if ( $pageName !== false ) {
                }
 
                if ( $pageName !== false ) {