Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit ad13a5889640 · 2019-07-23T13:21:36.000+02:00
* 4.2:
  [FrameworkBundle] [SecurityBundle] Rename internal WebTestCase to avoid confusion
  ignore not existing translator service
  [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 &gt;= 7.4)
  Ignore missing translation dependency in FrameworkBundle
  Remove dead tests fixtures
  Remove more dead tests fixtures
  Remove dead tests fixtures
  [Debug][ExceptionHandler] Add tests for custom handlers
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1227,7 +1227,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         if (interface_exists(TranslatorInterface::class) && class_exists(LegacyTranslatorProxy::class)) {
             $calls = $validatorBuilder->getMethodCalls();
-            $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])]];
+            $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])]];
             $validatorBuilder->setMethodCalls($calls);
         }
 
diff --git a/Resources/config/validator.xml b/Resources/config/validator.xml
@@ -23,7 +23,7 @@
                 <argument type="service" id="validator.validator_factory" />
             </call>
             <call method="setTranslator">
-                <argument type="service" id="translator" />
+                <argument type="service" id="translator" on-invalid="ignore" />
             </call>
             <call method="setTranslationDomain">
                 <argument>%validator.translation_domain%</argument>
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -906,9 +906,9 @@ public function testValidation()
         $this->assertEquals([new Reference('validator.validator_factory')], $calls[0][1]);
         $this->assertSame('setTranslator', $calls[1][0]);
         if (interface_exists(TranslatorInterface::class) && class_exists(LegacyTranslatorProxy::class)) {
-            $this->assertEquals([new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])], $calls[1][1]);
+            $this->assertEquals([new Definition(LegacyTranslatorProxy::class, [new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])], $calls[1][1]);
         } else {
-            $this->assertEquals([new Reference('translator')], $calls[1][1]);
+            $this->assertEquals([new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)], $calls[1][1]);
         }
         $this->assertSame('setTranslationDomain', $calls[2][0]);
         $this->assertSame(['%validator.translation_domain%'], $calls[2][1]);
diff --git a/Tests/Fixtures/TestBundle/Fabpot/FooBundle/Controller/DefaultController.php b/Tests/Fixtures/TestBundle/Fabpot/FooBundle/Controller/DefaultController.php
diff --git a/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php b/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php
diff --git a/Tests/Functional/AbstractWebTestCase.php b/Tests/Functional/AbstractWebTestCase.php
@@ -14,7 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
-class WebTestCase extends BaseWebTestCase
+abstract class AbstractWebTestCase extends BaseWebTestCase
 {
     public static function assertRedirect($response, $location)
     {
diff --git a/Tests/Functional/AnnotatedControllerTest.php b/Tests/Functional/AnnotatedControllerTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-class AnnotatedControllerTest extends WebTestCase
+class AnnotatedControllerTest extends AbstractWebTestCase
 {
     /**
      * @dataProvider getRoutes
diff --git a/Tests/Functional/AutowiringTypesTest.php b/Tests/Functional/AutowiringTypesTest.php
@@ -19,7 +19,7 @@
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
 use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
 
-class AutowiringTypesTest extends WebTestCase
+class AutowiringTypesTest extends AbstractWebTestCase
 {
     public function testAnnotationReaderAutowiring()
     {
diff --git a/Tests/Functional/CachePoolClearCommandTest.php b/Tests/Functional/CachePoolClearCommandTest.php
@@ -18,7 +18,7 @@
 /**
  * @group functional
  */
-class CachePoolClearCommandTest extends WebTestCase
+class CachePoolClearCommandTest extends AbstractWebTestCase
 {
     protected function setUp()
     {
diff --git a/Tests/Functional/CachePoolsTest.php b/Tests/Functional/CachePoolsTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
-class CachePoolsTest extends WebTestCase
+class CachePoolsTest extends AbstractWebTestCase
 {
     public function testCachePools()
     {
diff --git a/Tests/Functional/ConfigDebugCommandTest.php b/Tests/Functional/ConfigDebugCommandTest.php
@@ -19,7 +19,7 @@
 /**
  * @group functional
  */
-class ConfigDebugCommandTest extends WebTestCase
+class ConfigDebugCommandTest extends AbstractWebTestCase
 {
     private $application;
 
diff --git a/Tests/Functional/ConfigDumpReferenceCommandTest.php b/Tests/Functional/ConfigDumpReferenceCommandTest.php
@@ -19,7 +19,7 @@
 /**
  * @group functional
  */
-class ConfigDumpReferenceCommandTest extends WebTestCase
+class ConfigDumpReferenceCommandTest extends AbstractWebTestCase
 {
     private $application;
 
diff --git a/Tests/Functional/ContainerDebugCommandTest.php b/Tests/Functional/ContainerDebugCommandTest.php
@@ -18,7 +18,7 @@
 /**
  * @group functional
  */
-class ContainerDebugCommandTest extends WebTestCase
+class ContainerDebugCommandTest extends AbstractWebTestCase
 {
     public function testDumpContainerIfNotExists()
     {
diff --git a/Tests/Functional/ContainerDumpTest.php b/Tests/Functional/ContainerDumpTest.php
@@ -14,7 +14,7 @@
 /**
  * Checks that the container compiles correctly when all the bundle features are enabled.
  */
-class ContainerDumpTest extends WebTestCase
+class ContainerDumpTest extends AbstractWebTestCase
 {
     public function testContainerCompilationInDebug()
     {
diff --git a/Tests/Functional/DebugAutowiringCommandTest.php b/Tests/Functional/DebugAutowiringCommandTest.php
@@ -17,7 +17,7 @@
 /**
  * @group functional
  */
-class DebugAutowiringCommandTest extends WebTestCase
+class DebugAutowiringCommandTest extends AbstractWebTestCase
 {
     public function testBasicFunctionality()
     {
diff --git a/Tests/Functional/FragmentTest.php b/Tests/Functional/FragmentTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-class FragmentTest extends WebTestCase
+class FragmentTest extends AbstractWebTestCase
 {
     /**
      * @dataProvider getConfigs
diff --git a/Tests/Functional/ProfilerTest.php b/Tests/Functional/ProfilerTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-class ProfilerTest extends WebTestCase
+class ProfilerTest extends AbstractWebTestCase
 {
     /**
      * @dataProvider getConfigs
diff --git a/Tests/Functional/PropertyInfoTest.php b/Tests/Functional/PropertyInfoTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyInfo\Type;
 
-class PropertyInfoTest extends WebTestCase
+class PropertyInfoTest extends AbstractWebTestCase
 {
     public function testPhpDocPriority()
     {
diff --git a/Tests/Functional/RouterDebugCommandTest.php b/Tests/Functional/RouterDebugCommandTest.php
@@ -17,7 +17,7 @@
 /**
  * @group functional
  */
-class RouterDebugCommandTest extends WebTestCase
+class RouterDebugCommandTest extends AbstractWebTestCase
 {
     private $application;
 
diff --git a/Tests/Functional/SerializerTest.php b/Tests/Functional/SerializerTest.php
@@ -14,7 +14,7 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class SerializerTest extends WebTestCase
+class SerializerTest extends AbstractWebTestCase
 {
     public function testDeserializeArrayOfObject()
     {
diff --git a/Tests/Functional/SessionTest.php b/Tests/Functional/SessionTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-class SessionTest extends WebTestCase
+class SessionTest extends AbstractWebTestCase
 {
     /**
      * Tests session attributes persist.
diff --git a/Tests/Functional/SubRequestsTest.php b/Tests/Functional/SubRequestsTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-class SubRequestsTest extends WebTestCase
+class SubRequestsTest extends AbstractWebTestCase
 {
     public function testStateAfterSubRequest()
     {
diff --git a/Tests/Functional/TestServiceContainerTest.php b/Tests/Functional/TestServiceContainerTest.php
@@ -18,7 +18,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\UnusedPrivateService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class TestServiceContainerTest extends WebTestCase
+class TestServiceContainerTest extends AbstractWebTestCase
 {
     public function testThatPrivateServicesAreUnavailableIfTestConfigIsDisabled()
     {
diff --git a/Tests/KernelBrowserTest.php b/Tests/KernelBrowserTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Symfony\Bundle\FrameworkBundle\Tests\Functional\WebTestCase;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\AbstractWebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
-class KernelBrowserTest extends WebTestCase
+class KernelBrowserTest extends AbstractWebTestCase
 {
     public function testRebootKernelBetweenRequests()
     {

Original file line number	Diff line number	Diff line change
`@@ -1227,7 +1227,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder`
`1227`	`1227`
`1228`	`1228`	`if (interface_exists(TranslatorInterface::class) && class_exists(LegacyTranslatorProxy::class)) {`
`1229`	`1229`	`$calls = $validatorBuilder->getMethodCalls();`
`1230`		`- $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator')])]];`
	`1230`	`+ $calls[1] = ['setTranslator', [new Definition(LegacyTranslatorProxy::class, [new Reference('translator', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)])]];`
`1231`	`1231`	`$validatorBuilder->setMethodCalls($calls);`
`1232`	`1232`	`}`
`1233`	`1233`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;`
`15`	`15`	`use Symfony\Component\Filesystem\Filesystem;`
`16`	`16`
`17`		`-class WebTestCase extends BaseWebTestCase`
	`17`	`+abstract class AbstractWebTestCase extends BaseWebTestCase`
`18`	`18`	`{`
`19`	`19`	`public static function assertRedirect($response, $location)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;`
`13`	`13`
`14`		`-class AnnotatedControllerTest extends WebTestCase`
	`14`	`+class AnnotatedControllerTest extends AbstractWebTestCase`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* @dataProvider getRoutes`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;`
`20`	`20`	`use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;`
`21`	`21`
`22`		`-class AutowiringTypesTest extends WebTestCase`
	`22`	`+class AutowiringTypesTest extends AbstractWebTestCase`
`23`	`23`	`{`
`24`	`24`	`public function testAnnotationReaderAutowiring()`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`/**`
`19`	`19`	`* @group functional`
`20`	`20`	`*/`
`21`		`-class CachePoolClearCommandTest extends WebTestCase`
	`21`	`+class CachePoolClearCommandTest extends AbstractWebTestCase`
`22`	`22`	`{`
`23`	`23`	`protected function setUp()`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\Cache\Adapter\TagAwareAdapter;`
`17`	`17`	`use Symfony\Component\Cache\Exception\InvalidArgumentException;`
`18`	`18`
`19`		`-class CachePoolsTest extends WebTestCase`
	`19`	`+class CachePoolsTest extends AbstractWebTestCase`
`20`	`20`	`{`
`21`	`21`	`public function testCachePools()`
`22`	`22`	`{`