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 7aaa92a

Browse filesBrowse files
committed
minor #51881 [Form] Make FormPerformanceTestCase compatible with PHPUnit 10 (derrabus)
This PR was merged into the 5.4 branch. Discussion ---------- [Form] Make `FormPerformanceTestCase` compatible with PHPUnit 10 | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Part of #49069 | License | MIT In PHPUnit 10, `TestCase::runTest()` has a return type of `mixed`. I'm adding the return type conditionally on the one class where we override this method. Commits ------- af18ce4 Make FormPerformanceTestCase compatible with PHPUnit 10
2 parents adcd3d0 + af18ce4 commit 7aaa92a
Copy full SHA for 7aaa92a

File tree

2 files changed

+43
-3
lines changed
Filter options

2 files changed

+43
-3
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Test/FormPerformanceTestCase.php
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Test;
1313

14+
use Symfony\Component\Form\Test\Traits\RunTestTrait;
1415
use Symfony\Component\Form\Tests\VersionAwareTest;
1516

1617
/**
@@ -23,6 +24,7 @@
2324
*/
2425
abstract class FormPerformanceTestCase extends FormIntegrationTestCase
2526
{
27+
use RunTestTrait;
2628
use VersionAwareTest;
2729

2830
/**
@@ -31,17 +33,19 @@ abstract class FormPerformanceTestCase extends FormIntegrationTestCase
3133
protected $maxRunningTime = 0;
3234

3335
/**
34-
* {@inheritdoc}
36+
* @return mixed
3537
*/
36-
protected function runTest()
38+
private function doRunTest()
3739
{
3840
$s = microtime(true);
39-
parent::runTest();
41+
$result = parent::runTest();
4042
$time = microtime(true) - $s;
4143

4244
if (0 != $this->maxRunningTime && $time > $this->maxRunningTime) {
4345
$this->fail(sprintf('expected running time: <= %s but was: %s', $this->maxRunningTime, $time));
4446
}
47+
48+
return $result;
4549
}
4650

4751
/**
+36Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Form\Test\Traits;
13+
14+
use PHPUnit\Framework\TestCase;
15+
16+
if ((new \ReflectionMethod(TestCase::class, 'runTest'))->hasReturnType()) {
17+
// PHPUnit 10
18+
/** @internal */
19+
trait RunTestTrait
20+
{
21+
protected function runTest(): mixed
22+
{
23+
return $this->doRunTest();
24+
}
25+
}
26+
} else {
27+
// PHPUnit 9
28+
/** @internal */
29+
trait RunTestTrait
30+
{
31+
protected function runTest()
32+
{
33+
return $this->doRunTest();
34+
}
35+
}
36+
}

0 commit comments

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