Tidy up

symfony · Sep 2, 2019 · 79f1269 · 79f1269
1 parent 30963a8
commit 79f1269
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/DependencyInjection/MonologExtension.php b/DependencyInjection/MonologExtension.php
@@ -481,6 +481,7 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $handler['bubble'],
             ]);
             break;
+
         case 'syslog':
             $definition->setArguments([
                 $handler['ident'],
@@ -939,27 +940,27 @@ private function getHandlerClassByType($handlerType)
             'insightops' => 'Monolog\Handler\InsightOpsHandler',
         ];
 
-        $typeToClassMappingV2Added = [
+        $v2HandlerTypesAdded = [
             'fallbackgroup' => 'Monolog\Handler\FallbackGroupHandler',
         ];
 
-        $typeToClassMappingV2Removed = [
+        $v2HandlerTypesRemoved = [
             'hipchat',
             'raven',
         ];
 
         if (Logger::API === 2) {
-            $typeToClassMapping = array_merge($typeToClassMapping, $typeToClassMappingV2Added);
+            $typeToClassMapping = array_merge($typeToClassMapping, $v2HandlerTypesAdded);
 
-            foreach($typeToClassMappingV2Removed as $key) {
-                unset($typeToClassMapping[$key]);
+            foreach($v2HandlerTypesRemoved as $handlerType) {
+                unset($typeToClassMapping[$handlerType]);
             }
         }
 
         if (!isset($typeToClassMapping[$handlerType])) {
-            if (array_key_exists($handlerType, $typeToClassMappingV2Added)) {
+            if (array_key_exists($handlerType, $v2HandlerTypesAdded)) {
                 throw new InvalidArgumentException(
-                    sprintf('"%s" was added in MonoLog 2.', $handlerType)
+                    sprintf('"%s" was added in MonoLog 2, please upgrade if you wish to use.', $handlerType)
                 );
             }