X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdebug%2Flogger%2FLoggerFactory.php;h=e0c4989bf0197a2c53ae6da83fba33c3256876c8;hb=237d3271fd313ebe09858a5c442a91216a7b61cf;hp=0b6965ffd25e963c40ed3170daf17aae5c7a48a3;hpb=2eb2fb4226baea250a49c5a9f0e49fd5198f77e7;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/debug/logger/LoggerFactory.php b/includes/debug/logger/LoggerFactory.php index 0b6965ffd2..c183ff1538 100644 --- 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,10 +38,9 @@ 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 - * @copyright © 2014 Bryan Davis and Wikimedia Foundation. + * @copyright © 2014 Wikimedia Foundation and contributors */ class LoggerFactory { @@ -51,18 +50,16 @@ class LoggerFactory { */ 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 +68,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,32 +83,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 ) { - if ( !interface_exists( '\Psr\Log\LoggerInterface' ) ) { - $message = ( - 'MediaWiki requires the PSR-3 logging ' . - "library 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 mediawiki.org 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. */