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

Move isActualFile() to ValetDriver

Browse Source
This commit is contained in:
Kennedy Tedesco
2016-05-10 14:43:38 -03:00
parent 97f7ae2342
commit 29dafe848c
10 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cli/drivers/BasicValetDriver.php
View File

@@ -73,17 +73,6 @@ public function frontControllerPath($sitePath, $siteName, $uri)
} }
} }
/**
* Determine if the path is a file and not a directory.
*
* @param string $path
* @return bool
*/
protected function isActualFile($path)
{
return file_exists($path) && ! is_dir($path);
}
/** /**
* Concatenate the site path and URI as a single file name. * Concatenate the site path and URI as a single file name.
* *

2
cli/drivers/CakeValetDriver.php
View File

@@ -25,7 +25,7 @@ public function serves($sitePath, $siteName, $uri)
*/ */
public function isStaticFile($sitePath, $siteName, $uri) public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($staticFilePath = $sitePath.'/webroot/'.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.'/webroot/'.$uri)) {
return $staticFilePath; return $staticFilePath;
} }

4
cli/drivers/ContaoValetDriver.php
View File

@@ -8,7 +8,7 @@ class ContaoValetDriver extends ValetDriver
* @param string $sitePath * @param string $sitePath
* @param string $siteName * @param string $siteName
* @param string $uri * @param string $uri
* @return void * @return bool
*/ */
public function serves($sitePath, $siteName, $uri) public function serves($sitePath, $siteName, $uri)
{ {
@@ -25,7 +25,7 @@ public function serves($sitePath, $siteName, $uri)
*/ */
public function isStaticFile($sitePath, $siteName, $uri) public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($staticFilePath = $sitePath.'/web'.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.'/web'.$uri)) {
return $staticFilePath; return $staticFilePath;
} }

2
cli/drivers/CraftValetDriver.php
View File

@@ -25,7 +25,7 @@ public function serves($sitePath, $siteName, $uri)
*/ */
public function isStaticFile($sitePath, $siteName, $uri) public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($staticFilePath = $sitePath.'/public'.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.'/public'.$uri)) {
return $staticFilePath; return $staticFilePath;
} }

4
cli/drivers/KirbyValetDriver.php
View File

@@ -25,8 +25,8 @@ public function serves($sitePath, $siteName, $uri)
*/ */
public function isStaticFile($sitePath, $siteName, $uri) public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($sitePath.$uri) && ! is_dir($sitePath.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.$uri)) {
return $sitePath.$uri; return $staticFilePath;
} }
return false; return false;

3
cli/drivers/LaravelValetDriver.php
View File

@@ -36,8 +36,7 @@ public function isStaticFile($sitePath, $siteName, $uri)
$storageUri = substr($uri, 8); $storageUri = substr($uri, 8);
} }
if (file_exists($storagePath = $sitePath.'/storage/app/public'.$storageUri) && if ($this->isActualFile($storagePath = $sitePath.'/storage/app/public'.$storageUri)) {
! is_dir($storagePath)) {
return $storagePath; return $storagePath;
} }

2
cli/drivers/StatamicV1ValetDriver.php
View File

@@ -32,7 +32,7 @@ public function isStaticFile($sitePath, $siteName, $uri)
return false; return false;
} }
if (file_exists($staticFilePath = $sitePath.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.$uri)) {
return $staticFilePath; return $staticFilePath;
} }

4
cli/drivers/StatamicValetDriver.php
View File

@@ -29,9 +29,9 @@ public function isStaticFile($sitePath, $siteName, $uri)
return false; return false;
} elseif (strpos($uri, '/local') === 0 || strpos($uri, '/statamic') === 0) { } elseif (strpos($uri, '/local') === 0 || strpos($uri, '/statamic') === 0) {
return false; return false;
} elseif (file_exists($staticFilePath = $sitePath.$uri)) { } elseif ($this->isActualFile($staticFilePath = $sitePath.$uri)) {
return $staticFilePath; return $staticFilePath;
} elseif (file_exists($staticFilePath = $sitePath.'/public'.$uri)) { } elseif ($this->isActualFile($staticFilePath = $sitePath.'/public'.$uri)) {
return $staticFilePath; return $staticFilePath;
} }

2
cli/drivers/SymfonyValetDriver.php
View File

@@ -26,7 +26,7 @@ public function serves($sitePath, $siteName, $uri)
*/ */
public function isStaticFile($sitePath, $siteName, $uri) public function isStaticFile($sitePath, $siteName, $uri)
{ {
if (file_exists($staticFilePath = $sitePath.'/web/'.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.'/web/'.$uri)) {
return $staticFilePath; return $staticFilePath;
} }

11
cli/drivers/ValetDriver.php
View File

@@ -126,4 +126,15 @@ public function serveStaticFile($staticFilePath, $sitePath, $siteName, $uri)
readfile($staticFilePath); readfile($staticFilePath);
} }
/**
* Determine if the path is a file and not a directory.
*
* @param string $path
* @return bool
*/
protected function isActualFile($path)
{
return ! is_dir($path) && file_exists($path);
}
} }