Fix MessageFormatter/MessageSelector BC detection.

d2531e5b · SpacePossum · Fabien Potencier · 90c80c3e · d2531e5b
Commit d2531e5b authored Mar 14, 2018 by SpacePossum Committed by Fabien Potencier Mar 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/Silex/Provider/TranslationServiceProvider.php src/Silex/Provider/TranslationServiceProvider.php +3 -4

No files found.
--- a/src/Silex/Provider/TranslationServiceProvider.php
+++ b/src/Silex/Provider/TranslationServiceProvider.php
@@ -13,7 +13,6 @@ namespace Silex\Provider;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\Formatter\MessageFormatter;
 use Symfony\Component\Translation\MessageSelector;
@@ -79,11 +78,11 @@ class TranslationServiceProvider implements ServiceProviderInterface, EventListe
        }
        $app['translator.message_selector'] = function () {
-            if (Kernel::VERSION_ID < 30400) {
+            if (class_exists(MessageFormatter::class)) {  // BC layer
-                return new MessageSelector();
+                return new MessageFormatter();
            }
-            return new MessageFormatter();
+            return new MessageSelector();
        };
        $app['translator.resources'] = function ($app) {