diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved exception message

Browse Source
This commit is contained in:
Wouter J 2017-01-25 17:05:57 +01:00 committed by WouterJ
parent b9b6ebd643
commit df46188381
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
View File

@ -28,8 +28,8 @@ class WebServerConfig
throw new \InvalidArgumentException(sprintf('The document root directory "%s" does not exist.', $documentRoot));
}
if (null === $file = $this->guessFrontController($documentRoot, $env)) {
throw new \InvalidArgumentException(sprintf('Unable to guess the front controller under "%s".', $documentRoot));
if (null === $file = $this->findFrontController($documentRoot, $env)) {
throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: %s).', $documentRoot, implode(', ', $this->getFrontControllerFileNames($env))));
}
putenv('APP_FRONT_CONTROLLER='.$file);
@ -87,21 +87,22 @@ class WebServerConfig
return $this->hostname.':'.$this->port;
}
private function guessFrontController($documentRoot, $env)
private function findFrontController($documentRoot, $env)
{
foreach (array('app', 'index') as $prefix) {
$file = sprintf('%s_%s.php', $prefix, $env);
if (file_exists($documentRoot.'/'.$file)) {
return $file;
}
$fileNames = $this->getFrontControllerFileNames($env);
$file = sprintf('%s.php', $prefix);
if (file_exists($documentRoot.'/'.$file)) {
return $file;
foreach ($fileNames as $fileName) {
if (file_exists($documentRoot.'/'.$fileName)) {
return $fileName;
}
}
}
private function getFrontControllerFileNames($env)
{
return array('app_'.$env.'.php', 'app.php', 'index_'.$env.'.php', 'index.php');
}
private function findBestPort()
{
$port = 8000;