Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 62ec25b

Browse filesBrowse files
fabpotfabpot
committed
[WebServerBundle] added support for port auto-detection
1 parent b59b823 commit 62ec25b
Copy full SHA for 62ec25b

File tree

5 files changed

+22
-10
lines changed
Filter options

5 files changed

+22
-10
lines changed

‎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
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected function configure()
3434
{
3535
$this
3636
->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)', null),
3838
new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root', null),
3939
new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script', null),
4040
))

‎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
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected function configure()
3434
$this
3535
->setName('server:start')
3636
->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)', null),
3838
new InputOption('docroot', 'd', InputOption::VALUE_REQUIRED, 'Document root', null),
3939
new InputOption('router', 'r', InputOption::VALUE_REQUIRED, 'Path to custom router script'),
4040
new InputOption('pidfile', '', InputOption::VALUE_REQUIRED, 'PID file', null),

‎src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStatusCommand.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\WebServerBundle\Command;
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
15-
use Symfony\Component\Console\Input\InputArgument;
1615
use Symfony\Component\Console\Input\InputInterface;
1716
use Symfony\Component\Console\Input\InputOption;
1817
use Symfony\Component\Console\Output\OutputInterface;

‎src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/Command/ServerStopCommand.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\WebServerBundle\Command;
1313

1414
use Symfony\Bundle\WebServerBundle\WebServer;
15-
use Symfony\Component\Console\Input\InputArgument;
1615
use Symfony\Component\Console\Input\InputInterface;
1716
use Symfony\Component\Console\Output\OutputInterface;
1817
use Symfony\Component\Console\Input\InputOption;

‎src/Symfony/Bundle/WebServerBundle/WebServerConfig.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
+20-6Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111

1212
namespace Symfony\Bundle\WebServerBundle;
1313

14-
use Symfony\Component\Process\PhpExecutableFinder;
15-
use Symfony\Component\Process\Process;
16-
use Symfony\Component\Process\ProcessBuilder;
17-
use Symfony\Component\Process\Exception\RuntimeException;
18-
1914
/**
2015
* @author Fabien Potencier <fabien@symfony.com>
2116
*/
@@ -27,7 +22,7 @@ class WebServerConfig
2722
private $env;
2823
private $router;
2924

30-
public function __construct($documentRoot, $env, $address = '127.0.0.1:8000', $router = null)
25+
public function __construct($documentRoot, $env, $address = null, $router = null)
3126
{
3227
if (!is_dir($documentRoot)) {
3328
throw new \InvalidArgumentException(sprintf('The document root directory "%s" does not exist.', $documentRoot));
@@ -43,6 +38,12 @@ public function __construct($documentRoot, $env, $address = '127.0.0.1:8000', $r
4338
$this->env = $env;
4439
$this->router = $router ?: __DIR__.'/Resources/router.php';
4540

41+
if (null === $address) {
42+
$this->address = '127.0.0.1';
43+
$this->port = $this->findBestPort();
44+
$address = $this->address.':'.$this->port;
45+
}
46+
4647
if (false !== $pos = strrpos($address, ':')) {
4748
$this->hostname = substr($address, 0, $pos);
4849
$this->port = substr($address, $pos + 1);
@@ -99,4 +100,17 @@ private function guessFrontController($documentRoot, $env)
99100
}
100101
}
101102
}
103+
104+
private function findBestPort()
105+
{
106+
$port = 8000;
107+
while (false !== $fp = @fsockopen('127.0.0.1', $port, $errno, $errstr, 1)) {
108+
fclose($fp);
109+
if ($port++ >= 8100) {
110+
throw new \RuntimeException('Unable to find a port available to run the web server.');
111+
}
112+
}
113+
114+
return $port;
115+
}
102116
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.