Define custom logger class that simply extended monolog logger in ord…

…er to have one interface only and use autowiring

services.yml

@@ -37,8 +37,12 @@ services:
         arguments:
           - 'text/html'
 
-  Psr\Log\LoggerInterface:
-    class: \Monolog\Logger
+  Psr\Log\LoggerInterface: '@webgriffe_esb_logger'
+
+  Webgriffe\Esb\LoggerResettableInterface: '@webgriffe_esb_logger'
+
+  webgriffe_esb_logger:
+    class: \Webgriffe\Esb\Logger\LoggerResettable
     arguments: [ 'esb', ['@Monolog\Handler\StreamHandler', '@Monolog\Handler\ErrorLogHandler', '@Monolog\Handler\NativeMailerHandler'] ]
     public: true
 

src/Logger/LoggerResettable.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webgriffe\Esb\Logger;
+
+use Monolog\Logger;
+
+final class LoggerResettable extends Logger implements LoggerResettableInterface
+{
+}

src/Logger/LoggerResettableInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Webgriffe\Esb\Logger;
+
+use Monolog\ResettableInterface;
+use Psr\Log\LoggerInterface;
+
+interface LoggerResettableInterface extends LoggerInterface, ResettableInterface
+{
+}

src/ProducerInstance.php

@@ -8,8 +8,7 @@
 use function Amp\call;
 use Amp\Loop;
 use Amp\Promise;
-use Monolog\ResettableInterface;
-use Psr\Log\LoggerInterface;
+use Webgriffe\Esb\Logger\LoggerResettableInterface;
 use Webgriffe\Esb\Model\FlowConfig;
 use Webgriffe\Esb\Model\Job;
 use Webgriffe\Esb\Model\ProducedJobEvent;
@@ -32,7 +31,7 @@ final class ProducerInstance implements ProducerInstanceInterface
     private $producer;
 
     /**
-     * @var LoggerInterface&ResettableInterface
+     * @var LoggerResettableInterface
      */
     private $logger;
 
@@ -51,14 +50,11 @@ final class ProducerInstance implements ProducerInstanceInterface
      */
     private $queueManager;
 
-    /**
-     * @param LoggerInterface&ResettableInterface $logger
-     */
     public function __construct(
         FlowConfig $flowConfig,
         ProducerInterface $producer,
         ?BeanstalkClient $beanstalkClient,
-        $logger,
+        LoggerResettableInterface $logger,
         HttpProducersServer $httpProducersServer,
         CronProducersServer $cronProducersServer,
         ?ElasticSearch $elasticSearch,

src/WorkerInstance.php

@@ -8,9 +8,8 @@
 use function Amp\call;
 use function Amp\delay;
 use Amp\Promise;
-use Monolog\ResettableInterface;
-use Psr\Log\LoggerInterface;
 use Webgriffe\Esb\Exception\FatalQueueException;
+use Webgriffe\Esb\Logger\LoggerResettableInterface;
 use Webgriffe\Esb\Model\ErroredJobEvent;
 use Webgriffe\Esb\Model\FlowConfig;
 use Webgriffe\Esb\Model\JobInterface;
@@ -38,7 +37,7 @@ final class WorkerInstance implements WorkerInstanceInterface
     private $worker;
 
     /**
-     * @var LoggerInterface&ResettableInterface
+     * @var LoggerResettableInterface
      */
     private $logger;
 
@@ -52,15 +51,12 @@ final class WorkerInstance implements WorkerInstanceInterface
      */
     private static $workCounts = [];
 
-    /**
-     * @param LoggerInterface&ResettableInterface $logger
-     */
     public function __construct(
         FlowConfig $flowConfig,
         int $instanceId,
         WorkerInterface $worker,
         ?BeanstalkClient $beanstalkClient,
-        $logger,
+        LoggerResettableInterface $logger,
         ?ElasticSearch $elasticSearch,
         WorkerQueueManagerInterface $queueManager = null
     ) {