bug #10443 [FrameworkBundle] Use DIC parameter as default host value if available (romainneutron)

fabpot · fabpot · commit 120a7e99d71a · 2014-03-13T17:31:53.000+01:00
This PR was merged into the 2.5-dev branch. Discussion ---------- [FrameworkBundle] Use DIC parameter as default host value if available | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT This follows #10439 Commits ------- 85a2fbf [FrameworkBundle] Use DIC parameter as default host value if available
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
@@ -51,8 +51,8 @@ protected function configure()
             ->setName('router:match')
             ->setDefinition(array(
                 new InputArgument('path_info', InputArgument::REQUIRED, 'A path info'),
-                new InputOption('method', null, InputOption::VALUE_REQUIRED, 'Sets the HTTP method', 'GET'),
-                new InputOption('host', null, InputOption::VALUE_REQUIRED, 'Sets the HTTP host', 'localhost'),
+                new InputOption('method', null, InputOption::VALUE_REQUIRED, 'Sets the HTTP method'),
+                new InputOption('host', null, InputOption::VALUE_REQUIRED, 'Sets the HTTP host'),
             ))
             ->setDescription('Helps debug routes by simulating a path info match')
             ->setHelp(<<<EOF
@@ -74,8 +74,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $router = $this->getContainer()->get('router');
         $context = $router->getContext();
-        $context->setMethod($input->getOption('method'));
-        $context->setHost($input->getOption('host'));
+        if (null !== $method = $input->getOption('method')) {
+            $context->setMethod($method);
+        }
+        if (null !== $host = $input->getOption('host')) {
+            $context->setHost($host);
+        }
 
         $matcher = new TraceableUrlMatcher($router->getRouteCollection(), $context);
 
