Merge "Deprecate Block::isValid method"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 18a7b44..83b3cc3 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -407,6 +407,7 @@ because of Phabricator reports.
 * ManualLogEntry::setTags() is deprecated, use ManualLogEntry::addTags()
   instead. The setTags() method was overriding the tags, addTags() doesn't
   override, only adds new tags.
+* Block::isValid is deprecated, since it is no longer needed in core.
 
 === Other changes in 1.33 ===
 * (T201747) Html::openElement() warns if given an element name with a space

diff --git a/includes/Block.php b/includes/Block.php
index 700e551..b17ec86 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -964,9 +964,12 @@ class Block {
 
        /**
         * Is the block address valid (i.e. not a null string?)
+        *
+        * @deprecated since 1.33 No longer needed in core.
         * @return bool
         */
        public function isValid() {
+               wfDeprecated( __METHOD__, '1.33' );
                return $this->getTarget() != null;
        }