Improved exception message

wouterj · wouterj · commit df4618838184 · 2017-02-02T12:37:59.000+01:00
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -28,8 +28,8 @@ public function __construct($documentRoot, $env, $address = null, $router = null
             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 @@ public function getAddress()
         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;

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public function __construct($documentRoot, $env, $address = null, $router = null`
`28`	`28`	`throw new \InvalidArgumentException(sprintf('The document root directory "%s" does not exist.', $documentRoot));`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (null === $file = $this->guessFrontController($documentRoot, $env)) {`
`32`		`- throw new \InvalidArgumentException(sprintf('Unable to guess the front controller under "%s".', $documentRoot));`
	`31`	`+ if (null === $file = $this->findFrontController($documentRoot, $env)) {`
	`32`	`+ throw new \InvalidArgumentException(sprintf('Unable to find the front controller under "%s" (none of these files exist: %s).', $documentRoot, implode(', ', $this->getFrontControllerFileNames($env))));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`putenv('APP_FRONT_CONTROLLER='.$file);`
`@@ -87,21 +87,22 @@ public function getAddress()`
`87`	`87`	`return $this->hostname.':'.$this->port;`
`88`	`88`	`}`
`89`	`89`
`90`		`- private function guessFrontController($documentRoot, $env)`
	`90`	`+ private function findFrontController($documentRoot, $env)`
`91`	`91`	`{`
`92`		`- foreach (array('app', 'index') as $prefix) {`
`93`		`- $file = sprintf('%s_%s.php', $prefix, $env);`
`94`		`- if (file_exists($documentRoot.'/'.$file)) {`
`95`		`- return $file;`
`96`		`- }`
	`92`	`+ $fileNames = $this->getFrontControllerFileNames($env);`
`97`	`93`
`98`		`- $file = sprintf('%s.php', $prefix);`
`99`		`- if (file_exists($documentRoot.'/'.$file)) {`
`100`		`- return $file;`
	`94`	`+ foreach ($fileNames as $fileName) {`
	`95`	`+ if (file_exists($documentRoot.'/'.$fileName)) {`
	`96`	`+ return $fileName;`
`101`	`97`	`}`
`102`	`98`	`}`
`103`	`99`	`}`
`104`	`100`
	`101`	`+ private function getFrontControllerFileNames($env)`
	`102`	`+ {`
	`103`	`+ return array('app_'.$env.'.php', 'app.php', 'index_'.$env.'.php', 'index.php');`
	`104`	`+ }`
	`105`	`+`
`105`	`106`	`private function findBestPort()`
`106`	`107`	`{`
`107`	`108`	`$port = 8000;`