Issue #3294236: Move level mapping between rfc and monolog upstream (c08ab3e7) · Commits · project / monolog

composer.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		},
		"require": {
		"php": "^7.4\|^8",
		"monolog/monolog": "^2.0.0"
		"monolog/monolog": "^2.8.0"
		},
		"autoload": {
		"psr-0": {

src/Logger/Logger.php

deleted100755 → 0

+0 −85

Original line number	Diff line number	Diff line
		<?php

		declare(strict_types=1);

		namespace Drupal\monolog\Logger;

		use Drupal\Core\Logger\LoggerChannelInterface;
		use Drupal\Core\Logger\RfcLogLevel;
		use Drupal\Core\Session\AccountInterface;
		use Monolog\DateTimeImmutable;
		use Monolog\Logger as BaseLogger;
		use Psr\Log\LoggerInterface;
		use Symfony\Component\HttpFoundation\RequestStack;

		/**
		* Logger class for the Drupal Monolog module.
		*
		* Allows the channel to be modified after the class is instantiated. This is
		* normally not a good idea, but it is necessary to reconcile the differences in
		* the Monolog library and how the watchdog type relates to the logging
		* facility.
		*/
		class Logger extends BaseLogger implements LoggerChannelInterface {

		/**
		* Map of RFC 5424 log constants to Monolog log constants.
		*
		* @var array
		*/
		protected array $levelTranslation = [
		RfcLogLevel::EMERGENCY => MonologLogLevel::EMERGENCY,
		RfcLogLevel::ALERT => MonologLogLevel::ALERT,
		RfcLogLevel::CRITICAL => MonologLogLevel::CRITICAL,
		RfcLogLevel::ERROR => MonologLogLevel::ERROR,
		RfcLogLevel::WARNING => MonologLogLevel::WARNING,
		RfcLogLevel::NOTICE => MonologLogLevel::NOTICE,
		RfcLogLevel::INFO => MonologLogLevel::INFO,
		RfcLogLevel::DEBUG => MonologLogLevel::DEBUG,
		];

		/**
		* {@inheritdoc}
		*/
		public function addRecord(
		int $level,
		string $message,
		array $context = [],
		DateTimeImmutable $datetime = NULL
		): bool {
		if (array_key_exists($level, $this->levelTranslation)) {
		$level = $this->levelTranslation[$level];
		}

		return parent::addRecord($level, $message, $context, $datetime);
		}

		/**
		* {@inheritdoc}
		*/
		public function setRequestStack(RequestStack $requestStack = NULL) {
		// Do nothing, use a handler for this.
		}

		/**
		* {@inheritdoc}
		*/
		public function setCurrentUser(AccountInterface $current_user = NULL) {
		// Do nothing, use a handler for this.
		}

		/**
		* {@inheritdoc}
		*/
		public function setLoggers(array $loggers) {
		// Do nothing.
		}

		/**
		* {@inheritdoc}
		*/
		public function addLogger(LoggerInterface $logger, $priority = 0) {
		// Do nothing.
		}

		}

src/Logger/MonologLogLevel.php

deleted100644 → 0

+0 −91

Original line number	Diff line number	Diff line
		<?php

		declare(strict_types=1);

		namespace Drupal\monolog\Logger;

		use Drupal\Core\StringTranslation\TranslatableMarkup;
		use Monolog\Logger as MonologLogger;

		/**
		* @defgroup logging_severity_levels Logging severity levels
		* @{
		* Logging severity levels as defined in Monolog\Logger.
		*
		* @} End of "defgroup logging_severity_levels".
		*/
		class MonologLogLevel {

		/**
		* Log message severity -- Emergency: system is unusable.
		*/
		const EMERGENCY = MonologLogger::EMERGENCY;

		/**
		* Log message severity -- Alert: action must be taken immediately.
		*/
		const ALERT = MonologLogger::ALERT;

		/**
		* Log message severity -- Critical conditions.
		*/
		const CRITICAL = MonologLogger::CRITICAL;

		/**
		* Log message severity -- Error conditions.
		*/
		const ERROR = MonologLogger::ERROR;

		/**
		* Log message severity -- Warning conditions.
		*/
		const WARNING = MonologLogger::WARNING;

		/**
		* Log message severity -- Normal but significant conditions.
		*/
		const NOTICE = MonologLogger::NOTICE;

		/**
		* Log message severity -- Informational messages.
		*/
		const INFO = MonologLogger::INFO;

		/**
		* Log message severity -- Debug-level messages.
		*/
		const DEBUG = MonologLogger::DEBUG;

		/**
		* An array with the severity levels as keys and labels as values.
		*
		* @var array
		*/
		protected static array $levels;

		/**
		* Returns a list of severity levels, as defined Monolog\Logger.
		*
		* @return array
		* Array of the possible severity levels for log messages.
		*
		* @ingroup logging_severity_levels
		*/
		public static function getLevels(): array {
		if (!static::$levels) {
		static::$levels = [
		static::EMERGENCY => new TranslatableMarkup('Emergency'),
		static::ALERT => new TranslatableMarkup('Alert'),
		static::CRITICAL => new TranslatableMarkup('Critical'),
		static::ERROR => new TranslatableMarkup('Error'),
		static::WARNING => new TranslatableMarkup('Warning'),
		static::NOTICE => new TranslatableMarkup('Notice'),
		static::INFO => new TranslatableMarkup('Info'),
		static::DEBUG => new TranslatableMarkup('Debug'),
		];
		}

		return static::$levels;
		}

		}

src/Logger/MonologLoggerChannelFactory.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ declare(strict_types=1);
		namespace Drupal\monolog\Logger;

		use Monolog\Handler\HandlerInterface;
		use Monolog\Logger;
		use Psr\Log\NullLogger;
		use Psr\Log\LoggerInterface;
		use Monolog\Formatter\FormatterInterface;

tests/src/Unit/Logger/ChannelFactoryTest.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,12 +4,12 @@ namespace Drupal\Tests\monolog\Unit\Logger;

		use Drupal\Core\DependencyInjection\Container;
		use Drupal\monolog\Logger\Handler\DrupalHandler;
		use Drupal\monolog\Logger\Logger;
		use Drupal\monolog\Logger\MonologLoggerChannelFactory;
		use Drupal\Tests\UnitTestCase;
		use Monolog\Formatter\JsonFormatter;
		use Monolog\Formatter\LineFormatter;
		use Monolog\Handler\RotatingFileHandler;
		use Monolog\Logger;
		use Monolog\Processor\ProcessorInterface;
		use Psr\Log\NullLogger;
		use Symfony\Component\DependencyInjection\ContainerInterface;