Merge branch '4.2'
* 4.2: fix merge
This commit is contained in:
commit
6fd6b94628
@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase;
|
||||
|
||||
// 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
|
||||
*/
|
||||
|
@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase;
|
||||
|
||||
// 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 @@ if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \Reflection
|
||||
$this->doTearDown();
|
||||
}
|
||||
}
|
||||
');
|
||||
} else {
|
||||
/**
|
||||
* @internal
|
||||
|
@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase;
|
||||
|
||||
// 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 @@ if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \Reflection
|
||||
$this->doTearDown();
|
||||
}
|
||||
}
|
||||
');
|
||||
} else {
|
||||
/**
|
||||
* @internal
|
||||
|
Reference in New Issue
Block a user