From 9e4e8f59f362606c6db97c3f205de595f21fd577 Mon Sep 17 00:00:00 2001 From: Neil Aitken Date: Wed, 4 Jun 2025 08:45:17 +0100 Subject: [PATCH] main: feat: magento 2.4.8 compat --- README.md | 8 ++++++++ src/Processor/RemoteIpProcessor.php | 7 ++++--- src/Processor/UrlProcessor.php | 7 ++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 77eb605..4613947 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,14 @@ Currently adds * Request remote IP * Request method and URL, e.g `GET /customer/account/login` +## Versions + +### 1.x +<= Magento 2.4.7 + +2.x +>= Magento 2.4.8 + ## Installation `composer require skywire/m2-logging` diff --git a/src/Processor/RemoteIpProcessor.php b/src/Processor/RemoteIpProcessor.php index e4ae971..46c0e9e 100644 --- a/src/Processor/RemoteIpProcessor.php +++ b/src/Processor/RemoteIpProcessor.php @@ -11,6 +11,7 @@ namespace Skywire\Logger\Processor; +use Monolog\LogRecord; use Monolog\Processor\ProcessorInterface; use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress; @@ -26,10 +27,10 @@ public function __construct(RemoteAddress $remoteAddress) $this->remoteAddress = $remoteAddress; } - public function __invoke(array $records) + public function __invoke(LogRecord $record) { - $records['extra']['remote_ip'] = $this->remoteAddress->getRemoteAddress(); + $record->extra['remote_ip'] = $this->remoteAddress->getRemoteAddress(); - return $records; + return $record; } } diff --git a/src/Processor/UrlProcessor.php b/src/Processor/UrlProcessor.php index 87b4665..856b841 100644 --- a/src/Processor/UrlProcessor.php +++ b/src/Processor/UrlProcessor.php @@ -11,16 +11,17 @@ namespace Skywire\Logger\Processor; +use Monolog\LogRecord; use Monolog\Processor\ProcessorInterface; class UrlProcessor implements ProcessorInterface { - public function __invoke(array $records) + public function __invoke(LogRecord $record) { if (isset($_SERVER['REQUEST_METHOD']) && isset($_SERVER['REQUEST_URI'])) { - $records['extra']['url'] = $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI']; + $record->extra['url'] = $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI']; } - return $records; + return $record; } }