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

Merge pull request #1328 from laravel/mes/support-isolated-php-74

Browse Source 
Support isolated sites running PHP 7.4
This commit is contained in:
Matt Stauffer
2022-12-26 09:56:39 -05:00
committed by GitHub
parent 80498c0234 976339f898
commit e60d039bd3
20 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cli/Valet/Brew.php
View File

@@ -13,6 +13,7 @@ class Brew
'php@8.2',
'php@8.1',
'php@8.0',
'php@7.4',
];
const BREW_DISABLE_AUTO_CLEANUP = 'HOMEBREW_NO_INSTALL_CLEANUP=1';
const LATEST_PHP_VERSION = 'php@8.2';

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

@@ -40,7 +40,7 @@ public function beforeLoading(string $sitePath, string $siteName, string $uri):
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if (file_exists($staticFilePath = $sitePath.rtrim($uri, '/').'/index.html')) {
return $staticFilePath;

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

@@ -25,7 +25,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
$publicPath = $sitePath.'/public/'.trim($uri, '/');

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

@@ -42,7 +42,7 @@ public function beforeLoading(string $sitePath, string $siteName, string $uri):
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if (file_exists($staticFilePath = $sitePath.'/public'.$uri)
&& is_file($staticFilePath)) {

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

@@ -45,7 +45,7 @@ public function beforeLoading(string $sitePath, string $siteName, string $uri):
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
$staticFilePath = $sitePath.'/web'.$uri;

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

@@ -27,7 +27,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if ($this->isActualFile($staticFilePath = $sitePath.'/webroot/'.$uri)) {
return $staticFilePath;

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

@@ -27,7 +27,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if (stripos($uri, '/application/files') === 0) {
return $sitePath.$uri;

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

@@ -27,7 +27,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if ($this->isActualFile($staticFilePath = $sitePath.'/web'.$uri)) {
return $staticFilePath;

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

@@ -47,7 +47,7 @@ public function frontControllerDirectory($sitePath)
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
$frontControllerDirectory = $this->frontControllerDirectory($sitePath);

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

@@ -38,7 +38,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
$sitePath = $this->addSubdirectory($sitePath);

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

@@ -27,7 +27,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if ($this->isActualFile($staticFilePath = $sitePath.$uri)) {
return $staticFilePath;

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

@@ -34,7 +34,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
$this->checkMageMode($sitePath);

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

@@ -43,7 +43,7 @@ public function beforeLoading(string $sitePath, string $siteName, string $uri):
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if ($this->isActualFile($staticFilePath = $sitePath.'/Web'.$uri)) {
return $staticFilePath;

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

@@ -27,7 +27,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if (strpos($uri, '/_add-ons') === 0 || strpos($uri, '/_app') === 0 || strpos($uri, '/_content') === 0 ||
strpos($uri, '/_cache') === 0 || strpos($uri, '/_config') === 0 || strpos($uri, '/_logs') === 0 ||

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

@@ -27,7 +27,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if (strpos($uri, '/site') === 0 && strpos($uri, '/site/themes') !== 0) {
return false;

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

@@ -29,7 +29,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if ($this->isActualFile($staticFilePath = $sitePath.'/web/'.$uri)) {
return $staticFilePath;

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

@@ -86,7 +86,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
// May the file contains a cache busting version string like filename.12345678.css
// If that is the case, the file cannot be found on disk, so remove the version

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

@@ -27,7 +27,9 @@ abstract public function serves(string $sitePath, string $siteName, string $uri)
* @param string $uri
* @return string|false
*/
abstract public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false;
// While we support PHP 7.4 for individual site isolation...
abstract public function isStaticFile(string $sitePath, string $siteName, string $uri);
//abstract public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false;
/**
* Get the fully resolved path to the application's front controller.

6
cli/Valet/Server.php
View File

@@ -4,13 +4,17 @@
class Server
{
// Skip constructor promotion until we stop supporting PHP@7.4 isolation
public $config;
/**
* Create a new Server instance.
*
* @param array $config
*/
public function __construct(public array $config)
public function __construct(array $config)
{
$this->config = $config;
}
/**

2
cli/stubs/SampleValetDriver.php
View File

@@ -31,7 +31,7 @@ public function serves(string $sitePath, string $siteName, string $uri): bool
* @param string $uri
* @return string|false
*/
public function isStaticFile(string $sitePath, string $siteName, string $uri): string|false
public function isStaticFile(string $sitePath, string $siteName, string $uri)
{
if (file_exists($staticFilePath = $sitePath.'/public/'.$uri)) {
return $staticFilePath;