Merge "Upgrade to newer phan"

diff --git a/tests/phpunit/includes/cache/MessageCacheTest.php b/tests/phpunit/includes/cache/MessageCacheTest.php
index 8fdc1f1..d8330ef 100644 (file)
--- a/tests/phpunit/includes/cache/MessageCacheTest.php
+++ b/tests/phpunit/includes/cache/MessageCacheTest.php
@@ -223,6 +223,8 @@ class MessageCacheTest extends MediaWikiLangTestCase {
 
        /**
         * Regression test for T218918
+        * @group Broken
+        * @fixme Disabled per https://phabricator.wikimedia.org/T219042
         */
        public function testLoadFromDB_fetchLatestRevision() {
                // Create three revisions of the same message page.