Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6fd6b94

Browse filesBrowse files
Merge branch '4.2'
* 4.2: fix merge
2 parents bed7694 + 11ac27d commit 6fd6b94
Copy full SHA for 6fd6b94

File tree

Expand file treeCollapse file tree

3 files changed

+3
-11
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+3
-11
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the tearDown method
1717

18-
if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
18+
if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
1919
/**
2020
* @internal
2121
*/

‎src/Symfony/Component/Form/Test/TestCaseSetUpTearDownTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Test/TestCaseSetUpTearDownTrait.php
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515

1616
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods
1717

18-
if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
19-
eval('
20-
namespace Symfony\Component\Form\Test;
21-
18+
if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
2219
/**
2320
* @internal
2421
*/
@@ -42,7 +39,6 @@ protected function tearDown(): void
4239
$this->doTearDown();
4340
}
4441
}
45-
');
4642
} else {
4743
/**
4844
* @internal

‎src/Symfony/Component/Validator/Test/TestCaseSetUpTearDownTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Test/TestCaseSetUpTearDownTrait.php
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515

1616
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods
1717

18-
if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
19-
eval('
20-
namespace Symfony\Component\Validator\Test;
21-
18+
if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
2219
/**
2320
* @internal
2421
*/
@@ -42,7 +39,6 @@ protected function tearDown(): void
4239
$this->doTearDown();
4340
}
4441
}
45-
');
4642
} else {
4743
/**
4844
* @internal

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.