Skip to content

Commit 69e9e4b

Browse files
committed
Improve validation
1 parent 79f1269 commit 69e9e4b

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

DependencyInjection/MonologExtension.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -951,16 +951,21 @@ private function getHandlerClassByType($handlerType)
951951

952952
if (Logger::API === 2) {
953953
$typeToClassMapping = array_merge($typeToClassMapping, $v2HandlerTypesAdded);
954-
955954
foreach($v2HandlerTypesRemoved as $handlerType) {
956955
unset($typeToClassMapping[$handlerType]);
957956
}
958957
}
959958

960959
if (!isset($typeToClassMapping[$handlerType])) {
961-
if (array_key_exists($handlerType, $v2HandlerTypesAdded)) {
960+
if (Logger::API === 1 && array_key_exists($handlerType, $v2HandlerTypesAdded)) {
961+
throw new InvalidArgumentException(
962+
sprintf('"%s" was added in MonoLog v2, please upgrade if you wish to use.', $handlerType)
963+
);
964+
}
965+
966+
if (Logger::API === 2 && array_key_exists($handlerType, $v2HandlerTypesRemoved)) {
962967
throw new InvalidArgumentException(
963-
sprintf('"%s" was added in MonoLog 2, please upgrade if you wish to use.', $handlerType)
968+
sprintf('"%s" was removed in MonoLog v2.', $handlerType)
964969
);
965970
}
966971

0 commit comments

Comments
 (0)