Merge branch '4.2'

* 4.2:
  fix merge

Author: nicolas-grekas

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
      */