X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdebug%2Flogger%2FMonologSpi.php;h=f44ff1ceef17922e2ae8750d6eb3207e39b4965a;hb=92571d7c1a9c25604382f9c395e487e44cc442d5;hp=eea9adc4c4a459d5b8cff321d07760e08eae3a91;hpb=170e23a2410fd0402019a4477a95075d531f5828;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/debug/logger/MonologSpi.php b/includes/debug/logger/MonologSpi.php
index eea9adc4c4..ec27ad1cdc 100644
--- a/includes/debug/logger/MonologSpi.php
+++ b/includes/debug/logger/MonologSpi.php
@@ -22,7 +22,7 @@ namespace MediaWiki\Logger;
 
 use MediaWiki\Logger\Monolog\BufferHandler;
 use Monolog\Logger;
-use ObjectFactory;
+use Wikimedia\ObjectFactory;
 
 /**
  * LoggerFactory service provider that creates loggers implemented by
@@ -39,79 +39,78 @@ use ObjectFactory;
  * global configuration variable used by LoggerFactory to construct its
  * default SPI provider:
  * @code
- * $wgMWLoggerDefaultSpi = array(
- *   'class' => '\\MediaWiki\\Logger\\MonologSpi',
- *   'args' => array( array(
- *       'loggers' => array(
- *           '@default' => array(
- *               'processors' => array( 'wiki', 'psr', 'pid', 'uid', 'web' ),
- *               'handlers'   => array( 'stream' ),
- *           ),
- *           'runJobs' => array(
- *               'processors' => array( 'wiki', 'psr', 'pid' ),
- *               'handlers'   => array( 'stream' ),
- *           )
- *       ),
- *       'processors' => array(
- *           'wiki' => array(
- *               'class' => '\\MediaWiki\\Logger\\Monolog\\WikiProcessor',
- *           ),
- *           'psr' => array(
- *               'class' => '\\Monolog\\Processor\\PsrLogMessageProcessor',
- *           ),
- *           'pid' => array(
- *               'class' => '\\Monolog\\Processor\\ProcessIdProcessor',
- *           ),
- *           'uid' => array(
- *               'class' => '\\Monolog\\Processor\\UidProcessor',
- *           ),
- *           'web' => array(
- *               'class' => '\\Monolog\\Processor\\WebProcessor',
- *           ),
- *       ),
- *       'handlers' => array(
- *           'stream' => array(
- *               'class'     => '\\Monolog\\Handler\\StreamHandler',
- *               'args'      => array( 'path/to/your.log' ),
+ * $wgMWLoggerDefaultSpi = [
+ *   'class' => \MediaWiki\Logger\MonologSpi::class,
+ *   'args' => [ [
+ *       'loggers' => [
+ *           '@default' => [
+ *               'processors' => [ 'wiki', 'psr', 'pid', 'uid', 'web' ],
+ *               'handlers'   => [ 'stream' ],
+ *           ],
+ *           'runJobs' => [
+ *               'processors' => [ 'wiki', 'psr', 'pid' ],
+ *               'handlers'   => [ 'stream' ],
+ *           ]
+ *       ],
+ *       'processors' => [
+ *           'wiki' => [
+ *               'class' => \MediaWiki\Logger\Monolog\WikiProcessor::class,
+ *           ],
+ *           'psr' => [
+ *               'class' => \Monolog\Processor\PsrLogMessageProcessor::class,
+ *           ],
+ *           'pid' => [
+ *               'class' => \Monolog\Processor\ProcessIdProcessor::class,
+ *           ],
+ *           'uid' => [
+ *               'class' => \Monolog\Processor\UidProcessor::class,
+ *           ],
+ *           'web' => [
+ *               'class' => \Monolog\Processor\WebProcessor::class,
+ *           ],
+ *       ],
+ *       'handlers' => [
+ *           'stream' => [
+ *               'class'     => \Monolog\Handler\StreamHandler::class,
+ *               'args'      => [ 'path/to/your.log' ],
  *               'formatter' => 'line',
- *           ),
- *           'redis' => array(
- *               'class'     => '\\Monolog\\Handler\\RedisHandler',
- *               'args'      => array( function() {
+ *           ],
+ *           'redis' => [
+ *               'class'     => \Monolog\Handler\RedisHandler::class,
+ *               'args'      => [ function() {
  *                       $redis = new Redis();
  *                       $redis->connect( '127.0.0.1', 6379 );
  *                       return $redis;
  *                   },
  *                   'logstash'
- *               ),
+ *               ],
  *               'formatter' => 'logstash',
  *               'buffer' => true,
- *           ),
- *           'udp2log' => array(
- *               'class' => '\\MediaWiki\\Logger\\Monolog\\LegacyHandler',
- *               'args' => array(
+ *           ],
+ *           'udp2log' => [
+ *               'class' => \MediaWiki\Logger\Monolog\LegacyHandler::class,
+ *               'args' => [
  *                   'udp://127.0.0.1:8420/mediawiki
- *               ),
+ *               ],
  *               'formatter' => 'line',
- *           ),
- *       ),
- *       'formatters' => array(
- *           'line' => array(
- *               'class' => '\\Monolog\\Formatter\\LineFormatter',
- *            ),
- *            'logstash' => array(
- *                'class' => '\\Monolog\\Formatter\\LogstashFormatter',
- *                'args'  => array( 'mediawiki', php_uname( 'n' ), null, '', 1 ),
- *            ),
- *       ),
- *   ) ),
- * );
+ *           ],
+ *       ],
+ *       'formatters' => [
+ *           'line' => [
+ *               'class' => \Monolog\Formatter\LineFormatter::class,
+ *            ],
+ *            'logstash' => [
+ *                'class' => \Monolog\Formatter\LogstashFormatter::class,
+ *                'args'  => [ 'mediawiki', php_uname( 'n' ), null, '', 1 ],
+ *            ],
+ *       ],
+ *   ] ],
+ * ];
  * @endcode
  *
  * @see https://github.com/Seldaek/monolog
  * @since 1.25
- * @author Bryan Davis <bd808@wikimedia.org>
- * @copyright © 2014 Bryan Davis and Wikimedia Foundation.
+ * @copyright © 2014 Wikimedia Foundation and contributors
  */
 class MonologSpi implements Spi {
 
@@ -126,16 +125,14 @@ class MonologSpi implements Spi {
 	 */
 	protected $config;
 
-
 	/**
 	 * @param array $config Configuration data.
 	 */
 	public function __construct( array $config ) {
-		$this->config = array();
+		$this->config = [];
 		$this->mergeConfig( $config );
 	}
 
-
 	/**
 	 * Merge additional configuration data into the configuration.
 	 *
@@ -153,7 +150,6 @@ class MonologSpi implements Spi {
 		$this->reset();
 	}
 
-
 	/**
 	 * Reset internal caches.
 	 *
@@ -161,15 +157,14 @@ class MonologSpi implements Spi {
 	 * be no need to flush the caches.
 	 */
 	public function reset() {
-		$this->singletons = array(
-			'loggers'    => array(),
-			'handlers'   => array(),
-			'formatters' => array(),
-			'processors' => array(),
-		);
+		$this->singletons = [
+			'loggers'    => [],
+			'handlers'   => [],
+			'formatters' => [],
+			'processors' => [],
+		];
 	}
 
-
 	/**
 	 * Get a logger instance.
 	 *
@@ -195,7 +190,6 @@ class MonologSpi implements Spi {
 		return $this->singletons['loggers'][$channel];
 	}
 
-
 	/**
 	 * Create a logger.
 	 * @param string $channel Logger channel
@@ -207,7 +201,7 @@ class MonologSpi implements Spi {
 
 		if ( isset( $spec['calls'] ) ) {
 			foreach ( $spec['calls'] as $method => $margs ) {
-				call_user_func_array( array( $obj, $method ), $margs );
+				call_user_func_array( [ $obj, $method ], $margs );
 			}
 		}
 
@@ -225,7 +219,6 @@ class MonologSpi implements Spi {
 		return $obj;
 	}
 
-
 	/**
 	 * Create or return cached processor.
 	 * @param string $name Processor name
@@ -240,7 +233,6 @@ class MonologSpi implements Spi {
 		return $this->singletons['processors'][$name];
 	}
 
-
 	/**
 	 * Create or return cached handler.
 	 * @param string $name Processor name
@@ -263,7 +255,6 @@ class MonologSpi implements Spi {
 		return $this->singletons['handlers'][$name];
 	}
 
-
 	/**
 	 * Create or return cached formatter.
 	 * @param string $name Formatter name