From: Erik Bernhardson <ebernhardson@wikimedia.org>
Date: Mon, 13 Mar 2017 18:12:50 +0000 (-0700)
Subject: Don't use $this as a function argument
X-Git-Tag: 1.31.0-rc.0~3813^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=e4fb4f978b77a4477ff7e9ffcc38ac993decab4f;p=lhc%2Fweb%2Fwiklou.git

Don't use $this as a function argument

PHP 7.1 adds the limitation that $this cannot be used as a function
parameter. Ensure forward compatability by renaming the parameters.

Bug: T160144
Change-Id: I33d2ab1ffeeeb32e3a467cc146ee8feef0255258
---

diff --git a/tests/phpunit/includes/search/SearchIndexFieldTest.php b/tests/phpunit/includes/search/SearchIndexFieldTest.php
index a5a1b7acc0..6b12229657 100644
--- a/tests/phpunit/includes/search/SearchIndexFieldTest.php
+++ b/tests/phpunit/includes/search/SearchIndexFieldTest.php
@@ -46,7 +46,7 @@ class SearchIndexFieldTest extends MediaWikiTestCase {
 		$this->assertFalse( $field1->merge( $field2 ) );
 
 		$field1->setMergeCallback(
-			function ( $this, $that ) {
+			function ( $a, $b ) {
 				return "test";
 			}
 		);