From: Reedy <reedy@wikimedia.org>
Date: Sun, 27 Dec 2015 20:21:51 +0000 (+0000)
Subject: Support phpunit-old.phar
X-Git-Tag: 1.31.0-rc.0~8543
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=cc7fca0c14398baeb88b949cfad71846b6b05c83;p=lhc%2Fweb%2Fwiklou.git

Support phpunit-old.phar

Bug: T122485
Change-Id: Ic21c6c1ca5afaac0e298cf0259f5dc273dfec128
---

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 29ff1a01f3..5f43ef5762 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -250,9 +250,16 @@ if ( class_exists( 'PHPUnit_TextUI_Command' ) ) {
 } else {
 	foreach ( array(
 				stream_resolve_include_path( 'phpunit.phar' ),
+				stream_resolve_include_path( 'phpunit-old.phar' ),
 				'PHPUnit/Runner/Version.php',
 				'PHPUnit/Autoload.php'
 			) as $includePath ) {
+
+		if ( $includePath === false ) {
+			// stream_resolve_include_path can return false
+			continue;
+		}
+
 		// @codingStandardsIgnoreStart
 		@include_once $includePath;
 		// @codingStandardsIgnoreEnd