phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-07 01:00:09 +01:00
Code Activity

Allow null response from frontControllerPath

Browse Source
This commit is contained in:
Matt Stauffer
2022-12-22 13:26:02 -05:00
parent f2a62f51c6
commit 4c67413e7a
19 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/Valet/Drivers/BasicValetDriver.php
View File

@@ -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;
}
}

6
cli/Valet/Drivers/BasicWithPublicValetDriver.php
View File

@@ -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;
}
}

4
cli/Valet/Drivers/LaravelValetDriver.php
View File

@@ -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';
}

4
cli/Valet/Drivers/Specific/BedrockValetDriver.php
View File

@@ -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',

4
cli/Valet/Drivers/Specific/CakeValetDriver.php
View File

@@ -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';

4
cli/Valet/Drivers/Specific/Concrete5ValetDriver.php
View File

@@ -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');

4
cli/Valet/Drivers/Specific/ContaoValetDriver.php
View File

@@ -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';

4
cli/Valet/Drivers/Specific/CraftValetDriver.php
View File

@@ -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);

4
cli/Valet/Drivers/Specific/DrupalValetDriver.php
View File

@@ -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);

4
cli/Valet/Drivers/Specific/KirbyValetDriver.php
View File

@@ -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';

4
cli/Valet/Drivers/Specific/Magento2ValetDriver.php
View File

@@ -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);

4
cli/Valet/Drivers/Specific/NeosValetDriver.php
View File

@@ -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';
}

4
cli/Valet/Drivers/Specific/StatamicV1ValetDriver.php
View File

@@ -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';

4
cli/Valet/Drivers/Specific/StatamicValetDriver.php
View File

@@ -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;

4
cli/Valet/Drivers/Specific/SymfonyValetDriver.php
View File

@@ -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;

4
cli/Valet/Drivers/Specific/Typo3ValetDriver.php
View File

@@ -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, '/');

4
cli/Valet/Drivers/Specific/WordPressValetDriver.php
View File

@@ -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)

4
cli/Valet/Drivers/ValetDriver.php
View File

@@ -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.

3
server.php
View File

@@ -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).
*/