Merge pull request #530 from franmomu/symfony5

Allow Symfony 5 and Twig 3

Author: goetas

.travis.yml

@@ -35,6 +35,12 @@ matrix:
           env: SYMFONY_VERSION=^4.3
         - php: 7.4
           env: SYMFONY_VERSION=^4.3
+        - php: 7.2
+          env: SYMFONY_VERSION=^5.0
+        - php: 7.3
+          env: SYMFONY_VERSION=^5.0
+        - php: 7.4
+          env: SYMFONY_VERSION=^5.0
 
 install:
   - if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;

Changelog.md

@@ -1,4 +1,8 @@
 # Changelog
+### 1.4.3 to UNRELEASED
+* Added support for SF5
+* Dropped support for SF < 3.4
+
 ### 1.4.2 to 1.4.3
 * Added support for SF4
 * Fixed jms.js error

Command/ExtractTranslationCommand.php

@@ -89,9 +89,8 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $builder = $input->getOption('config') ?
                        $this->configFactory->getBuilder($input->getOption('config'))
@@ -148,13 +147,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     }
                 }
 
-                return;
+                return 0;
             }
 
             $this->updater->process($config);
         }
 
         $output->writeln('done!');
+
+        return 0;
     }
 
     /**

Command/ResourcesListCommand.php

@@ -69,9 +69,8 @@ protected function configure()
     /**
      * @param \Symfony\Component\Console\Input\InputInterface $input
      * @param \Symfony\Component\Console\Output\OutputInterface $output
-     * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $directoriesToSearch = [];
 
@@ -95,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $output->writeln('done!');
 
-            return;
+            return 0;
         }
 
         $output->writeln('<info>Resources list :</info>');
@@ -108,6 +107,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->writeln('done!');
+
+        return 0;
     }
 
     /**

Tests/Functional/BaseTestCase.php

@@ -21,13 +21,18 @@
 namespace JMS\TranslationBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpKernel\Kernel;
 
 class BaseTestCase extends WebTestCase
 {
     protected static function createKernel(array $options = [])
     {
+        $isSf5 = version_compare(Kernel::VERSION, '5.0.0') >= 0;
+
+        $default = $isSf5 ? 'default_sf5.yml' : 'default.yml';
+
         return new AppKernel(
-            $options['config'] ?? 'default.yml'
+            $options['config'] ?? $default
         );
     }
 }

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

@@ -21,4 +21,13 @@ 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,4 +4,4 @@
 
 {# This translation does exist in our messages.en.yml file #}
 {{ "text.apples_remaining"|transchoice(nbApples)
-    |desc("Some default message which should never be applied because it instead is coming from the messages file.") }}
+    |desc("Some default message which should never be applied because it instead is coming from the messages file.") }}

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

@@ -0,0 +1,2 @@
+{{ "text.apples_remaining"|trans({'%count%': nbApples})
+    |desc("Some default message which should never be applied because it instead is coming from the messages file.") }}

Tests/Functional/TranslationTest.php

@@ -4,15 +4,21 @@
 
 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', '/apples/view');
+        $client->request('GET', $url);
         $response = $client->getResponse();
 
         $this->assertEquals(200, $response->getStatusCode(), $response->getContent());
-        $this->assertEquals("There are 5 apples\n\nThere are 5 apples", $response->getContent());
+        $expected = $isSf5 ? "There are 5 apples\n" : "There are 5 apples\n\nThere are 5 apples\n";
+        $this->assertEquals($expected, $response->getContent());
     }
 }

Tests/Functional/config/default.yml

@@ -3,8 +3,12 @@ imports:
     - { resource: twig.yml }
     - { resource: bundle.yml }
 
+framework:
+    templating:
+        engines: [twig, php]
+
 parameters:
-    translation_output_dir: "%kernel.root_dir%/Fixture/TestBundle/Resources/translations"
+    translation_output_dir: "%kernel.project_dir%/Fixture/TestBundle/Resources/translations"
 
 services:
     logger: