Improve validation

symfony · Sep 2, 2019 · 69e9e4b · 69e9e4b
1 parent 79f1269
commit 69e9e4b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/DependencyInjection/MonologExtension.php b/DependencyInjection/MonologExtension.php
@@ -951,16 +951,21 @@ private function getHandlerClassByType($handlerType)
 
         if (Logger::API === 2) {
             $typeToClassMapping = array_merge($typeToClassMapping, $v2HandlerTypesAdded);
-
             foreach($v2HandlerTypesRemoved as $handlerType) {
                 unset($typeToClassMapping[$handlerType]);
             }
         }
 
         if (!isset($typeToClassMapping[$handlerType])) {
-            if (array_key_exists($handlerType, $v2HandlerTypesAdded)) {
+            if (Logger::API === 1 && array_key_exists($handlerType, $v2HandlerTypesAdded)) {
+                throw new InvalidArgumentException(
+                    sprintf('"%s" was added in MonoLog v2, please upgrade if you wish to use.', $handlerType)
+                );
+            }
+
+            if (Logger::API === 2 && array_key_exists($handlerType, $v2HandlerTypesRemoved)) {
                 throw new InvalidArgumentException(
-                    sprintf('"%s" was added in MonoLog 2, please upgrade if you wish to use.', $handlerType)
+                    sprintf('"%s" was removed in MonoLog v2.', $handlerType)
                 );
             }