fix merge

nicolas-grekas · Jules Pietri · commit 1dc3e3406202 · 2019-03-10T19:12:34.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
@@ -15,7 +15,7 @@
 
 // Auto-adapt to PHPUnit 8 that added a `void` return-type to the tearDown method
 
-if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
     /**
      * @internal
      */
diff --git a/src/Symfony/Component/Form/Test/TestCaseSetUpTearDownTrait.php b/src/Symfony/Component/Form/Test/TestCaseSetUpTearDownTrait.php
@@ -15,10 +15,7 @@
 
 // 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\Component\Form\Test;
-
+if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
     /**
      * @internal
      */
@@ -42,7 +39,6 @@ protected function tearDown(): void
             $this->doTearDown();
         }
     }
-');
 } else {
     /**
      * @internal
diff --git a/src/Symfony/Component/Validator/Test/TestCaseSetUpTearDownTrait.php b/src/Symfony/Component/Validator/Test/TestCaseSetUpTearDownTrait.php
@@ -15,10 +15,7 @@
 
 // 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\Component\Validator\Test;
-
+if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
     /**
      * @internal
      */
@@ -42,7 +39,6 @@ protected function tearDown(): void
             $this->doTearDown();
         }
     }
-');
 } else {
     /**
      * @internal
