X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=blobdiff_plain;f=tests%2Fphpunit%2FMediaWikiIntegrationTestCase.php;h=41c65b28ed4add84f66987df8662b22b59cfe24a;hb=d4e0dbcf96d2a9cdff4a73f56d33beb5c25aa442;hp=b1eb9effa73fb04036e5d03a6c80ff9ab51de5f0;hpb=529fc12d2ad2032337594389448fdb5b55802830;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php
index b1eb9effa7..41c65b28ed 100644
--- a/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@ -10,6 +10,7 @@ use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\IMaintainableDatabase;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\TestingAccessWrapper;
+use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**
  * @since 1.18
@@ -182,8 +183,10 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 		global $IP;
 		parent::setUpBeforeClass();
 		if ( !file_exists( "$IP/LocalSettings.php" ) ) {
-			echo 'A working MediaWiki installation with a configured LocalSettings.php file is'
-			. ' required for tests that extend ' . self::class;
+				echo "File \"$IP/LocalSettings.php\" could not be found. "
+				. "Test case " . static::class . " extends " . self::class . " "
+				. "which requires a working MediaWiki installation.\n"
+				. ( new RuntimeException() )->getTraceAsString();
 			die();
 		}
 		self::initializeForStandardPhpunitEntrypointIfNeeded();
@@ -584,6 +587,17 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 		$this->tmpFiles = array_merge( $this->tmpFiles, (array)$files );
 	}
 
+	private static function formatErrorLevel( $errorLevel ) {
+		switch ( gettype( $errorLevel ) ) {
+		case 'integer':
+			return '0x' . strtoupper( dechex( $errorLevel ) );
+		case 'NULL':
+			return 'null';
+		default:
+			throw new MWException( 'Unexpected error level type ' . gettype( $errorLevel ) );
+		}
+	}
+
 	protected function tearDown() {
 		global $wgRequest, $wgSQLMode;
 
@@ -649,14 +663,17 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 		if ( $phpErrorLevel !== $this->phpErrorLevel ) {
 			ini_set( 'error_reporting', $this->phpErrorLevel );
 
-			$oldHex = strtoupper( dechex( $this->phpErrorLevel ) );
-			$newHex = strtoupper( dechex( $phpErrorLevel ) );
+			$oldVal = self::formatErrorLevel( $this->phpErrorLevel );
+			$newVal = self::formatErrorLevel( $phpErrorLevel );
 			$message = "PHP error_reporting setting was left dirty: "
-				. "was 0x$oldHex before test, 0x$newHex after test!";
+				. "was $oldVal before test, $newVal after test!";
 
 			$this->fail( $message );
 		}
 
+		// If anything faked the time, reset it
+		ConvertibleTimestamp::setFakeTime( false );
+
 		parent::tearDown();
 	}