Convert level/levelName to enums #1656
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stof
reviewed
Apr 19, 2022
| @@ -30,11 +28,11 @@ | |||
| 'cast_spaces' => ['space' => 'single'], | |||
| 'header_comment' => ['header' => $header], | |||
| 'include' => true, | |||
| 'class_attributes_separation' => ['elements' => ['method']], | |||
| 'class_attributes_separation' => array('elements' => array('method' => 'one', 'trait_import' => 'none')), | |||
There was a problem hiding this comment.
why not keeping short arrays ?
| Logger::ALERT => 'error', | ||
| Logger::EMERGENCY => 'error', | ||
| ]; | ||
| protected function toWildfireLevel(Level $level): string |
There was a problem hiding this comment.
why is it protected while it was private before ?
| @@ -203,16 +203,12 @@ public function getSlackData(LogRecord $record): array | |||
| */ | |||
| public function getAttachmentColor(int $level): string | |||
There was a problem hiding this comment.
shouldn't this get a Level as argument ?
src/Monolog/Level.php
Outdated
| public function toPsrLogLevel(): string | ||
| { | ||
| return match ($this) { | ||
| self::Debug => 'debug', |
There was a problem hiding this comment.
why not using the LogLevel constants there ?
src/Monolog/LogRecord.php
Outdated
| // avoid returning readonly props by ref as this is illegal | ||
| $copy = $this->{$offset}; | ||
|
|
||
| return $copy->value; |
There was a problem hiding this comment.
should you return the value of an enum by ref ?
src/Monolog/Logger.php
Outdated
| { | ||
| $recordInitialized = count($this->processors) === 0; | ||
|
|
||
| $record = new LogRecord( | ||
| message: $message, | ||
| context: $context, | ||
| level: $level, | ||
| level: $level instanceof Level ? $level : self::toMonologLevel($level), |
There was a problem hiding this comment.
toMonologLevel already handles the case of instanceof Level
src/Monolog/Logger.php
Outdated
| @@ -494,7 +474,7 @@ public function getExceptionHandler(): ?callable | |||
| */ | |||
| public function log($level, string|\Stringable $message, array $context = []): void | |||
| { | |||
| if (!is_int($level) && !is_string($level)) { | |||
| if (!is_string($level) && !is_int($level) && !$level instanceof Level) { | |||
| throw new \InvalidArgumentException('$level is expected to be a string or int'); | |||
|
Thanks @stof for the review 👍🏻 Will merge now then. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs #1648
See Monolog\Level & Monolog\LevelName