bug #36338 [5.0][MonologBridge] Fix $level type (fancyweb)

fabpot · fabpot · commit e0c1ee64087f · 2020-04-04T09:14:00.000+02:00
This PR was merged into the 5.0 branch. Discussion ---------- [5.0][MonologBridge] Fix $level type | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #36334 (comment) | License | MIT | Doc PR | - Commits ------- d9c0681 [5.0][MonologBridge] Fix $level type
diff --git a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php
@@ -26,11 +26,14 @@ class NotifierHandler extends AbstractHandler
 {
     private $notifier;
 
-    public function __construct(NotifierInterface $notifier, int $level = Logger::ERROR, bool $bubble = true)
+    /**
+     * @param string|int $level The minimum logging level at which this handler will be triggered
+     */
+    public function __construct(NotifierInterface $notifier, $level = Logger::ERROR, bool $bubble = true)
     {
         $this->notifier = $notifier;
 
-        parent::__construct($level < Logger::ERROR ? Logger::ERROR : $level, $bubble);
+        parent::__construct(Logger::toMonologLevel($level) < Logger::ERROR ? Logger::ERROR : $level, $bubble);
     }
 
     public function handle(array $record): bool
diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -54,7 +54,10 @@ trait ServerLogHandlerTrait
     private $context;
     private $socket;
 
-    public function __construct(string $host, int $level = Logger::DEBUG, bool $bubble = true, array $context = [])
+    /**
+     * @param string|int $level The minimum logging level at which this handler will be triggered
+     */
+    public function __construct(string $host, $level = Logger::DEBUG, bool $bubble = true, array $context = [])
     {
         parent::__construct($level, $bubble);
 

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,14 @@ class NotifierHandler extends AbstractHandler`
`26`	`26`	`{`
`27`	`27`	`private $notifier;`
`28`	`28`
`29`		`- public function __construct(NotifierInterface $notifier, int $level = Logger::ERROR, bool $bubble = true)`
	`29`	`+ /**`
	`30`	`+ * @param string\|int $level The minimum logging level at which this handler will be triggered`
	`31`	`+ */`
	`32`	`+ public function __construct(NotifierInterface $notifier, $level = Logger::ERROR, bool $bubble = true)`
`30`	`33`	`{`
`31`	`34`	`$this->notifier = $notifier;`
`32`	`35`
`33`		`- parent::__construct($level < Logger::ERROR ? Logger::ERROR : $level, $bubble);`
	`36`	`+ parent::__construct(Logger::toMonologLevel($level) < Logger::ERROR ? Logger::ERROR : $level, $bubble);`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`public function handle(array $record): bool`