Merge branch '4.3' into 4.4

* 4.3:
  fix tests
  fix merge

Author: nicolas-grekas

Test/ForwardCompatTestTrait.php

@@ -16,9 +16,6 @@
 // Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods
 
 if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
-    eval('
-    namespace Symfony\Bundle\FrameworkBundle\Test;
-
     /**
      * @internal
      */
@@ -42,7 +39,6 @@ protected function tearDown(): void
             $this->doTearDown();
         }
     }
-');
 } else {
     /**
      * @internal