Merge "Add PLURAL support and "human readable" sizes for mediastatistics messages"

[lhc/web/wiklou.git] / includes / debug / logger / LoggerFactory.php

diff --git a/includes/debug/logger/LoggerFactory.php b/includes/debug/logger/LoggerFactory.php
index 92fbb46..ce92dbd 100644 (file)
--- a/includes/debug/logger/LoggerFactory.php
+++ b/includes/debug/logger/LoggerFactory.php
@@ -25,7 +25,7 @@ use ObjectFactory;
 /**
  * PSR-3 logger instance factory.
  *
- * Creation of \\Psr\\Log\\LoggerInterface instances is managed via the
+ * Creation of \Psr\Log\LoggerInterface instances is managed via the
  * LoggerFactory::getInstance() static method which in turn delegates to the
  * currently registered service provider.
  *
@@ -38,7 +38,7 @@ use ObjectFactory;
  * $wgMWLoggerDefaultSpi is expected to be an array usable by
  * ObjectFactory::getObjectFromSpec() to create a class.
  *
- * @see \\MediaWiki\\Logger\\Spi
+ * @see \MediaWiki\Logger\Spi
  * @since 1.25
  * @author Bryan Davis <bd808@wikimedia.org>
  * @copyright © 2014 Bryan Davis and Wikimedia Foundation.
@@ -47,22 +47,20 @@ class LoggerFactory {
 
        /**
         * Service provider.
-        * @var \\MediaWiki\\Logger\\Spi $spi
+        * @var \MediaWiki\Logger\Spi $spi
         */
        private static $spi;
 
-
        /**
-        * Register a service provider to create new \\Psr\\Log\\LoggerInterface
+        * Register a service provider to create new \Psr\Log\LoggerInterface
         * instances.
         *
-        * @param \\MediaWiki\\Logger\\Spi $provider Provider to register
+        * @param \MediaWiki\Logger\Spi $provider Provider to register
         */
        public static function registerProvider( Spi $provider ) {
                self::$spi = $provider;
        }
 
-
        /**
         * Get the registered service provider.
         *
@@ -71,7 +69,7 @@ class LoggerFactory {
         * Spi registration. $wgMWLoggerDefaultSpi is expected to be an
         * array usable by ObjectFactory::getObjectFromSpec() to create a class.
         *
-        * @return \\MediaWiki\\Logger\\Spi
+        * @return \MediaWiki\Logger\Spi
         * @see registerProvider()
         * @see ObjectFactory::getObjectFromSpec()
         */
@@ -86,36 +84,16 @@ class LoggerFactory {
                return self::$spi;
        }
 
-
        /**
         * Get a named logger instance from the currently configured logger factory.
         *
         * @param string $channel Logger channel (name)
-        * @return \\Psr\\Log\\LoggerInterface
+        * @return \Psr\Log\LoggerInterface
         */
        public static function getInstance( $channel ) {
-               static $hasPSR3Interface = null;
-               if ( $hasPSR3Interface === null ) {
-                       $hasPSR3Interface = interface_exists( '\Psr\Log\LoggerInterface' );
-                       if ( !$hasPSR3Interface ) {
-                               $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 " .
-                                       "git repository and must be installed separately by the end user.\n\n" .
-                                       'Please see <a href="https://www.mediawiki.org/wiki/Download_from_Git' .
-                                       '#Fetch_external_libraries">mediawiki.org</a> for help on installing ' .
-                                       'the required components.'
-                               );
-                               echo $message;
-                               trigger_error( $message, E_USER_ERROR );
-                               die( 1 );
-                       }
-               }
-
                return self::getProvider()->getLogger( $channel );
        }
 
-
        /**
         * Construction of utility class is not allowed.
         */