From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 12 Apr 2018 18:01:56 +0000 (+0000)
Subject: Merge "Fix KafkaHandlerTest hack to work with PHPUnit 6"
X-Git-Tag: 1.31.0-rc.0~100
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=1faaef19a9801f81f7fc185a3eb97faafb08b767;hp=71653df1c365ec4092ca3390f1857d5e8e435b6e

Merge "Fix KafkaHandlerTest hack to work with PHPUnit 6"
---

diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
index 14e2e27de8..4c0ca04fef 100644
--- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
@@ -158,7 +158,8 @@ class KafkaHandlerTest extends MediaWikiTestCase {
 			->method( 'send' )
 			->will( $this->returnValue( true ) );
 		// evil hax
-		TestingAccessWrapper::newFromObject( $mockMethod )->matcher->parametersMatcher =
+		$matcher = TestingAccessWrapper::newFromObject( $mockMethod )->matcher;
+		TestingAccessWrapper::newFromObject( $matcher )->parametersMatcher =
 			new \PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters( [
 				[ $this->anything(), $this->anything(), [ 'words' ] ],
 				[ $this->anything(), $this->anything(), [ 'lines' ] ]