From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 25 Jun 2018 20:14:08 +0000 (+0100)
Subject: Avoid bad method call to patchPatch() in DbTestRecorder
X-Git-Tag: 1.31.1~22
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=32d551a4397763604b32e2347ef65f7fc6fc9cf8

Avoid bad method call to patchPatch() in DbTestRecorder

Bug: T193995
Change-Id: Ibc480b04463792b7cd720a6eb080e0960a30e440
(cherry picked from commit ec3289524e33fd93c9dc51c2a0ddffc24068583a)
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index df4c4ba5b1..c05efe9fc2 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -4,6 +4,7 @@ THIS IS NOT A RELEASE YET!
 
 === Changes since MediaWiki 1.31.0 ===
 * (T197229) Bundle Nuke extension, it was accidentally omitted.
+* (T193995) Fix undefined patchPath() method call in parser tests.
 
 === Changes since MediaWiki 1.31.0-rc.2 ===
 * (T195783) Initialize PSR-4 namespaces at same stage as normal autoloader.
diff --git a/tests/parser/DbTestRecorder.php b/tests/parser/DbTestRecorder.php
index f68f5953d1..2089f64a02 100644
--- a/tests/parser/DbTestRecorder.php
+++ b/tests/parser/DbTestRecorder.php
@@ -41,7 +41,8 @@ class DbTestRecorder extends TestRecorder {
 			|| !$this->db->tableExists( 'testitem' )
 		) {
 			print "WARNING> `testrun` table not found in database. Trying to create table.\n";
-			$this->db->sourceFile( $this->db->patchPath( 'patch-testrun.sql' ) );
+			$updater = DatabaseUpdater::newForDB( $this->db );
+			$this->db->sourceFile( $updater->patchPath( $this->db, 'patch-testrun.sql' ) );
 			echo "OK, resuming.\n";
 		}