From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 8 Apr 2018 19:50:05 +0000 (+0000)
Subject: Merge "phpunit: Alias PHPUnit_Framework_Error for PHPUnit 6 compat"
X-Git-Tag: 1.31.0-rc.0~157
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=a54d30ce50a74cb6e90bd262fa0d1d86f4f8e308;hp=188ea58d5a8225d6f83514e7b6c9e022ee982dbe;p=lhc%2Fweb%2Fwiklou.git

Merge "phpunit: Alias PHPUnit_Framework_Error for PHPUnit 6 compat"
---

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index eef7e90d5c..56ee2df663 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -202,7 +202,8 @@ spl_autoload_register( function ( $class ) {
 
 	// Classes that don't map 100%
 	$map = [
-		'PHPUnit_Framework_TestSuite_DataProvider' => 'PHPUnit\Framework\DataProviderTestSuite'
+		'PHPUnit_Framework_TestSuite_DataProvider' => 'PHPUnit\Framework\DataProviderTestSuite',
+		'PHPUnit_Framework_Error' => 'PHPUnit\Framework\Error\Error',
 	];
 
 	if ( isset( $map[$class] ) ) {