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

Support isolated sites running PHP 7.4

cli/Valet/Brew.php

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

cli/Valet/Drivers/BasicValetDriver.php

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

cli/Valet/Drivers/BasicWithPublicValetDriver.php

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

cli/Valet/Drivers/LaravelValetDriver.php

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

cli/Valet/Drivers/Specific/BedrockValetDriver.php

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

cli/Valet/Drivers/Specific/CakeValetDriver.php

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

cli/Valet/Drivers/Specific/Concrete5ValetDriver.php

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

cli/Valet/Drivers/Specific/ContaoValetDriver.php

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

cli/Valet/Drivers/Specific/CraftValetDriver.php

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

cli/Valet/Drivers/Specific/DrupalValetDriver.php

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

cli/Valet/Drivers/Specific/KirbyValetDriver.php

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

cli/Valet/Drivers/Specific/Magento2ValetDriver.php

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

cli/Valet/Drivers/Specific/NeosValetDriver.php

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

cli/Valet/Drivers/Specific/StatamicV1ValetDriver.php

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

cli/Valet/Drivers/Specific/StatamicValetDriver.php

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

cli/Valet/Drivers/Specific/SymfonyValetDriver.php

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

cli/Valet/Drivers/Specific/Typo3ValetDriver.php

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

cli/Valet/Drivers/ValetDriver.php

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

cli/Valet/Server.php

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

cli/stubs/SampleValetDriver.php

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