diff --git a/cli/Valet/Drivers/BasicValetDriver.php b/cli/Valet/Drivers/BasicValetDriver.php index 7295d59..c0f718c 100644 --- a/cli/Valet/Drivers/BasicValetDriver.php +++ b/cli/Valet/Drivers/BasicValetDriver.php @@ -57,9 +57,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $uri = rtrim($uri, '/'); @@ -79,5 +79,7 @@ public function frontControllerPath(string $sitePath, string $siteName, string $ return $candidate; } } + + return null; } } diff --git a/cli/Valet/Drivers/BasicWithPublicValetDriver.php b/cli/Valet/Drivers/BasicWithPublicValetDriver.php index 21da676..1290b35 100644 --- a/cli/Valet/Drivers/BasicWithPublicValetDriver.php +++ b/cli/Valet/Drivers/BasicWithPublicValetDriver.php @@ -44,9 +44,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $_SERVER['PHP_SELF'] = $uri; $_SERVER['SERVER_ADDR'] = '127.0.0.1'; @@ -71,5 +71,7 @@ public function frontControllerPath(string $sitePath, string $siteName, string $ return $candidate; } } + + return null; } } diff --git a/cli/Valet/Drivers/LaravelValetDriver.php b/cli/Valet/Drivers/LaravelValetDriver.php index d977a5d..669b0e2 100644 --- a/cli/Valet/Drivers/LaravelValetDriver.php +++ b/cli/Valet/Drivers/LaravelValetDriver.php @@ -68,9 +68,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { return $sitePath.'/public/index.php'; } diff --git a/cli/Valet/Drivers/Specific/BedrockValetDriver.php b/cli/Valet/Drivers/Specific/BedrockValetDriver.php index 89cf343..3f8c49e 100644 --- a/cli/Valet/Drivers/Specific/BedrockValetDriver.php +++ b/cli/Valet/Drivers/Specific/BedrockValetDriver.php @@ -62,9 +62,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { return parent::frontControllerPath( $sitePath.'/web', diff --git a/cli/Valet/Drivers/Specific/CakeValetDriver.php b/cli/Valet/Drivers/Specific/CakeValetDriver.php index df4c8f3..643f92d 100644 --- a/cli/Valet/Drivers/Specific/CakeValetDriver.php +++ b/cli/Valet/Drivers/Specific/CakeValetDriver.php @@ -42,9 +42,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $_SERVER['DOCUMENT_ROOT'] = $sitePath.'/webroot'; $_SERVER['SCRIPT_FILENAME'] = $sitePath.'/webroot/index.php'; diff --git a/cli/Valet/Drivers/Specific/Concrete5ValetDriver.php b/cli/Valet/Drivers/Specific/Concrete5ValetDriver.php index b48ee4c..09acedf 100644 --- a/cli/Valet/Drivers/Specific/Concrete5ValetDriver.php +++ b/cli/Valet/Drivers/Specific/Concrete5ValetDriver.php @@ -40,9 +40,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { if (! getenv('CONCRETE5_ENV')) { putenv('CONCRETE5_ENV=valet'); diff --git a/cli/Valet/Drivers/Specific/ContaoValetDriver.php b/cli/Valet/Drivers/Specific/ContaoValetDriver.php index 5a08189..9b9d4fe 100644 --- a/cli/Valet/Drivers/Specific/ContaoValetDriver.php +++ b/cli/Valet/Drivers/Specific/ContaoValetDriver.php @@ -42,9 +42,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { if ($uri === '/install.php') { return $sitePath.'/web/install.php'; diff --git a/cli/Valet/Drivers/Specific/CraftValetDriver.php b/cli/Valet/Drivers/Specific/CraftValetDriver.php index affa815..6ba0ef8 100644 --- a/cli/Valet/Drivers/Specific/CraftValetDriver.php +++ b/cli/Valet/Drivers/Specific/CraftValetDriver.php @@ -64,9 +64,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $frontControllerDirectory = $this->frontControllerDirectory($sitePath); diff --git a/cli/Valet/Drivers/Specific/DrupalValetDriver.php b/cli/Valet/Drivers/Specific/DrupalValetDriver.php index f7ced37..8b5606e 100644 --- a/cli/Valet/Drivers/Specific/DrupalValetDriver.php +++ b/cli/Valet/Drivers/Specific/DrupalValetDriver.php @@ -57,9 +57,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $sitePath = $this->addSubdirectory($sitePath); diff --git a/cli/Valet/Drivers/Specific/KirbyValetDriver.php b/cli/Valet/Drivers/Specific/KirbyValetDriver.php index 6ab295d..fed936a 100644 --- a/cli/Valet/Drivers/Specific/KirbyValetDriver.php +++ b/cli/Valet/Drivers/Specific/KirbyValetDriver.php @@ -44,9 +44,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $scriptName = '/index.php'; diff --git a/cli/Valet/Drivers/Specific/Magento2ValetDriver.php b/cli/Valet/Drivers/Specific/Magento2ValetDriver.php index a84a88f..43c5cb9 100644 --- a/cli/Valet/Drivers/Specific/Magento2ValetDriver.php +++ b/cli/Valet/Drivers/Specific/Magento2ValetDriver.php @@ -142,9 +142,9 @@ private function isPubDirectory($sitePath, $route, $pub = '') * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $this->checkMageMode($sitePath); diff --git a/cli/Valet/Drivers/Specific/NeosValetDriver.php b/cli/Valet/Drivers/Specific/NeosValetDriver.php index 04f89d9..a8fc948 100644 --- a/cli/Valet/Drivers/Specific/NeosValetDriver.php +++ b/cli/Valet/Drivers/Specific/NeosValetDriver.php @@ -58,9 +58,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { return $sitePath.'/Web/index.php'; } diff --git a/cli/Valet/Drivers/Specific/StatamicV1ValetDriver.php b/cli/Valet/Drivers/Specific/StatamicV1ValetDriver.php index e96828b..2561178 100644 --- a/cli/Valet/Drivers/Specific/StatamicV1ValetDriver.php +++ b/cli/Valet/Drivers/Specific/StatamicV1ValetDriver.php @@ -49,9 +49,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { if (strpos($uri, '/admin.php') === 0) { $_SERVER['SCRIPT_NAME'] = '/admin.php'; diff --git a/cli/Valet/Drivers/Specific/StatamicValetDriver.php b/cli/Valet/Drivers/Specific/StatamicValetDriver.php index 378c234..a9f990f 100644 --- a/cli/Valet/Drivers/Specific/StatamicValetDriver.php +++ b/cli/Valet/Drivers/Specific/StatamicValetDriver.php @@ -48,9 +48,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { if ($_SERVER['REQUEST_METHOD'] === 'GET' && $this->isActualFile($staticPath = $this->getStaticPath($sitePath))) { return $staticPath; diff --git a/cli/Valet/Drivers/Specific/SymfonyValetDriver.php b/cli/Valet/Drivers/Specific/SymfonyValetDriver.php index c191654..aae7d2d 100644 --- a/cli/Valet/Drivers/Specific/SymfonyValetDriver.php +++ b/cli/Valet/Drivers/Specific/SymfonyValetDriver.php @@ -46,9 +46,9 @@ public function isStaticFile(string $sitePath, string $siteName, string $uri): s * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { $frontControllerPath = null; diff --git a/cli/Valet/Drivers/Specific/Typo3ValetDriver.php b/cli/Valet/Drivers/Specific/Typo3ValetDriver.php index 24d4f13..d6748e7 100644 --- a/cli/Valet/Drivers/Specific/Typo3ValetDriver.php +++ b/cli/Valet/Drivers/Specific/Typo3ValetDriver.php @@ -131,9 +131,9 @@ private function isAccessAuthorized($uri) * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { // from now on, remove trailing / for convenience for all the following join operations $uri = rtrim($uri, '/'); diff --git a/cli/Valet/Drivers/Specific/WordPressValetDriver.php b/cli/Valet/Drivers/Specific/WordPressValetDriver.php index 2c26239..da96041 100644 --- a/cli/Valet/Drivers/Specific/WordPressValetDriver.php +++ b/cli/Valet/Drivers/Specific/WordPressValetDriver.php @@ -40,9 +40,9 @@ public function beforeLoading(string $sitePath, string $siteName, string $uri): * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - public function frontControllerPath(string $sitePath, string $siteName, string $uri): string + public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string { return parent::frontControllerPath( $sitePath, $siteName, $this->forceTrailingSlash($uri) diff --git a/cli/Valet/Drivers/ValetDriver.php b/cli/Valet/Drivers/ValetDriver.php index dd0d293..164c18a 100644 --- a/cli/Valet/Drivers/ValetDriver.php +++ b/cli/Valet/Drivers/ValetDriver.php @@ -35,9 +35,9 @@ abstract public function isStaticFile(string $sitePath, string $siteName, string * @param string $sitePath * @param string $siteName * @param string $uri - * @return string + * @return string|null */ - abstract public function frontControllerPath(string $sitePath, string $siteName, string $uri): string; + abstract public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string; /** * Find a driver that can serve the incoming request. diff --git a/server.php b/server.php index 05ea5c6..3a49978 100644 --- a/server.php +++ b/server.php @@ -68,9 +68,12 @@ $isPhpFile = pathinfo($uri, PATHINFO_EXTENSION) === 'php'; if ($uri !== '/' && ! $isPhpFile && $staticFilePath = $valetDriver->isStaticFile($valetSitePath, $siteName, $uri)) { + exit('is static'); return $valetDriver->serveStaticFile($staticFilePath, $valetSitePath, $siteName, $uri); } +exit('is not static'); + /** * Allow for drivers to take pre-loading actions (e.g. setting server variables). */