CHANGELOG.md

@@ -4,13 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://git.d3data.de/D3Public/guzzleFactory/compare/1.2.0...rel_1.x)
+## [Unreleased](https://git.d3data.de/D3Public/guzzleFactory/compare/1.1.0...rel_1.x)
-
-## [1.2.0](https://git.d3data.de/D3Public/guzzleFactory/compare/1.1.0...1.2.0) - 2025-02-10
-### Added
-- special log handlers
-### Changed
-- use [LoggerFactory](https://packagist.org/packages/d3/logger-factory) instead of internal methods
 
 ## [1.1.0](https://git.d3data.de/D3Public/guzzleFactory/compare/1.0.0...1.1.0) - 2025-01-27
 ### Added
@@ -21,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.0.0](https://git.d3data.de/D3Public/guzzleFactory/releases/tag/1.0.0) - 2025-01-01
 ### Added
 - initial implementation
-    - can create a custom Guzzle instance
+    - can create am cutom Guzzle instance
       - "accept" option
       - "contentType" option
       - "userAgent" option

README.md

@@ -17,13 +17,7 @@ composer require d3/guzzle-factory
 ```
 $guzzleFactory = GuzzleFactory::create();
 $guzzleFactory->setUserAgent('myApi-php-client/1.0.0'));
-$guzzleFactory->addFileLogger(
+$guzzleFactory->addFileLogger('myPluginLogger', 'plugin_requests.log', Logger::DEBUG, 5);
-    'myPluginLogger', 
-    'plugin_requests.log', 
-    Logger::DEBUG, 
-    5,
-    [\D3\LoggerFactory\LoggerFactory::SPECIAL_HANDLERS_BUFFERING]  // optional, see LoggerFactory for details
-);
 $guzzleFactory->setMessageFormatter(
     '{method} {uri} HTTP/{version} {req_body}'.PHP_EOL.'RESPONSE: {code} - {res_body}',
     ['myUsername', 'myPassword']

composer.json

@@ -19,8 +19,8 @@
   ],
   "require": {
     "guzzlehttp/guzzle": "^7.0",
-    "d3/sensitive-message-formatter": "^1.0",
+    "monolog/monolog": "^1.20",
-    "d3/logger-factory": "^1.0"
+    "d3/sensitive-message-formatter": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.5",

src/Apps/OxidLoggerTrait.php

@@ -17,9 +17,9 @@ declare(strict_types=1);
 
 namespace D3\GuzzleFactory\Apps;
 
-use D3\LoggerFactory\LoggerFactory;
 use Exception;
 use InvalidArgumentException;
+use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use OxidEsales\Eshop\Core\Registry;
 use RuntimeException;
@@ -36,42 +36,35 @@ trait OxidLoggerTrait
     }
 
     /**
-     * @param string   $loggerName
-     * @param string   $filePath
-     * @param int      $logLevel
-     * @param int|null $maxFiles
-     * @param array<int|string, string|array<string, string|int>>  $specialHandlers
-     *
-     * @return void
-     * @throws InvalidArgumentException
      * @throws Exception
+     * @throws InvalidArgumentException
      */
     public function addCombinedOxidAndFileLogger(
         string $loggerName,
         string $filePath,
         int $logLevel = Logger::INFO,
-        ?int $maxFiles = null,
+        ?int $maxFiles = null
-        array $specialHandlers = []
+    ): void
-    ): void {
+    {
+        if (!class_exists(Registry::class)) {
+            throw new RuntimeException(__METHOD__.' can executed in OXID eShop installations only');
+        }
+
+        $logger = new Logger($loggerName);
+        $stream_handler = $this->getFileLoggerStreamHandler($filePath, $logLevel, $maxFiles);
+        $logger->pushHandler($stream_handler);
+
+        $oxidLogFilePath = $this->getOxidLogPath('oxideshop.log');
+        $oxidStreamHandler = new StreamHandler($oxidLogFilePath, Logger::ERROR);
+        $logger->pushHandler($oxidStreamHandler);
+
         if (isset($this->loggers['oxid'])) {
             unset($this->loggers['oxid']);
         }
 
-        $this->loggers[$loggerName] = $this->getLoggerFactory()->getCombinedOxidAndFileLogger(
+        $this->loggers[$loggerName] = $logger;
-            $loggerName,
-            $filePath,
-            $logLevel,
-            $maxFiles,
-            /**  @phpstan-ignore argument.type */
-            $specialHandlers
-        );
     }
 
-    /**
-     * @deprecated use LoggerFactory::getOxidLogPath
-     * @param string $fileName
-     * @return string
-     */
     public function getOxidLogPath(string $fileName): string
     {
         if (!class_exists(Registry::class)) {

src/GuzzleFactory.php

@@ -52,7 +52,6 @@ class GuzzleFactory
 
         foreach ($this->getLoggers() as $logger) {
             /** @var 'alert'|'critical'|'debug'|'emergency'|'error'|'info'|'notice'|'warning' $logLevelName */
-            /**  @phpstan-ignore argument.type */
             $logLevelName = Logger::getLevelName($this->getMessageLevel());
             $stack->push(
                 Middleware::log(

src/LoggerTrait.php

@@ -18,10 +18,11 @@ declare(strict_types=1);
 namespace D3\GuzzleFactory;
 
 use D3\GuzzleFactory\Apps\OxidLoggerTrait;
-use D3\LoggerFactory\LoggerFactory;
 use Exception;
 use InvalidArgumentException;
 use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Handler\RotatingFileHandler;
+use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 
@@ -33,36 +34,25 @@ trait LoggerTrait
     protected array $loggers = [];
     protected ?int $messageLevel = null;
 
-    protected function getLoggerFactory(): LoggerFactory
-    {
-        return LoggerFactory::create();
-    }
-
     /**
-     * @param string   $loggerName
-     * @param string   $filePath
-     * @param int      $logLevel
-     * @param int|null $maxFiles
-     * @param array<int|string, string|array<string, string|int>>  $specialHandlers
-     *
-     * @return void
-     * @throws InvalidArgumentException
      * @throws Exception
+     * @throws InvalidArgumentException
      */
     public function addFileLogger(
         string $loggerName,
         string $filePath,
         int $logLevel = Logger::INFO,
-        ?int $maxFiles = null,
+        ?int $maxFiles = null
-        array $specialHandlers = []     // see LoggerFactory constants
+    ): void
-    ): void {
+    {
-        $this->loggers[$loggerName] = $this->getLoggerFactory()
+        $logger = new Logger($loggerName);
-            /**  @phpstan-ignore argument.type */
+        $stream_handler = $this->getFileLoggerStreamHandler($filePath, $logLevel, $maxFiles);
-            ->getFileLogger($loggerName, $filePath, $logLevel, $maxFiles, $specialHandlers);
+        $logger->pushHandler($stream_handler);
+
+        $this->loggers[$loggerName] = $logger;
     }
 
     /**
-     * @deprecated use LoggerFactory::getFileLoggerStreamHandler
      * @param string $filePath
      * @param int $logLevel
      * @param int|null $maxFiles
@@ -73,8 +63,11 @@ trait LoggerTrait
         string $filePath,
         int $logLevel = Logger::INFO,
         ?int $maxFiles = null
-    ): AbstractProcessingHandler {
+    ): AbstractProcessingHandler
-        return $this->getLoggerFactory()->getFileLoggerStreamHandler($filePath, $logLevel, $maxFiles);
+    {
+        return is_null($maxFiles) ?
+            new StreamHandler($filePath, $logLevel) :
+            new RotatingFileHandler($filePath, $maxFiles, $logLevel);
     }
 
     public function addConfiguredLogger(LoggerInterface $logger): void

tests/Apps/OxidLoggerTestTrait.php

@@ -16,7 +16,6 @@
 namespace D3\GuzzleFactory\tests\Apps;
 
 use D3\GuzzleFactory\GuzzleFactory;
-use D3\LoggerFactory\LoggerFactory;
 use Monolog\Logger;
 use ReflectionException;
 use RuntimeException;
@@ -41,6 +40,25 @@ trait OxidLoggerTestTrait
         );
     }
 
+    /**
+     * @test
+     * @return void
+     * @throws ReflectionException
+     * @covers \D3\GuzzleFactory\GuzzleFactory::addCombinedOxidAndFileLogger
+     */
+    public function testAddCombinedOxidAndFileLoggerWithoutOxid(): void
+    {
+        $sut = GuzzleFactory::create();
+
+        $this->expectException(RuntimeException::class);
+
+        $this->callMethod(
+            $sut,
+            'addCombinedOxidAndFileLogger',
+            ['nameFixture', 'file/path.log', 1, 5]
+        );
+    }
+
     /**
      * @test
      * @return void
@@ -91,19 +109,11 @@ trait OxidLoggerTestTrait
      * @throws ReflectionException
      * @covers \D3\GuzzleFactory\GuzzleFactory::addCombinedOxidAndFileLogger
      */
-    public function testAddCombinedOxidAndFileLogger(): void
+    public function testAddCombinedOxidAndFileLoggerInOxid(): void
     {
         require_once __DIR__.'/../Helpers/classAliases.php';
 
-        $loggerFactory = $this->getMockBuilder(LoggerFactory::class)
+        $sut = GuzzleFactory::create();
-            ->onlyMethods(['getCombinedOxidAndFileLogger'])
-            ->getMock();
-        $loggerFactory->expects($this->once())->method('getCombinedOxidAndFileLogger');
-
-        $sut = $this->getMockBuilder(GuzzleFactory::class)
-            ->onlyMethods(['getLoggerFactory'])
-            ->getMock();
-        $sut->method('getLoggerFactory')->willReturn($loggerFactory);
 
         $this->setValue($sut, 'loggers', ['oxid' => 1]);
 

tests/LoggerTestTrait.php

@@ -16,54 +16,24 @@
 namespace D3\GuzzleFactory\tests;
 
 use D3\GuzzleFactory\GuzzleFactory;
-use D3\LoggerFactory\LoggerFactory;
 use Generator;
+use Monolog\Handler\RotatingFileHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use ReflectionException;
 
 trait LoggerTestTrait
 {
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\GuzzleFactory\GuzzleFactory::getLoggerFactory
-     */
-    public function testGetLoggerFactory(): void
-    {
-        $sut = GuzzleFactory::create();
-
-        $this->assertInstanceOf(
-            LoggerFactory::class,
-            $this->callMethod(
-                $sut,
-                'getLoggerFactory',
-            )
-        );
-    }
-
     /**
      * @test
      * @throws ReflectionException
      * @covers       \D3\GuzzleFactory\GuzzleFactory::addFileLogger
+     * @covers       \D3\GuzzleFactory\GuzzleFactory::getFileLoggerStreamHandler
      * @dataProvider addFileLoggerDataProvider
      */
-    public function testAddFileLogger(int $logLevel, ?int $maxFiles): void
+    public function testAddFileLogger(int $logLevel, ?int $maxFiles, string $expectedHandlerClass): void
     {
-        $logger = $this->getMockBuilder(Logger::class)
+        $sut = GuzzleFactory::create();
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $loggerFactory = $this->getMockBuilder(LoggerFactory::class)
-            ->onlyMethods(['getFileLogger'])
-            ->getMock();
-        $loggerFactory->expects($this->once())->method('getFileLogger')->willReturn($logger);
-
-        $sut = $this->getMockBuilder(GuzzleFactory::class)
-            ->onlyMethods(['getLoggerFactory'])
-            ->getMock();
-        $sut->method("getLoggerFactory")->willReturn($loggerFactory);
 
         $this->callMethod(
             $sut,
@@ -74,36 +44,15 @@ trait LoggerTestTrait
         $loggers = $this->getValue($sut, 'loggers');
         $this->assertArrayHasKey('nameFixture', $loggers);
         $this->assertInstanceOf(Logger::class, $loggers['nameFixture']);
+        $this->assertInstanceOf($expectedHandlerClass, $loggers['nameFixture']->getHandlers()[0]);
+        $this->assertSame($logLevel, $loggers['nameFixture']->popHandler('nameFixture')->getLevel());
     }
 
     public static function addFileLoggerDataProvider(): Generator
     {
-        yield [Logger::INFO, null];
+        yield 'no rotation' => [Logger::INFO, null, StreamHandler::class];
-    }
+        yield 'rotation 1' => [Logger::ERROR, 1, RotatingFileHandler::class];
-
+        yield 'rotation 20' => [Logger::DEBUG, 20, RotatingFileHandler::class];
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\GuzzleFactory\GuzzleFactory::getFileLoggerStreamHandler
-     */
-    public function testGetFileLoggerStreamHandler(): void
-    {
-        $loggerFactory = $this->getMockBuilder(LoggerFactory::class)
-            ->onlyMethods(['getFileLoggerStreamHandler'])
-            ->getMock();
-        $loggerFactory->expects($this->once())->method('getFileLoggerStreamHandler');
-
-        $sut = $this->getMockBuilder(GuzzleFactory::class)
-            ->onlyMethods(['getLoggerFactory'])
-            ->getMock();
-        $sut->method("getLoggerFactory")->willReturn($loggerFactory);
-
-        $this->callMethod(
-            $sut,
-            'getFileLoggerStreamHandler',
-            ['file/path.log', Logger::ERROR, 2]
-        );
     }
 
     /**