minor #35303 [FrameworkBundle] Add missing entry about framework.router.context (ogizanagi)

fabpot · fabpot · commit 596caf7b8feb · 2020-01-11T08:28:35.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [FrameworkBundle] Add missing entry about framework.router.context | Q | A | ------------- | --- | Branch? | master  | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | Relates to #35281  | License | MIT | Doc PR | N/A Some minor tweaks about #35281 Commits ------- 5a83b07 [FrameworkBundle] Add missing entry about framework.router.context
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 5.1.0
 -----
 
+ * Added the `framework.router.context` configuration node to configure the `RequestContext`
  * Made `MicroKernelTrait::configureContainer()` compatible with `ContainerConfigurator`
  * Added a new `mailer.message_bus` option to configure or disable the message bus to use to send mails.
  * Added flex-compatible default implementations for `MicroKernelTrait::registerBundles()` and `getProjectDir()`
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -483,7 +483,7 @@ private function addRouterSection(ArrayNodeDefinition $rootNode)
                         ->end()
                         ->booleanNode('utf8')->defaultFalse()->end()
                         ->arrayNode('context')
-                            ->info('router request context')
+                            ->info('The request context used to generate URLs in a non-HTTP context')
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->scalarNode('host')->defaultValue('%router.request_context.host%')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -854,7 +854,7 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
         $container->setParameter('request_listener.http_port', $config['http_port']);
         $container->setParameter('request_listener.https_port', $config['https_port']);
 
-        $requestContext = $container->findDefinition('router.request_context');
+        $requestContext = $container->getDefinition('router.request_context');
         $requestContext->replaceArgument(0, $config['context']['base_url']);
         $requestContext->replaceArgument(2, $config['context']['host']);
         $requestContext->replaceArgument(3, $config['context']['scheme']);
