refactor: remove legacy code

Author: deguif

Tests/Functional/BaseTestCase.php

@@ -28,18 +28,12 @@ class BaseTestCase extends WebTestCase
 {
     protected static function createKernel(array $options = []): KernelInterface
     {
-        $isSf5 = version_compare(Kernel::VERSION, '5.0.0') >= 0;
-
-        $default = $isSf5 ? 'default_sf5.yml' : 'default.yml';
-
         if (version_compare(Kernel::VERSION, '6.0.0') >= 0) {
             $conf = 'framework_sf6.yml';
-        } elseif (version_compare(Kernel::VERSION, '5.0.0') >= 0) {
-            $conf = 'framework.yml';
         } else {
             $conf = 'framework.yml';
         }
 
-        return new AppKernel($conf, $options['config'] ?? $default);
+        return new AppKernel($conf, $options['config'] ?? 'default.yml');
     }
 }

Tests/Functional/Controller/ApiControllerTest.php

@@ -5,7 +5,6 @@
 namespace JMS\TranslationBundle\Tests\Functional\Controller;
 
 use JMS\TranslationBundle\Tests\Functional\BaseTestCase;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -19,10 +18,8 @@ public function testUpdateAction()
         $client    = static::createClient(['config' => 'test_updating_translations.yml']);
         $outputDir = $client->getContainer()->getParameter('translation_output_dir');
 
-        $isSf4 = version_compare(Kernel::VERSION, '4.0.0') >= 0;
-
         // Add a file
-        $file    = $isSf4 ? $outputDir . '/navigation.en.yaml' : $outputDir . '/navigation.en.yml';
+        $file    = $outputDir . '/navigation.en.yaml';
         $written = file_put_contents($file, 'main.home: Home');
         $this->assertTrue($written !== false && $written > 0);
 
@@ -35,13 +32,7 @@ public function testUpdateAction()
         // Verify that the file has new content
         $array = Yaml::parse($fileContent);
 
-        if ($isSf4) {
-            $this->assertTrue(isset($array['main.home']), print_r($array, true));
-            $this->assertEquals('Away', $array['main.home']);
-        } else {
-            $this->assertTrue(isset($array['main']));
-            $this->assertTrue(isset($array['main']['home']));
-            $this->assertEquals('Away', $array['main']['home']);
-        }
+        $this->assertTrue(isset($array['main.home']), print_r($array, true));
+        $this->assertEquals('Away', $array['main.home']);
     }
 }

Tests/Functional/Fixture/TestBundle/Controller/AppleController.php

@@ -22,13 +22,4 @@ public function viewAction()
     {
         return ['nbApples' => 5];
     }
-
-    /**
-     * @Route("/view_sf5")
-     * @Template("@Test/Apple/view_sf5.html.twig")
-     */
-    public function viewsf5Action()
-    {
-        return ['nbApples' => 5];
-    }
 }

Tests/Functional/Fixture/TestBundle/Resources/views/Apple/view.html.twig

@@ -4,21 +4,15 @@
 
 namespace JMS\TranslationBundle\Tests\Functional;
 
-use Symfony\Component\HttpKernel\Kernel;
-
 class TranslationTest extends BaseTestCase
 {
     public function testTranschoiceWhenTranslationNotYetExtracted()
     {
-        $isSf5 = version_compare(Kernel::VERSION, '5.0.0') >= 0;
-
-        $url    = $isSf5 ? '/apples/view_sf5' : '/apples/view';
         $client = $this->createClient();
-        $client->request('GET', $url);
+        $client->request('GET', '/apples/view');
         $response = $client->getResponse();
 
         $this->assertEquals(200, $response->getStatusCode(), $response->getContent());
-        $expected = $isSf5 ? "There are 5 apples\n" : "There are 5 apples\n\nThere are 5 apples\n";
-        $this->assertEquals($expected, $response->getContent());
+        $this->assertEquals("There are 5 apples\n", $response->getContent());
     }
 }

Tests/Functional/Fixture/TestBundle/Resources/views/Apple/view_sf5.html.twig

@@ -32,7 +32,6 @@
 use Symfony\Bridge\Twig\Extension\FormExtension;
 use Symfony\Bridge\Twig\Extension\RoutingExtension;
 use Symfony\Bridge\Twig\Extension\TranslationExtension as SymfonyTranslationExtension;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
@@ -45,12 +44,6 @@ class TwigFileExtractorTest extends TestCase
 {
     public function testExtractSimpleTemplateInSF5()
     {
-        $isSF5 = version_compare(Kernel::VERSION, '5.0.0') >= 0;
-
-        if (! $isSF5) {
-            $this->markTestSkipped('Test only available with Symfony 5+');
-        }
-
         $expected          = new MessageCatalogue();
         $fileSourceFactory = $this->getFileSourceFactory();
         $fixtureSplInfo    = new \SplFileInfo(__DIR__ . '/Fixture/simple_template_sf5.html.twig');
@@ -104,12 +97,6 @@ public function testExtractSimpleTemplateInSF5()
 
     public function testExtractSimpleTemplate()
     {
-        $isSF5 = version_compare(Kernel::VERSION, '5.0.0') >= 0;
-
-        if ($isSF5) {
-            $this->markTestSkipped('Test only available with Symfony < 5');
-        }
-
         $expected          = new MessageCatalogue();
         $fileSourceFactory = $this->getFileSourceFactory();
         $fixtureSplInfo    = new \SplFileInfo(__DIR__ . '/Fixture/simple_template.html.twig');