Merge "ApiBase: Remove deprecated getResultData()"

diff --combined RELEASE-NOTES-1.28
index 8b7dced,508d00b..8c479e6
--- 1/RELEASE-NOTES-1.28
--- 2/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@@ -6,7 -6,6 +6,7 @@@ MediaWiki 1.28 is an alpha-quality bran
  production.
  
  === Configuration changes in 1.28 ===
 +* $wgSend404Code now affects status code of action=history if the page is not there.
  * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests
    made by MediaWiki via a proxy. Relying on the http_proxy environment
    variable is no longer supported.
@@@ -66,17 -65,12 +66,17 @@@
  
  ==== Upgraded external libraries ====
  * Updated es5-shim from v4.1.5 to v4.5.8
 +* Updated composer/semver from v1.4.1 to v1.4.2
 +* Updated wikimedia/php-session-serializer from v1.0.3 to v1.0.4
  
  ==== New external libraries ====
 +* Added wikimedia/scoped-callback v1.0.0
 +* Added wikimedia/wait-condition-loop v1.0.1
  
  ==== Removed and replaced external libraries ====
  
  === Bug fixes in 1.28 ===
 +* (T146496) action=history pages should return 404 HTTP error code if the page does not exist
  * (T137264) SECURITY: XSS in unclosed internal links
  * (T133147) SECURITY: Escape '<' and ']]>' in inline <style> blocks
  * (T133147) SECURITY: Require login to preview user CSS pages
@@@ -120,6 -114,7 +120,7 @@@
    interact with ApiParse and ApiExpandTemplates.
  * (T139565) SECURITY: API: Generate head items in the context of the given title
  * (T115333) SECURITY: Check read permission when loading page content in ApiParse
+ * ApiBase::getResultData() was removed (deprecated since 1.25)
  * ApiBase::makeHelpArrayToString() was removed (deprecated since 1.25)
  * ApiBase::makeHelpMsgParameters() was removed (deprecated since 1.25)
  * ApiBase::makeHelpMsg() was removed (deprecated since 1.25)

diff --combined includes/api/ApiBase.php
index 4feaac0,bf33838..506ff73
--- 1/includes/api/ApiBase.php
--- 2/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@@ -600,7 -600,7 +600,7 @@@ abstract class ApiBase extends ContextS
  
        /**
         * Gets a default replica DB connection object
 -       * @return DatabaseBase
 +       * @return Database
         */
        protected function getDB() {
                if ( !isset( $this->mSlaveDB ) ) {
@@@ -2745,16 -2745,6 +2745,6 @@@
                return 0;
        }
  
-       /**
-        * Get the result data array (read-only)
-        * @deprecated since 1.25, use $this->getResult() methods instead
-        * @return array
-        */
-       public function getResultData() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return $this->getResult()->getData();
-       }
- 
        /**
         * Call wfTransactionalTimeLimit() if this request was POSTed
         * @since 1.26