[WebServerBundle] added support for port auto-detection

fabpot · fabpot · commit 126f4d9ec434 · 2017-01-05T11:48:52.000-08:00
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
@@ -34,7 +34,7 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)', '127.0.0.1:8000'),
+                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'),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
             ))
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
@@ -34,7 +34,7 @@ protected function configure()
         $this
             ->setName('server:start')
             ->setDefinition(array(
-                new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)', '127.0.0.1:8000'),
+                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'),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
                 new InputOption('pidfile', null, InputOption::VALUE_REQUIRED, 'PID file'),
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\WebServerBundle\Command;
 
 use Symfony\Bundle\WebServerBundle\WebServer;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\WebServerBundle\Command;
 
 use Symfony\Bundle\WebServerBundle\WebServer;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Symfony/Bundle/WebServerBundle/LICENSE b/src/Symfony/Bundle/WebServerBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -11,11 +11,6 @@
 
 namespace Symfony\Bundle\WebServerBundle;
 
-use Symfony\Component\Process\PhpExecutableFinder;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
-use Symfony\Component\Process\Exception\RuntimeException;
-
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -27,7 +22,7 @@ class WebServerConfig
     private $env;
     private $router;
 
-    public function __construct($documentRoot, $env, $address = '127.0.0.1:8000', $router = null)
+    public function __construct($documentRoot, $env, $address = null, $router = null)
     {
         if (!is_dir($documentRoot)) {
             throw new \InvalidArgumentException(sprintf('The document root directory "%s" does not exist.', $documentRoot));
@@ -43,15 +38,22 @@ public function __construct($documentRoot, $env, $address = '127.0.0.1:8000', $r
         $this->env = $env;
         $this->router = $router ?: __DIR__.'/Resources/router.php';
 
-        if (false !== $pos = strrpos($address, ':')) {
+        if (null === $address) {
+            $this->hostname = '127.0.0.1';
+            $this->port = $this->findBestPort();
+        } elseif (false !== $pos = strrpos($address, ':')) {
             $this->hostname = substr($address, 0, $pos);
             $this->port = substr($address, $pos + 1);
         } elseif (ctype_digit($address)) {
             $this->hostname = '127.0.0.1';
             $this->port = $address;
         } else {
             $this->hostname = $address;
-            $this->port = 80;
+            $this->port = $this->findBestPort();
+        }
+
+        if (!ctype_digit($this->port)) {
+            throw new \InvalidArgumentException(sprintf('Port "%s" is not valid.', $this->port));
         }
     }
 
@@ -99,4 +101,17 @@ private function guessFrontController($documentRoot, $env)
             }
         }
     }
+
+    private function findBestPort()
+    {
+        $port = 8000;
+        while (false !== $fp = @fsockopen('127.0.0.1', $port, $errno, $errstr, 1)) {
+            fclose($fp);
+            if ($port++ >= 8100) {
+                throw new \RuntimeException('Unable to find a port available to run the web server.');
+            }
+        }
+
+        return $port;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function configure()`
`34`	`34`	`{`
`35`	`35`	`$this`
`36`	`36`	`->setDefinition(array(`
`37`		`- new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)', '127.0.0.1:8000'),`
	`37`	`+ new InputArgument('addressport', InputArgument::OPTIONAL, 'The address to listen to (can be address:port, address, or port)'),`
`38`	`38`	`new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root'),`
`39`	`39`	`new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),`
`40`	`40`	`))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2004-2016 Fabien Potencier`
	`1`	`+Copyright (c) 2004-2017 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`