diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.2'

Browse Source 
* 4.2:
  fix merge
This commit is contained in:
Nicolas Grekas 2019-03-10 11:16:53 +01:00
commit 6fd6b94628
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Test/KernelShutdownOnTearDownTrait.php
View File

@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase;
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the tearDown method // 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 * @internal
*/ */

6
src/Symfony/Component/Form/Test/TestCaseSetUpTearDownTrait.php
View File

@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase;
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods // 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()) { if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
eval('
namespace Symfony\Component\Form\Test;
/** /**
* @internal * @internal
*/ */
@ -42,7 +39,6 @@ if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \Reflection
$this->doTearDown(); $this->doTearDown();
} }
} }
');
} else { } else {
/** /**
* @internal * @internal

6
src/Symfony/Component/Validator/Test/TestCaseSetUpTearDownTrait.php
View File

@ -15,10 +15,7 @@ use PHPUnit\Framework\TestCase;
// Auto-adapt to PHPUnit 8 that added a `void` return-type to the setUp/tearDown methods // 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()) { if ((new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
eval('
namespace Symfony\Component\Validator\Test;
/** /**
* @internal * @internal
*/ */
@ -42,7 +39,6 @@ if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \Reflection
$this->doTearDown(); $this->doTearDown();
} }
} }
');
} else { } else {
/** /**
* @internal * @internal