Merge "Update type of PermissionManager::resultToError"

diff --git a/includes/Permissions/PermissionManager.php b/includes/Permissions/PermissionManager.php
index e443803..202014f 100644 (file)
--- a/includes/Permissions/PermissionManager.php
+++ b/includes/Permissions/PermissionManager.php
@@ -324,7 +324,7 @@ class PermissionManager {
         * Add the resulting error code to the errors array
         *
         * @param array $errors List of current errors
-        * @param array $result Result of errors
+        * @param array|string|MessageSpecifier|false $result Result of errors
         *
         * @return array List of errors
         */

diff --git a/includes/Title.php b/includes/Title.php
index cf81b98..f69f1a4 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2256,7 +2256,7 @@ class Title implements LinkTarget, IDBAccessObject {
         * Add the resulting error code to the errors array
         *
         * @param array $errors List of current errors
-        * @param array $result Result of errors
+        * @param array|string|MessageSpecifier|false $result Result of errors
         *
         * @return array List of errors
         */