bug #12253 [FrameworkBundle] improve server commands feedback (xabbuh)

fabpot · fabpot · commit 4fe8eda41732 · 2014-10-19T18:32:38.000+02:00
This PR was merged into the 2.6-dev branch. Discussion ---------- [FrameworkBundle] improve server commands feedback | Q | A | ------------- | --- | Bug fix? | no | New feature? | kind of | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12153 | License | MIT | Doc PR | * display a message when `server:start` is executed and the PCNTL extension is not loaded * print instructions about how to terminate the `server:run` command Commits ------- bf174cf [FrameworkBundle] improve server commands feedback
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
@@ -27,10 +27,6 @@ public function isEnabled()
             return false;
         }
 
-        if (!extension_loaded('pcntl')) {
-            return false;
-        }
-
         return parent::isEnabled();
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -97,6 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->writeln(sprintf("Server running on <info>http://%s</info>\n", $input->getArgument('address')));
+        $output->writeln('Quit the server with CONTROL-C.');
 
         $builder = $this->createPhpProcessBuilder($input, $output, $env);
         $builder->setWorkingDirectory($documentRoot);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
@@ -70,6 +70,13 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (!extension_loaded('pcntl')) {
+            $output->writeln('<error>This command needs the pcntl extension to run.</error>');
+            $output->writeln('You can either install it or use the <info>server:run</info> command instead to run the built-in web server.');
+
+            return 1;
+        }
+
         $env = $this->getContainer()->getParameter('kernel.environment');
 
         if ('prod' === $env) {

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,6 @@ public function isEnabled()`
`27`	`27`	`return false;`
`28`	`28`	`}`
`29`	`29`
`30`		`- if (!extension_loaded('pcntl')) {`
`31`		`- return false;`
`32`		`- }`
`33`		`-`
`34`	`30`	`return parent::isEnabled();`
`35`	`31`	`}`
`36`	`32`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`$output->writeln(sprintf("Server running on <info>http://%s</info>\n", $input->getArgument('address')));`
	`100`	`+ $output->writeln('Quit the server with CONTROL-C.');`
`100`	`101`
`101`	`102`	`$builder = $this->createPhpProcessBuilder($input, $output, $env);`
`102`	`103`	`$builder->setWorkingDirectory($documentRoot);`