Add "executable" option to server:run console command

tomasfejfar · tomasfejfar · commit 85061fb6e056 · 2017-07-30T17:59:56.000+02:00
diff --git a/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * WebServer can now use '*' as a wildcard to bind to 0.0.0.0 (INADDR_ANY)
+ * `server:run` command now has `executable` option that allows using custom executable for the commandline server (such as `php -c /path/to/ini`)
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
@@ -50,6 +50,7 @@ protected function configure()
                 new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)'),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root, usually where your front controllers are stored'),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
+                new InputOption('executable', 'e', InputOption::VALUE_REQUIRED, 'Custom executable for the PHP commandline webserver'),
             ))
             ->setName('server:run')
             ->setDescription('Runs a local web server')
@@ -76,6 +77,10 @@ protected function configure()
 
   <info>%command.full_name% --router=app/config/router.php</info>
 
+Specify your own server executable via the <info>--executable</info> option:
+
+  <info>%command.full_name% --executable=/usr/bin/php7</info>
+
 See also: http://www.php.net/manual/en/features.commandline.webserver.php
 EOF
             )
@@ -129,7 +134,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $server = new WebServer();
-            $config = new WebServerConfig($documentRoot, $env, $input->getArgument('addressport'), $input->getOption('router'));
+            $config = new WebServerConfig(
+                $documentRoot,
+                $env,
+                $input->getArgument('addressport'),
+                $input->getOption('router'),
+                $input->getOption('executable')
+            );
 
             $io->success(sprintf('Server listening on http://%s', $config->getAddress()));
             $io->comment('Quit the server with CONTROL-C.');
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServer.php b/src/Symfony/Bundle/WebServerBundle/WebServer.php
@@ -145,12 +145,16 @@ public function isRunning($pidFile = null)
      */
     private function createServerProcess(WebServerConfig $config)
     {
-        $finder = new PhpExecutableFinder();
-        if (false === $binary = $finder->find()) {
-            throw new \RuntimeException('Unable to find the PHP binary.');
+        $executable = $config->getExecutable();
+
+        if ($executable === null) {
+            $finder = new PhpExecutableFinder();
+            if (false === $executable = $finder->find()) {
+                throw new \RuntimeException('Unable to find the PHP executable.');
+            }
         }
 
-        $process = new Process(array($binary, '-S', $config->getAddress(), $config->getRouter()));
+        $process = new Process(array($executable, '-S', $config->getAddress(), $config->getRouter()));
         $process->setWorkingDirectory($config->getDocumentRoot());
         $process->setTimeout(null);
 
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -21,8 +21,9 @@ class WebServerConfig
     private $documentRoot;
     private $env;
     private $router;
+    private $executable;
 
-    public function __construct($documentRoot, $env, $address = null, $router = null)
+    public function __construct($documentRoot, $env, $address = null, $router = null, $executable = null)
     {
         if (!is_dir($documentRoot)) {
             throw new \InvalidArgumentException(sprintf('The document root directory "%s" does not exist.', $documentRoot));
@@ -69,6 +70,8 @@ public function __construct($documentRoot, $env, $address = null, $router = null
         if (!ctype_digit($this->port)) {
             throw new \InvalidArgumentException(sprintf('Port "%s" is not valid.', $this->port));
         }
+
+        $this->executable = $executable;
     }
 
     public function getDocumentRoot()
@@ -86,6 +89,11 @@ public function getRouter()
         return $this->router;
     }
 
+    public function getExecutable()
+    {
+        return $this->executable;
+    }
+
     public function getHostname()
     {
         return $this->hostname;

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ class WebServerConfig`
`21`	`21`	`private $documentRoot;`
`22`	`22`	`private $env;`
`23`	`23`	`private $router;`
	`24`	`+ private $executable;`
`24`	`25`
`25`		`- public function __construct($documentRoot, $env, $address = null, $router = null)`
	`26`	`+ public function __construct($documentRoot, $env, $address = null, $router = null, $executable = null)`
`26`	`27`	`{`
`27`	`28`	`if (!is_dir($documentRoot)) {`
`28`	`29`	`throw new \InvalidArgumentException(sprintf('The document root directory "%s" does not exist.', $documentRoot));`
`@@ -69,6 +70,8 @@ public function __construct($documentRoot, $env, $address = null, $router = null`
`69`	`70`	`if (!ctype_digit($this->port)) {`
`70`	`71`	`throw new \InvalidArgumentException(sprintf('Port "%s" is not valid.', $this->port));`
`71`	`72`	`}`
	`73`	`+`
	`74`	`+ $this->executable = $executable;`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`public function getDocumentRoot()`
`@@ -86,6 +89,11 @@ public function getRouter()`
`86`	`89`	`return $this->router;`
`87`	`90`	`}`
`88`	`91`
	`92`	`+ public function getExecutable()`
	`93`	`+ {`
	`94`	`+ return $this->executable;`
	`95`	`+ }`
`96`	`+`
`89`	`97`	`public function getHostname()`
`90`	`98`	`{`
`91`	`99`	`return $this->hostname;`