Merge pull request #2876 from acrobat/symfony5-compatibility-fixes

[AllBundles] Forward compatibility fixes for symfony 5

src/Kunstmaan/AdminBundle/Tests/EventListener/AdminLocaleListenerTest.php

@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\Translator;
 
 class AdminLocaleListenerTest extends TestCase
 {
@@ -22,7 +22,7 @@ public function testListener($uri, $shouldPerformCheck, $tokenStorageCallCount)
     {
         $request = new Request([], [], [], [], [], ['REQUEST_URI' => $uri]);
         $storage = $this->createMock(TokenStorageInterface::class);
-        $trans = $this->createMock(TranslatorInterface::class);
+        $trans = $this->createMock(Translator::class);
         $adminRouteHelper = $this->createMock(AdminRouteHelper::class);
         $event = $this->createMock(GetResponseEvent::class);
         $token = $this->createMock(UsernamePasswordToken::class);

src/Kunstmaan/FormBundle/AdminList/FormSubmissionExportListConfigurator.php

@@ -8,7 +8,8 @@
 use Kunstmaan\AdminListBundle\AdminList\Field;
 use Kunstmaan\FormBundle\Entity\FormSubmission;
 use Kunstmaan\NodeBundle\Entity\NodeTranslation;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface as LegaceTranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Export list configuration to list all the form submissions for a given NodeTranslation
@@ -46,10 +47,15 @@ class FormSubmissionExportListConfigurator implements ExportListConfiguratorInte
     protected $batchSize;
 
     /**
-     * @param int $batchSize
+     * @param LegaceTranslatorInterface|TranslatorInterface $translator
+     * @param int                                           $batchSize
      */
-    public function __construct(EntityManagerInterface $em, NodeTranslation $nodeTranslation, TranslatorInterface $translator, $batchSize = 20)
+    public function __construct(EntityManagerInterface $em, NodeTranslation $nodeTranslation, /*TranslatorInterface*/ $translator, $batchSize = 20)
     {
+        if (!$translator instanceof LegaceTranslatorInterface && !$translator instanceof TranslatorInterface) {
+            throw new \InvalidArgumentException(sprintf('Argument "$translator" passed to "%s" must be of the type "%s" or "%s", "%s" given', __METHOD__, LegaceTranslatorInterface::class, TranslatorInterface::class, get_class($translator)));
+        }
+
         $this->nodeTranslation = $nodeTranslation;
         $this->em = $em;
         $this->translator = $translator;

src/Kunstmaan/MultiDomainBundle/EventListener/HostOverrideListener.php

@@ -10,7 +10,8 @@
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface as LegaceTranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HostOverrideListener
 {
@@ -36,10 +37,14 @@ class HostOverrideListener
 
     public function __construct(
         Session $session,
-        TranslatorInterface $translator,
+        /*TranslatorInterface*/ $translator,
         DomainConfigurationInterface $domainConfiguration,
         AdminRouteHelper $adminRouteHelper
     ) {
+        if (!$translator instanceof LegaceTranslatorInterface && !$translator instanceof TranslatorInterface) {
+            throw new \InvalidArgumentException(sprintf('Argument "$translator" passed to "%s" must be of the type "%s" or "%s", "%s" given', __METHOD__, LegaceTranslatorInterface::class, TranslatorInterface::class, get_class($translator)));
+        }
+
         $this->session = $session;
         $this->translator = $translator;
         $this->domainConfiguration = $domainConfiguration;

src/Kunstmaan/MultiDomainBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -20,7 +20,7 @@ protected function getConfiguration()
 
     public function testInvalidConfiguration()
     {
-        $this->assertConfigurationIsInvalid([[]], 'The child node "hosts" at path "kunstmaan_multi_domain" must be configured.');
+        $this->assertConfigurationIsInvalid([[]], '/The child (node|config) "hosts" (at path|under) "kunstmaan_multi_domain" must be configured./', true);
     }
 
     public function testProcessedValueContainsRequiredValue()

src/Kunstmaan/MultiDomainBundle/Tests/EventListener/HostOverrideListenerTest.php

@@ -6,6 +6,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Translation\Translator;
 
 class HostOverrideListenerTest extends TestCase
 {
@@ -130,7 +131,7 @@ private function getHostOverrideListener($flashBag)
         $domainConfiguration = $this->createMock('Kunstmaan\AdminBundle\Helper\DomainConfigurationInterface');
         $domainConfiguration->method('getHost')
             ->willReturn('override-domain.tld');
-        $translator = $this->createMock('Symfony\Component\Translation\TranslatorInterface');
+        $translator = $this->createMock(Translator::class);
         $translator->method('trans')
             ->willReturnArgument(0);
 

src/Kunstmaan/TranslatorBundle/Tests/app/config/config.yml

@@ -5,7 +5,7 @@ imports:
 framework:
     secret: "%secret%"
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/config/routing.yml"
         strict_requirements: "%kernel.debug%"
     form:            ~
     csrf_protection: ~