Allow Translation Contracts

Tests/Twig/TranslationExtensionTest.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Tests\Twig;
+
+use JMS\TranslationBundle\Twig\TranslationExtension;
+use PHPUnit\Framework\TestCase;
+
+final class TranslationExtensionTest extends TestCase
+{
+    public function testInvalidConstruction(): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        new TranslationExtension(new \StdClass());
+    }
+}

Twig/TranslationExtension.php

@@ -23,14 +23,15 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface as ComponentTranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
 class TranslationExtension extends AbstractExtension
 {
     /**
-     * @var TranslatorInterface
+     * @var TranslatorInterface|ComponentTranslatorInterface
      */
     private $translator;
 
@@ -41,11 +42,21 @@ class TranslationExtension extends AbstractExtension
 
     /**
      * TranslationExtension constructor.
-     * @param TranslatorInterface $translator
+     * @param TranslatorInterface|ComponentTranslatorInterface $translator
      * @param bool $debug
      */
-    public function __construct(TranslatorInterface $translator, $debug = false)
+    public function __construct($translator, $debug = false)
     {
+        if (!$translator instanceof ComponentTranslatorInterface && !$translator instanceof TranslatorInterface) {
+            throw new \InvalidArgumentException(sprintf(
+                'Argument 1 must be an instance of %s or %s, instance of %s given'
+                ,
+                TranslatorInterface::class,
+                ComponentTranslatorInterface::class,
+                get_class($translator)
+            ));
+        }
+
         $this->translator = $translator;
         $this->debug = $debug;
     }
@@ -94,10 +105,19 @@ public function transchoiceWithDefault($message, $defaultMessage, $count, array
         }
 
         if (false == $this->translator->getCatalogue($locale)->defines($message, $domain)) {
-            return $this->translator->transChoice($defaultMessage, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
+            return $this->transChoice($defaultMessage, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
+        }
+
+        return $this->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
+    }
+
+    private function transChoice($message, $count, array $arguments, $domain, $locale)
+    {
+        if (method_exists($this->translator, 'transChoice')) {
+            return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
         }
 
-        return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
+        return $this->translator->trans($message, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
     }
 
     /**

composer.json

@@ -25,6 +25,8 @@
         "nikic/php-parser": "^1.4 || ^2.0 || ^3.0 || ^4.0",
         "symfony/console": "^3.4 || ^4.3",
         "symfony/framework-bundle": "^3.4.31 || ^4.3",
+        "symfony/translation": "^3.4 || ^4.3",
+        "symfony/translation-contracts": "^1.1 || ^2.0",
         "symfony/validator": "^3.4 || ^4.3",
         "twig/twig": "^1.42.4 || ^2.12.5"
     },
@@ -42,7 +44,6 @@
         "symfony/form": "^3.4 || ^4.3",
         "symfony/security-csrf": "^3.4 || ^4.3",
         "symfony/templating": "^3.4 || ^4.3",
-        "symfony/translation": "^3.4 || ^4.3",
         "symfony/twig-bundle": "^3.4.37 || ^4.3.11"
     },
     "config": {