Remove obsolete code

fabpot · fabpot · commit 23fbe6f75381 · 2020-09-28T08:19:18.000+02:00
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -128,12 +128,6 @@ private function getMailersNode()
                             return $recurse($v['stream-option']);
                         })
                     ->end()
-                    ->validate()
-                        ->ifTrue(function ($v) {
-                            return !method_exists('Swift_Transport_EsmtpTransport', 'setStreamOptions');
-                        })
-                        ->thenInvalid('stream_options is only available in Swiftmailer 5.4.2 or later.')
-                    ->end()
                 ->end()
                 ->scalarNode('encryption')
                     ->defaultNull()
diff --git a/Tests/DependencyInjection/SwiftmailerExtensionTest.php b/Tests/DependencyInjection/SwiftmailerExtensionTest.php
@@ -320,10 +320,6 @@ public function testSmtpConfig($type)
      */
     public function testStreamOptions($type)
     {
-        if (!method_exists('Swift_Transport_EsmtpTransport', 'setStreamOptions')) {
-            $this->markTestSkipped('This test requires Swiftmailer 5.4.2 or later.');
-        }
-
         $container = $this->loadContainerFromFile('stream_options', $type);
         $this->assertEquals('example.org', $container->getParameter('swiftmailer.mailer.default.transport.smtp.host'));
         $this->assertEquals('12345', $container->getParameter('swiftmailer.mailer.default.transport.smtp.port'));
@@ -424,11 +420,6 @@ public function testDisableDeliveryWithEnvVars()
     private function loadContainerFromFile($file, $type, array $services = [], $skipEnvVars = false)
     {
         $container = new ContainerBuilder();
-
-        if ($skipEnvVars && !method_exists($container, 'resolveEnvPlaceholders')) {
-            $this->markTestSkipped('Runtime environment variables has been introduced in the Dependency Injection version 3.2.');
-        }
-
         $container->setParameter('kernel.debug', false);
         $container->setParameter('kernel.cache_dir', '/tmp');
 
