Merge "Fix phpdoc since $proto can be int"

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b0057eb..b181628 100644 (file)
--- 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 3de85e1..9aad401 100644 (file)
--- 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 ) {