Update to work with the new logger

Author: freost

composer.json

@@ -21,7 +21,8 @@
         "symfony/var-dumper": "^5.2"
     },
     "require-dev": {
-        "mako/framework": "^7.0.0-dev"
+        "mako/framework": "^7.0.0-dev",
+        "monolog/monolog": "^2.3"
     },
     "extra": {
         "branch-alias": {

src/Monologger.php src/MonologHandler.phpsrc/Monologger.php renamed to src/MonologHandler.php

@@ -12,11 +12,11 @@
 use function count;
 
 /**
- * Monologger.
+ * Monolog handler.
  *
  * @author Frederic G. Østby
  */
-class Monologger extends AbstractProcessingHandler
+class MonologHandler extends AbstractProcessingHandler
 {
 	/**
 	 * Log entries.

src/ToolbarPackage.php

@@ -25,7 +25,7 @@
 use mako\toolbar\panels\SessionPanel;
 use mako\utility\Humanizer;
 use mako\view\ViewFactory;
-use Monolog\Logger;
+use Monolog\Logger as MonoLogger;
 use Psr\Log\LoggerInterface;
 
 use function function_exists;
@@ -55,9 +55,14 @@ protected function bootstrap(): void
 
 		if($this->container->has(LoggerInterface::class))
 		{
-			$monologHandler = new Monologger(Logger::DEBUG, true);
+			$monologHandler = new MonologHandler(MonoLogger::DEBUG, true);
 
-			$this->container->get(LoggerInterface::class)->pushHandler($monologHandler);
+			$logger = $this->container->get(LoggerInterface::class)->getLogger();
+
+			if($logger instanceof MonoLogger)
+			{
+				$logger->pushHandler($monologHandler);
+			}
 		}
 
 		// Register the toolbar in the container

src/panels/MonologPanel.php

@@ -8,7 +8,7 @@
 namespace mako\toolbar\panels;
 
 use Closure;
-use mako\toolbar\Monologger;
+use mako\toolbar\MonologHandler;
 use mako\toolbar\panels\traits\DumperTrait;
 use mako\view\ViewFactory;
 
@@ -24,31 +24,31 @@ class MonologPanel extends Panel implements PanelInterface
 	use DumperTrait;
 
 	/**
-	 * Monologger.
+	 * Monolog handler.
 	 *
-	 * @var \mako\toolbar\Monologger
+	 * @var \mako\toolbar\MonologHandler
 	 */
-	protected $monologger;
+	protected $monologHandler;
 
 	/**
 	 * Constructor.
 	 *
 	 * @param \mako\view\ViewFactory   $view       View factory instance
-	 * @param \mako\toolbar\Monologger $monologger Monologger
+	 * @param \mako\toolbar\MonologHandler $monologHandler Monolog handler
 	 */
-	public function __construct(ViewFactory $view, Monologger $monologger)
+	public function __construct(ViewFactory $view, MonologHandler $monologHandler)
 	{
 		parent::__construct($view);
 
-		$this->monologger = $monologger;
+		$this->monologHandler = $monologHandler;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public function getTabLabel(): string
 	{
-		return sprintf('%u log entries', $this->monologger->getEntryCount());
+		return sprintf('%u log entries', $this->monologHandler->getEntryCount());
 	}
 
 	/**
@@ -89,7 +89,7 @@ public function render(): string
 	{
 		$view = $this->view->create('mako-toolbar::panels.monolog',
 		[
-			'entries'      => $this->monologger->getEntries(),
+			'entries'      => $this->monologHandler->getEntries(),
 			'level_helper' => $this->getLevelHelper(),
 			'dump'         => $this->getDumper(),
 		]);