Compatibility with PHP:^8.1 and monolog:^3.3

master
Julien Rosset 2 years ago
parent 9f6816d3b1
commit 3b2593b04c

@ -7,18 +7,18 @@
"config": { "config": {
"sort-packages": true "sort-packages": true
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.x-dev" "dev-master": "2.x-dev"
} }
}, },
"minimum-stability": "stable", "minimum-stability": "stable",
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^8.1",
"jrosset/exceptionhelper": "^1.0", "jrosset/exceptionhelper": "^1.0",
"jrosset/lasterrorexception": "^1.0", "jrosset/lasterrorexception": "^1.0",
"monolog/monolog": "^2.9" "monolog/monolog": "^3.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

@ -3,6 +3,7 @@
namespace jrosset\ExtendedMonolog; namespace jrosset\ExtendedMonolog;
use jrosset\ExceptionHelper\ExceptionHelper; use jrosset\ExceptionHelper\ExceptionHelper;
use Monolog\Level;
use Monolog\Logger; use Monolog\Logger;
use Throwable; use Throwable;
@ -13,7 +14,7 @@ class ExceptionLogger extends Logger implements ExceptionLoggerInterface {
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function exception (int $level, Throwable $exception, array $context = []): void { public function exception (Level|int $level, Throwable $exception, array $context = []): void {
$this->addRecord( $this->addRecord(
$level, $level,
ExceptionHelper::toString($exception, false), ExceptionHelper::toString($exception, false),

@ -2,6 +2,7 @@
namespace jrosset\ExtendedMonolog; namespace jrosset\ExtendedMonolog;
use Monolog\Level;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Throwable; use Throwable;
@ -12,9 +13,9 @@ interface ExceptionLoggerInterface extends LoggerInterface {
/** /**
* Adds a log record about an exception * Adds a log record about an exception
* *
* @param int $level The logging level (a Monolog or RFC 5424 level) * @param Level|int $level The logging level (a Monolog or RFC 5424 level)
* @param Throwable $exception The exception * @param Throwable $exception The exception
* @param array $context The log context * @param array $context The log context
*/ */
public function exception (int $level, Throwable $exception, array $context = []): void; public function exception (Level|int $level, Throwable $exception, array $context = []): void;
} }

@ -7,7 +7,7 @@ use DateTimeImmutable;
use DirectoryIterator; use DirectoryIterator;
use jrosset\LastErrorException\LastErrorException; use jrosset\LastErrorException\LastErrorException;
use Monolog\Handler\StreamHandler; use Monolog\Handler\StreamHandler;
use Monolog\Logger; use Monolog\Level;
use RuntimeException; use RuntimeException;
use Throwable; use Throwable;
@ -31,7 +31,7 @@ class LogDirectoryHandler extends StreamHandler {
*/ */
public function __construct ( public function __construct (
string $dirPath, string $dirPath,
$level = Logger::DEBUG, $level = Level::Debug,
int $historyNumberOfDays = 30, int $historyNumberOfDays = 30,
bool $bubble = true, bool $bubble = true,
?int $filePermission = null, ?int $filePermission = null,

@ -5,7 +5,7 @@ require_once __DIR__ . '/../vendor/autoload.php';
use jrosset\ExtendedMonolog\ExceptionLogger; use jrosset\ExtendedMonolog\ExceptionLogger;
use jrosset\ExtendedMonolog\LogDirectoryHandler; use jrosset\ExtendedMonolog\LogDirectoryHandler;
use Monolog\Handler\StreamHandler; use Monolog\Handler\StreamHandler;
use Monolog\Logger; use Monolog\Level;
/** @noinspection PhpUnhandledExceptionInspection */ /** @noinspection PhpUnhandledExceptionInspection */
$logger = new ExceptionLogger( $logger = new ExceptionLogger(
@ -25,5 +25,5 @@ try {
$logger->info('END'); $logger->info('END');
} }
catch (Throwable $exception) { catch (Throwable $exception) {
$logger->exception(Logger::ERROR, $exception); $logger->exception(Level::Error, $exception);
} }
Loading…
Cancel
Save