From 7efe60da0966c3a5a59b44f01be44aa342240d1d Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Thu, 18 Jan 2018 13:05:42 -0800 Subject: [PATCH] Fix phpdoc since $proto can be int In fact, some of the PROTO_* constants are ints, some strings and one is null (PROTO_CURRENT). Change-Id: I69c45ab87360ed1ab54b53b7e9e959ea566b4cba --- includes/GlobalFunctions.php | 2 +- includes/Title.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index b0057ebf9a..b181628bd5 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -582,7 +582,7 @@ function wfAppendQuery( $url, $query ) { * like "subdir/foo.html", etc. * * @param string $url Either fully-qualified or a local path + query - * @param string $defaultProto One of the PROTO_* constants. Determines the + * @param string|int|null $defaultProto One of the PROTO_* constants. Determines the * protocol to use if $url or $wgServer is protocol-relative * @return string|false Fully-qualified URL, current-path-relative URL or false if * no valid URL can be constructed diff --git a/includes/Title.php b/includes/Title.php index 3de85e1bf6..9aad401ec8 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1769,7 +1769,7 @@ class Title implements LinkTarget { * @see wfExpandUrl * @param string|string[] $query * @param string|string[]|bool $query2 - * @param string $proto Protocol type to use in URL + * @param string|int|null $proto Protocol type to use in URL * @return string The URL */ public function getFullURL( $query = '', $query2 = false, $proto = PROTO_RELATIVE ) { -- 2.20.1