Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit d0e5593b1fcc · 2020-02-25T15:44:02.000+01:00
* 5.0:
  [FrameworkBundle] Fix test
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -874,6 +874,10 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
             $container->getDefinition('routing.loader')->replaceArgument(2, ['_locale' => $enabledLocales]);
         }
 
+        if (!class_exists(ExpressionLanguage::class)) {
+            $container->removeDefinition('router.expression_language_provider');
+        }
+
         $container->setParameter('router.resource', $config['resource']);
         $router = $container->findDefinition('router.default');
         $argument = $router->getArgument(2);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -88,7 +88,7 @@
             <argument>%request_listener.https_port%</argument>
             <call method="setParameter">
                 <argument>_functions</argument>
-                <argument type="service" id="router.expression_language_provider" />
+                <argument type="service" id="router.expression_language_provider" on-invalid="ignore" />
             </call>
         </service>
         <service id="Symfony\Component\Routing\RequestContext" alias="router.request_context" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -41,7 +41,7 @@ public function testMissingWhitelistTags()
         $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getWhitelistTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php.');
     }
 
-    private function getWhitelistTags()
+    private function getWhitelistTags(): array
     {
         // get tags in UnusedTagsPass
         $target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassUtils.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassUtils.php
@@ -15,7 +15,7 @@
 
 class UnusedTagsPassUtils
 {
-    public static function getDefinedTags()
+    public static function getDefinedTags(): array
     {
         $tags = [
             'proxy' => true,

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testMissingWhitelistTags()`
`41`	`41`	`$this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getWhitelistTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php.');`
`42`	`42`	`}`
`43`	`43`
`44`		`- private function getWhitelistTags()`
	`44`	`+ private function getWhitelistTags(): array`
`45`	`45`	`{`
`46`	`46`	`// get tags in UnusedTagsPass`
`47`	`47`	`$target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`class UnusedTagsPassUtils`
`17`	`17`	`{`
`18`		`- public static function getDefinedTags()`
	`18`	`+ public static function getDefinedTags(): array`
`19`	`19`	`{`
`20`	`20`	`$tags = [`
`21`	`21`	`'proxy' => true,`