Centralize routes file existence check in App\Router

diff --git a/src/App/Router.php b/src/App/Router.php
index d27a9c1ae98cdb49dd03527396d10c368368ee37..e90cb3ace06523c3e95620289c33bab580ab3a6e 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -93,6 +93,10 @@ class Router
                $this->routeCollector = isset($routeCollector) ?
                        $routeCollector :
                        new RouteCollector(new Std(), new GroupCountBased());
+
+               if ($this->baseRoutesFilepath && !file_exists($this->baseRoutesFilepath)) {
+                       throw new HTTPException\InternalServerErrorException('Routes file path does\'n exist.');
+               }
        }
 
        /**
@@ -249,7 +253,7 @@ class Router
        {
                $dispatchData = [];
 
-               if ($this->baseRoutesFilepath && file_exists($this->baseRoutesFilepath)) {
+               if ($this->baseRoutesFilepath) {
                        $dispatchData = require $this->baseRoutesFilepath;
                        if (!is_array($dispatchData)) {
                                throw new HTTPException\InternalServerErrorException('Invalid base routes file');
@@ -280,7 +284,7 @@ class Router
                $lastRoutesFileModifiedTime = $this->cache->get('lastRoutesFileModifiedTime');
                $forceRecompute = false;
 
-               if ($this->baseRoutesFilepath && file_exists($this->baseRoutesFilepath)) {
+               if ($this->baseRoutesFilepath) {
                        $routesFileModifiedTime = filemtime($this->baseRoutesFilepath);
                        $forceRecompute = $lastRoutesFileModifiedTime != $routesFileModifiedTime;
                }