Skip to content

Commit ce25016

Browse files
Merge branch '4.3' into 4.4
* 4.3: Re-enable previously failing PHP 7.4 test cases [PhpUnitBridge] fix uninitialized variable Revert "bug #33618 fix tests depending on other components' tests (xabbuh)" install from source to include components tests
2 parents 2f3d915 + 5a95cd2 commit ce25016

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Tests/CacheWarmer/ValidatorCacheWarmerTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020

2121
class ValidatorCacheWarmerTest extends TestCase
2222
{
23-
/**
24-
* @group issue-32995
25-
*
26-
* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
27-
*/
2823
public function testWarmUp()
2924
{
3025
$validatorBuilder = new ValidatorBuilder();

Tests/Controller/ControllerResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
2121
use Symfony\Component\DependencyInjection\ContainerInterface;
2222
use Symfony\Component\HttpFoundation\Request;
23-
use Symfony\Component\HttpKernel\Test\Controller\ContainerControllerResolverTestCase;
23+
use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
2424

25-
class ControllerResolverTest extends ContainerControllerResolverTestCase
25+
class ControllerResolverTest extends ContainerControllerResolverTest
2626
{
2727
public function testGetControllerOnContainerAware()
2828
{

0 commit comments

Comments
 (0)