Drop HTMLForm & VFormHTMLForm::isVForm(), deprecated in 1.25

Change-Id: If5f4e146071c17a9adabd36453ef68ff38405ed4

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 60e4cf6..66e4ee4 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -317,6 +317,7 @@ changes to languages because of Phabricator reports.
   ::listSoftwareDefinedTags() instead.
 * Title::getTitleInvalidRegex(), deprecated in 1.25, has been removed. You
   can use MediaWikiTitleCodec::getTitleInvalidRegex() instead.
+* HTMLForm & VFormHTMLForm::isVForm(), deprecated in 1.25, have been removed.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 9b58f92..af1743e 100644 (file)
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -430,17 +430,6 @@ class HTMLForm extends ContextSource {
                return $this->displayFormat;
        }
 
-       /**
-        * Test if displayFormat is 'vform'
-        * @since 1.22
-        * @deprecated since 1.25
-        * @return bool
-        */
-       public function isVForm() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return false;
-       }
-
        /**
         * Get the HTMLFormField subclass for this descriptor.
         *

diff --git a/includes/htmlform/VFormHTMLForm.php b/includes/htmlform/VFormHTMLForm.php
index 325526b..7bf5f9e 100644 (file)
--- a/includes/htmlform/VFormHTMLForm.php
+++ b/includes/htmlform/VFormHTMLForm.php
@@ -37,11 +37,6 @@ class VFormHTMLForm extends HTMLForm {
         */
        protected $displayFormat = 'vform';
 
-       public function isVForm() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return true;
-       }
-
        public static function loadInputFromParameters( $fieldname, $descriptor,
                HTMLForm $parent = null
        ) {