From: Reedy <reedy@wikimedia.org>
Date: Mon, 14 Dec 2015 13:28:29 +0000 (+0000)
Subject: Fix HHVM RepoAuthorative mode again
X-Git-Tag: 1.31.0-rc.0~8684^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=493db97bfa356b0b4a13ea110da7226440b207f5;p=lhc%2Fweb%2Fwiklou.git

Fix HHVM RepoAuthorative mode again

Change-Id: I0fe75797ebe1c8c22be603a62102bd25bce29f49
---

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 82d3955599..c5e74576f0 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -103,8 +103,11 @@ if ( is_readable( "$IP/vendor/autoload.php" ) ) {
 	require_once "$IP/vendor/autoload.php";
 }
 
-# assert that composer dependencies were successfully loaded
-if ( !interface_exists( '\Psr\Log\LoggerInterface' ) ) {
+# Assert that composer dependencies were successfully loaded
+# Purposely no leading \ due to it breaking HHVM RepoAuthorative mode
+# PHP works fine with both versions
+# See https://github.com/facebook/hhvm/issues/5833
+if ( !interface_exists( 'Psr\Log\LoggerInterface' ) ) {
 	$message = (
 		'MediaWiki requires the <a href="https://github.com/php-fig/log">PSR-3 logging ' .
 		"library</a> to be present. This library is not embedded directly in MediaWiki's " .