From: James D. Forrester <jforrester@wikimedia.org>
Date: Tue, 6 Mar 2018 17:11:47 +0000 (+0000)
Subject: Drop HTMLForm & VFormHTMLForm::isVForm(), deprecated in 1.25
X-Git-Tag: 1.31.0-rc.0~282
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=ae7237ea98398b9fb44ead73f196d7e5a859a876;p=lhc%2Fweb%2Fwiklou.git

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

Change-Id: If5f4e146071c17a9adabd36453ef68ff38405ed4
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 60e4cf670d..66e4ee4f0f 100644
--- 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 9b58f924f4..af1743e078 100644
--- 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 325526bac2..7bf5f9e2ae 100644
--- 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
 	) {