Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274945
Change subject: Don't unconditionally require phpunit file with potentially
duplicate class
......................................................................
Don't unconditionally require phpunit file with potentially duplicate class
It's very much possible to run MW tests with other PHPUnit versions
(--with-phpunitdir) where this class may already be present.
Change-Id: Iee8ddc88bf8b15735b5946617f0ee6f60cf61c69
---
M tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/274945/1
diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
index d2b267a..e9173d4 100644
--- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
@@ -24,7 +24,9 @@
use Monolog\Logger;
// not available in the version of phpunit mw uses, so copied into repo
-require_once __DIR__ . '/../../../phpunit/ConsecutiveParametersMatcher.php';
+if ( !class_exists(
'PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters' ) ) {
+ require_once __DIR__ .
'/../../../phpunit/ConsecutiveParametersMatcher.php';
+}
class KafkaHandlerTest extends MediaWikiTestCase {
--
To view, visit https://gerrit.wikimedia.org/r/274945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee8ddc88bf8b15735b5946617f0ee6f60cf61c69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
