Add support for Symfony ^4.0|^5.0 + fix various deprecations + fix travis CI

.travis.yml

@@ -1,9 +1,6 @@
 language: php
 
 php:
-    - 5.4
-    - 5.5
-    - 5.6
     - 7.1
     - 7.2
 
@@ -14,6 +11,7 @@ cache:
         - $HOME/.composer/cache/files
 
 before_install:
+    - COMPOSER_MEMORY_LIMIT=-1
     - composer self-update
     - if [ "$STABILITY" = "dev" ]; then composer config minimum-stability dev; fi;
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION}; fi;
@@ -29,11 +27,11 @@ script:
 matrix:
     fast_finish: true
     include:
-      - php: 5.6
-        env: SYMFONY_VERSION='~2.7.0'
-      - php: 5.6
-        env: SYMFONY_VERSION='~2.8.0'
-      - php: 5.6
-        env: SYMFONY_VERSION='~3.4.0'
+      - php: 7.2
+        env: SYMFONY_VERSION='^3.4.0'
+      - php: 7.2
+        env: SYMFONY_VERSION='^4.0'
+      - php: 7.2
+        env: SYMFONY_VERSION='^5.0'
       - php: 7.2
         env: STABILITY=dev

Command/DumpCommand.php

@@ -34,10 +34,10 @@ class DumpCommand extends Command
      * @param TranslationDumper $dumper
      * @param $kernelRootDir
      */
-    public function __construct(TranslationDumper $dumper, $kernelRootDir)
+    public function __construct(TranslationDumper $dumper, $projectDir)
     {
         $this->dumper = $dumper;
-        $this->kernelRootDir = $kernelRootDir;
+        $this->kernelRootDir = $projectDir . '/app';
 
         parent::__construct();
     }

Controller/Controller.php

@@ -3,14 +3,15 @@
 namespace Bazinga\Bundle\JsTranslationBundle\Controller;
 
 use Bazinga\Bundle\JsTranslationBundle\Finder\TranslationFinder;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Twig_Environment;
+use Twig\Environment;
 
 /**
  * @author William DURAND <william.durand1@gmail.com>
@@ -23,7 +24,7 @@ class Controller
     private $translator;
 
     /**
-     * @var Twig_Environment
+     * @var Environment|Twig_Environment
      */
     private $twig;
 
@@ -62,25 +63,34 @@ class Controller
     private $httpCacheTime;
 
     /**
-     * @param TranslatorInterface $translator        The translator.
-     * @param Twig_Environment    $twig              The twig environment.
-     * @param TranslationFinder   $translationFinder The translation finder.
-     * @param string              $cacheDir
-     * @param boolean             $debug
-     * @param string              $localeFallback
-     * @param string              $defaultDomain
-     * @param int                 $httpCacheTime
+     * @param TranslatorInterface           $translator        The translator.
+     * @param Environment|Twig_Environment  $twig              The twig environment.
+     * @param TranslationFinder             $translationFinder The translation finder.
+     * @param string                        $cacheDir
+     * @param boolean                       $debug
+     * @param string                        $localeFallback
+     * @param string                        $defaultDomain
+     * @param int                           $httpCacheTime
+     * @throws InvalidArgumentException
      */
     public function __construct(
-        TranslatorInterface $translator,
-        Twig_Environment $twig,
+        $translator,
+        $twig,
         TranslationFinder $translationFinder,
         $cacheDir,
         $debug          = false,
         $localeFallback = '',
         $defaultDomain  = '',
         $httpCacheTime  = 86400
     ) {
+        if (!$twig instanceof \Twig_Environment && !$twig instanceof Environment) {
+            throw new \InvalidArgumentException(sprintf('Providing an instance of "%s" as twig is not supported.', get_class($twig)));
+        }
+
+        if (!$translator instanceof TranslatorInterface && !$translator instanceof LegacyTranslatorInterface) {
+            throw new \InvalidArgumentException(sprintf('Providing an instance of "%s" as translator is not supported.', get_class($translator)));
+        }
+
         $this->translator        = $translator;
         $this->twig              = $twig;
         $this->translationFinder = $translationFinder;
@@ -109,7 +119,7 @@ public function getTranslationsAction(Request $request, $domain, $_format)
         $locales = $this->getLocales($request);
 
         if (0 === count($locales)) {
-            throw new NotFoundHttpException();
+            return (new Response())->setStatusCode(Response::HTTP_NOT_FOUND);
         }
 
         $cache = new ConfigCache(sprintf('%s/%s.%s.%s',
@@ -160,7 +170,7 @@ public function getTranslationsAction(Request $request, $domain, $_format)
             try {
                 $cache->write($content, $resources);
             } catch (IOException $e) {
-                throw new NotFoundHttpException();
+                return (new Response())->setStatusCode(Response::HTTP_NOT_FOUND);
             }
         }
 

Dumper/TranslationDumper.php

@@ -5,7 +5,7 @@
 use Bazinga\Bundle\JsTranslationBundle\Finder\TranslationFinder;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
-use Twig_Environment;
+use Twig\Environment;
 
 /**
  * @author Adrien Russo <adrien.russo.qc@gmail.com>
@@ -16,7 +16,7 @@ class TranslationDumper
     const DEFAULT_TRANSLATION_PATTERN = '/translations/{domain}.{_format}';
 
     /**
-     * @var \Twig_Environment
+     * @var Environment|Twig_Environment
      */
     private $twig;
 
@@ -56,21 +56,25 @@ class TranslationDumper
     private $defaultDomain;
 
     /**
-     * @param Twig_Environment  $twig           The twig environment.
-     * @param TranslationFinder $finder         The translation finder.
-     * @param FileSystem        $filesystem     The file system.
-     * @param string            $localeFallback
-     * @param string            $defaultDomain
+     * @param Environment|Twig_Environment  $twig           The twig environment.
+     * @param TranslationFinder             $finder         The translation finder.
+     * @param FileSystem                    $filesystem     The file system.
+     * @param string                        $localeFallback
+     * @param string                        $defaultDomain
      */
     public function __construct(
-        Twig_Environment $twig,
+        $twig,
         TranslationFinder $finder,
         Filesystem $filesystem,
         $localeFallback = '',
         $defaultDomain  = '',
         array $activeLocales = array(),
         array $activeDomains = array()
     ) {
+        if (!$twig instanceof \Twig_Environment && !$twig instanceof Environment) {
+            throw new \InvalidArgumentException(sprintf('Providing an instance of "%s" as twig is not supported.', get_class($twig)));
+        }
+
         $this->twig           = $twig;
         $this->finder         = $finder;
         $this->filesystem     = $filesystem;

Finder/TranslationFinder.php

@@ -2,8 +2,6 @@
 
 namespace Bazinga\Bundle\JsTranslationBundle\Finder;
 
-use Symfony\Component\Finder\Finder;
-
 /**
  * @author William DURAND <william.durand1@gmail.com>
  * @author Markus Poerschke <markus@eluceo.de>

Resources/config/services.xml

@@ -23,7 +23,7 @@
         </service>
         <service id="bazinga.jstranslation.dump_command" class="Bazinga\Bundle\JsTranslationBundle\Command\DumpCommand" public="true">
             <argument type="service" id="bazinga.jstranslation.translation_dumper" />
-            <argument>%kernel.root_dir%</argument>
+            <argument>%kernel.project_dir%</argument>
             <tag name="console.command" command="bazinga:js-translation:dump" />
         </service>
     </services>

Tests/Dumper/TranslationDumperTest.php

@@ -157,7 +157,7 @@ public function setUp()
         $this->filesystem->mkdir($this->target);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if (is_dir($this->target)) {
             $this->filesystem->remove($this->target);

Tests/Fixtures/app/config/base_config.yml

@@ -1,14 +1,15 @@
 framework:
     secret:        test
-    router:        { resource: "%kernel.root_dir%/config/routing.yml" }
+    router:        { resource: "%kernel.project_dir%/app/config/routing.yml" }
     test:          ~
     translator:    { enabled: true }
     validation:    { enabled: false }
 
 # Twig Configuration
 twig:
-    debug:            "%kernel.debug%"
-    strict_variables: "%kernel.debug%"
+    debug:                "%kernel.debug%"
+    strict_variables:     "%kernel.debug%"
+    exception_controller: null
 
 # Traduction dans JS
 bazinga_js_translation:

Tests/Fixtures/app/config/default.yml

@@ -5,4 +5,4 @@ framework:
     translator:
         fallbacks: ['en']
         paths:
-            - "%kernel.root_dir%/Infrastructure/Ui/Translations"
+            - "%kernel.project_dir%/app/Infrastructure/Ui/Translations"

composer.json

@@ -11,20 +11,21 @@
     }
     ],
     "require": {
-        "symfony/framework-bundle": "~2.7|~3.1|~4.0",
-        "symfony/finder": "~2.7|~3.1|~4.0",
-        "symfony/console": "~2.7|~3.1|~4.0",
-        "symfony/intl": "~2.7|~3.1|~4.0",
-        "symfony/translation":  "~2.7|~3.1|~4.0",
-        "symfony/twig-bundle": "~2.7|~3.1|~4.0"
+        "php": "^7.1",
+        "symfony/framework-bundle": "~3.4|~4.0|~5.0",
+        "symfony/finder": "~3.4|~4.0|~5.0",
+        "symfony/console": "~3.4|~4.0|~5.0",
+        "symfony/intl": "~3.4|~4.0|~5.0",
+        "symfony/translation":  "~3.4|~4.0|~5.0",
+        "symfony/twig-bundle": "~3.4|~4.0|~5.0"
     },
     "require-dev": {
-        "symfony/asset": "~2.7|~3.1|~4.0",
-        "symfony/yaml": "~2.7|~3.1|~4.0",
-        "symfony/browser-kit": "~2.7|~3.1|~4.0",
-        "symfony/twig-bundle": "~2.7|~3.1|~4.0",
-        "symfony/phpunit-bridge": "~2.7|~3.1|~4.0",
-        "phpunit/phpunit": "^4.8|~5.7"
+        "symfony/asset": "~3.4|~4.0|~5.0",
+        "symfony/yaml": "~3.4|~4.0|~5.0",
+        "symfony/browser-kit": "~3.4|~4.0|~5.0",
+        "symfony/twig-bundle": "~3.4|~4.0|~5.0",
+        "symfony/phpunit-bridge": "^3.4.24|^4.0|^5.0",
+        "phpunit/phpunit": "^4.8|~5.7|~6.5"
     },
     "replace": {
         "willdurand/expose-translation-bundle": "2.5.*"