symfony
diff --git a/‎src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerRunCommand.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStartCommand.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
+20-1Lines changed: 20 additions & 1 deletion b/‎src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
+20-1Lines changed: 20 additions & 1 deletion
@@ -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)', null),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root', null),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script', null),
             ))
 
@@ -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)', null),
                 new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root', null),
                 new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
                 new InputOption('pidfile', '', InputOption::VALUE_REQUIRED, 'PID file', null),
 
@@ -27,7 +27,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,6 +43,12 @@ public function __construct($documentRoot, $env, $address = '127.0.0.1:8000', $r
         $this->env = $env;
         $this->router = $router ?: __DIR__.'/Resources/router.php';
 
+        if (null === $address) {
+            $this->address = '127.0.0.1';
+            $this->port = $this->findBestPort();
+            $address = $this->address.':'.$this->port;
+        }
+
         if (false !== $pos = strrpos($address, ':')) {
             $this->hostname = substr($address, 0, $pos);
             $this->port = substr($address, $pos + 1);
@@ -99,4 +105,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;
+    }
 }