Fix tests and update swift_handler to be removed on Monolog 3

Author: Seldaek

DependencyInjection/MonologExtension.php

@@ -1002,22 +1002,36 @@ private function getHandlerClassByType($handlerType)
             'slackbot',
         ];
 
-        if (Logger::API === 2) {
+        $v3HandlerTypesRemoved = [
+            'swift_mailer',
+        ];
+
+        if (Logger::API >= 2) {
             $typeToClassMapping = array_merge($typeToClassMapping, $v2HandlerTypesAdded);
             foreach($v2HandlerTypesRemoved as $v2HandlerTypeRemoved) {
                 unset($typeToClassMapping[$v2HandlerTypeRemoved]);
             }
         }
 
+        if (Logger::API >= 3) {
+            foreach($v3HandlerTypesRemoved as $v3HandlerTypeRemoved) {
+                unset($typeToClassMapping[$v3HandlerTypeRemoved]);
+            }
+        }
+
         if (!isset($typeToClassMapping[$handlerType])) {
             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 it.', $handlerType));
             }
 
-            if (Logger::API === 2 && array_key_exists($handlerType, $v2HandlerTypesRemoved)) {
+            if (Logger::API >= 2 && array_key_exists($handlerType, $v2HandlerTypesRemoved)) {
                 throw new \InvalidArgumentException(sprintf('"%s" was removed in Monolog v2.', $handlerType));
             }
 
+            if (Logger::API >= 3 && array_key_exists($handlerType, $v3HandlerTypesRemoved)) {
+                throw new \InvalidArgumentException(sprintf('"%s" was removed in Monolog v3.', $handlerType));
+            }
+
             throw new \InvalidArgumentException(sprintf('There is no handler class defined for handler "%s".', $handlerType));
         }
 

Tests/DependencyInjection/ConfigurationTest.php

@@ -191,6 +191,10 @@ public function testMergingInvalidChannels()
 
     public function testWithSwiftMailerHandler()
     {
+        if (\Monolog\Logger::API >= 3) {
+            $this->markTestSkipped('This test requires Monolog v1 or v2');
+        }
+
         $configs = [
             [
                 'handlers' => [

Tests/DependencyInjection/FixtureMonologExtensionTest.php

@@ -183,6 +183,10 @@ public function testHandlersWithChannels()
 
     public function testSingleEmailRecipient()
     {
+        if (\Monolog\Logger::API >= 3) {
+            $this->markTestSkipped('This test requires Monolog v1 or v2');
+        }
+
         $container = $this->getContainer('single_email_recipient');
 
         $this->assertEquals([
@@ -211,6 +215,10 @@ public function testServerLog()
 
     public function testMultipleEmailRecipients()
     {
+        if (\Monolog\Logger::API >= 3) {
+            $this->markTestSkipped('This test requires Monolog v1 or v2');
+        }
+
         $container = $this->getContainer('multiple_email_recipients');
 
         $this->assertEquals([
@@ -248,7 +256,7 @@ public function testPsr3MessageProcessingEnabled()
     public function testPsr3MessageProcessingDisabledOnNullHandler()
     {
         if (\Monolog\Logger::API < 2) {
-            $this->markTestSkipped('This test requires Monolog v2');
+            $this->markTestSkipped('This test requires Monolog v2 or above');
         }
         $container = $this->getContainer('process_psr_3_messages_null');
 
@@ -262,7 +270,7 @@ public function testPsr3MessageProcessingDisabledOnNullHandler()
     public function testHandlersV2()
     {
         if (\Monolog\Logger::API < 2) {
-            $this->markTestSkipped('This test requires Monolog v2');
+            $this->markTestSkipped('This test requires Monolog v2 or above');
         }
         $this->getContainer('handlers');
 

Tests/DependencyInjection/MonologExtensionTest.php

@@ -294,8 +294,8 @@ public function testSocketHandler()
 
     public function testRavenHandlerWhenConfigurationIsWrong()
     {
-        if (Logger::API === 2) {
-            $this->markTestSkipped('Not valid for V2');
+        if (Logger::API !== 1) {
+            $this->markTestSkipped('Only valid on Monolog V1');
 
             return;
         }
@@ -310,8 +310,8 @@ public function testRavenHandlerWhenConfigurationIsWrong()
 
     public function testRavenHandlerWhenADSNIsSpecified()
     {
-        if (Logger::API === 2) {
-            $this->markTestSkipped('Not valid for V2');
+        if (Logger::API !== 1) {
+            $this->markTestSkipped('Only valid on Monolog V1');
 
             return;
         }
@@ -336,8 +336,8 @@ public function testRavenHandlerWhenADSNIsSpecified()
 
     public function testRavenHandlerWhenADSNAndAClientAreSpecified()
     {
-        if (Logger::API === 2) {
-            $this->markTestSkipped('Not valid for V2');
+        if (Logger::API !== 1) {
+            $this->markTestSkipped('Only valid on Monolog V1');
 
             return;
         }
@@ -356,8 +356,8 @@ public function testRavenHandlerWhenADSNAndAClientAreSpecified()
 
     public function testRavenHandlerWhenAClientIsSpecified()
     {
-        if (Logger::API === 2) {
-            $this->markTestSkipped('Not valid for V2');
+        if (Logger::API !== 1) {
+            $this->markTestSkipped('Only valid on Monolog V1');
 
             return;
         }
@@ -689,8 +689,8 @@ public function v2RemovedDataProvider()
      */
     public function testV2AddedOnV1($handlerType)
     {
-        if (Logger::API === 2) {
-            $this->markTestSkipped('Not valid for V2');
+        if (Logger::API !== 1) {
+            $this->markTestSkipped('Only valid on Monolog V1');
 
             return;
         }