Skip to content

Commit 1aea58d

Browse files
Merge branch '3.4' into 4.2
* 3.4: [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion revert private properties handling [HttpFoundation] Fix URLs [VarDumper] finish PHP 7.4 support and add tests [VarDumper] Use \ReflectionReference for determining if a key is a reference (php >= 7.4) Ignore missing translation dependency in FrameworkBundle [Debug][ExceptionHandler] Add tests for custom handlers
2 parents e3da9e8 + a8fb840 commit 1aea58d

19 files changed

+21
-21
lines changed

Resources/config/validator.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<argument type="service" id="validator.validator_factory" />
2424
</call>
2525
<call method="setTranslator">
26-
<argument type="service" id="translator" />
26+
<argument type="service" id="translator" on-invalid="ignore" />
2727
</call>
2828
<call method="setTranslationDomain">
2929
<argument>%validator.translation_domain%</argument>

Tests/ClientTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Tests;
1313

1414
use Symfony\Bundle\FrameworkBundle\Client;
15-
use Symfony\Bundle\FrameworkBundle\Tests\Functional\WebTestCase;
15+
use Symfony\Bundle\FrameworkBundle\Tests\Functional\AbstractWebTestCase;
1616
use Symfony\Component\HttpFoundation\Response;
1717

18-
class ClientTest extends WebTestCase
18+
class ClientTest extends AbstractWebTestCase
1919
{
2020
public function testRebootKernelBetweenRequests()
2121
{

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,9 +828,9 @@ public function testValidation()
828828
$this->assertEquals([new Reference('validator.validator_factory')], $calls[0][1]);
829829
$this->assertSame('setTranslator', $calls[1][0]);
830830
if (interface_exists(TranslatorInterface::class) && class_exists(LegacyTranslatorProxy::class)) {
831-
$this->assertEquals([new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])], $calls[1][1]);
831+
$this->assertEquals([new Definition(LegacyTranslatorProxy::class, [new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])], $calls[1][1]);
832832
} else {
833-
$this->assertEquals([new Reference('translator')], $calls[1][1]);
833+
$this->assertEquals([new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)], $calls[1][1]);
834834
}
835835
$this->assertSame('setTranslationDomain', $calls[2][0]);
836836
$this->assertSame(['%validator.translation_domain%'], $calls[2][1]);

Tests/Functional/WebTestCase.php renamed to Tests/Functional/AbstractWebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
1515
use Symfony\Component\Filesystem\Filesystem;
1616

17-
class WebTestCase extends BaseWebTestCase
17+
abstract class AbstractWebTestCase extends BaseWebTestCase
1818
{
1919
public static function assertRedirect($response, $location)
2020
{

Tests/Functional/AnnotatedControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class AnnotatedControllerTest extends WebTestCase
14+
class AnnotatedControllerTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getRoutes

Tests/Functional/AutowiringTypesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
2020
use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
2121

22-
class AutowiringTypesTest extends WebTestCase
22+
class AutowiringTypesTest extends AbstractWebTestCase
2323
{
2424
public function testAnnotationReaderAutowiring()
2525
{

Tests/Functional/CachePoolClearCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* @group functional
2020
*/
21-
class CachePoolClearCommandTest extends WebTestCase
21+
class CachePoolClearCommandTest extends AbstractWebTestCase
2222
{
2323
protected function setUp()
2424
{

Tests/Functional/CachePoolsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Cache\Adapter\TagAwareAdapter;
1717
use Symfony\Component\Cache\Exception\InvalidArgumentException;
1818

19-
class CachePoolsTest extends WebTestCase
19+
class CachePoolsTest extends AbstractWebTestCase
2020
{
2121
public function testCachePools()
2222
{

Tests/Functional/ConfigDebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @group functional
2121
*/
22-
class ConfigDebugCommandTest extends WebTestCase
22+
class ConfigDebugCommandTest extends AbstractWebTestCase
2323
{
2424
private $application;
2525

Tests/Functional/ConfigDumpReferenceCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @group functional
2121
*/
22-
class ConfigDumpReferenceCommandTest extends WebTestCase
22+
class ConfigDumpReferenceCommandTest extends AbstractWebTestCase
2323
{
2424
private $application;
2525

Tests/Functional/ContainerDebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* @group functional
2020
*/
21-
class ContainerDebugCommandTest extends WebTestCase
21+
class ContainerDebugCommandTest extends AbstractWebTestCase
2222
{
2323
public function testDumpContainerIfNotExists()
2424
{

Tests/Functional/ContainerDumpTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* Checks that the container compiles correctly when all the bundle features are enabled.
1616
*/
17-
class ContainerDumpTest extends WebTestCase
17+
class ContainerDumpTest extends AbstractWebTestCase
1818
{
1919
public function testContainerCompilationInDebug()
2020
{

Tests/Functional/DebugAutowiringCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* @group functional
1919
*/
20-
class DebugAutowiringCommandTest extends WebTestCase
20+
class DebugAutowiringCommandTest extends AbstractWebTestCase
2121
{
2222
public function testBasicFunctionality()
2323
{

Tests/Functional/FragmentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class FragmentTest extends WebTestCase
14+
class FragmentTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

Tests/Functional/ProfilerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class ProfilerTest extends WebTestCase
14+
class ProfilerTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* @dataProvider getConfigs

Tests/Functional/PropertyInfoTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\PropertyInfo\Type;
1515

16-
class PropertyInfoTest extends WebTestCase
16+
class PropertyInfoTest extends AbstractWebTestCase
1717
{
1818
public function testPhpDocPriority()
1919
{

Tests/Functional/SerializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* @author Kévin Dunglas <[email protected]>
1616
*/
17-
class SerializerTest extends WebTestCase
17+
class SerializerTest extends AbstractWebTestCase
1818
{
1919
public function testDeserializeArrayOfObject()
2020
{

Tests/Functional/SessionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class SessionTest extends WebTestCase
14+
class SessionTest extends AbstractWebTestCase
1515
{
1616
/**
1717
* Tests session attributes persist.

Tests/Functional/SubRequestsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
class SubRequestsTest extends WebTestCase
14+
class SubRequestsTest extends AbstractWebTestCase
1515
{
1616
public function testStateAfterSubRequest()
1717
{

0 commit comments

Comments
 (0)