Fix HHVM RepoAuthorative mode again
authorReedy <reedy@wikimedia.org>
Mon, 14 Dec 2015 13:28:29 +0000 (13:28 +0000)
committerReedy <reedy@wikimedia.org>
Mon, 14 Dec 2015 15:46:37 +0000 (15:46 +0000)
Change-Id: I0fe75797ebe1c8c22be603a62102bd25bce29f49

includes/WebStart.php

index 82d3955..c5e7457 100644 (file)
@@ -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 " .