Merge branch 'master' into cloudflared

Sergii Kauk · web-flow · commit dce6b3ca6ef3 · 2024-07-30T10:53:52.000+02:00
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yml b/.github/ISSUE_TEMPLATE/1_Bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug Report
-description: "Report a general library issue."
+description: "Report something that's broken."
 body:
   - type: markdown
     attributes:
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -1,6 +1,10 @@
 name: fix code styling
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
 
 jobs:
   lint:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,29 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/valet/compare/v4.6.1...master)
+## [Unreleased](https://github.com/laravel/valet/compare/v4.7.1...master)
+
+## [v4.7.1](https://github.com/laravel/valet/compare/v4.7.0...v4.7.1) - 2024-06-25
+
+* Require Trusting CA when securing sites by [@adrum](https://github.com/adrum) in https://github.com/laravel/valet/pull/1488
+
+## [v4.7.0](https://github.com/laravel/valet/compare/v4.6.3...v4.7.0) - 2024-06-18
+
+* Trust CA Certificate only by [@adrum](https://github.com/adrum) in https://github.com/laravel/valet/pull/1463
+* Allow specifying php version to restart by [@N-Silbernagel](https://github.com/N-Silbernagel) in https://github.com/laravel/valet/pull/1469
+* Update KirbyValetDriver.php by [@Werbschaft](https://github.com/Werbschaft) in https://github.com/laravel/valet/pull/1471
+* fix: Warning: Constant VALET_* already defined in X by [@NickSdot](https://github.com/NickSdot) in https://github.com/laravel/valet/pull/1485
+* Add values() call to reset keys after modifying paths by [@adriaanzon](https://github.com/adriaanzon) in https://github.com/laravel/valet/pull/1477
+* Adding support for Nette Framework. by [@antonL95](https://github.com/antonL95) in https://github.com/laravel/valet/pull/1486
+
+## [v4.6.3](https://github.com/laravel/valet/compare/v4.6.2...v4.6.3) - 2024-05-21
+
+* add server name to valet.conf by [@Oleg339](https://github.com/Oleg339) in https://github.com/laravel/valet/pull/1458
+
+## [v4.6.2](https://github.com/laravel/valet/compare/v4.6.1...v4.6.2) - 2024-05-07
+
+* Add quotes around $PHP by [@drbyte](https://github.com/drbyte) in https://github.com/laravel/valet/pull/1473
+* Support Illuminate:11 and Symfony:7 by [@drbyte](https://github.com/drbyte) in https://github.com/laravel/valet/pull/1481
+* Ignore invalid paths by [@ahmedash95](https://github.com/ahmedash95) in https://github.com/laravel/valet/pull/1478
 
 ## [v4.6.1](https://github.com/laravel/valet/compare/v4.6.0...v4.6.1) - 2024-01-01
 
diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php
@@ -38,9 +38,7 @@ class Brew
 
     const BREW_DISABLE_AUTO_CLEANUP = 'HOMEBREW_NO_INSTALL_CLEANUP=1';
 
-    public function __construct(public CommandLine $cli, public Filesystem $files)
-    {
-    }
+    public function __construct(public CommandLine $cli, public Filesystem $files) {}
 
     /**
      * Ensure the formula exists in the current Homebrew configuration.
diff --git a/cli/Valet/CommandLine.php b/cli/Valet/CommandLine.php
@@ -51,8 +51,7 @@ public function runAsUser(string $command, ?callable $onError = null): string
      */
     public function runCommand(string $command, ?callable $onError = null): string
     {
-        $onError = $onError ?: function () {
-        };
+        $onError = $onError ?: function () {};
 
         // Symfony's 4.x Process component has deprecated passing a command string
         // to the constructor, but older versions (which Valet's Composer
diff --git a/cli/Valet/Composer.php b/cli/Valet/Composer.php
@@ -6,9 +6,7 @@
 
 class Composer
 {
-    public function __construct(public CommandLine $cli)
-    {
-    }
+    public function __construct(public CommandLine $cli) {}
 
     public function installed(string $namespacedPackage): bool
     {
diff --git a/cli/Valet/Configuration.php b/cli/Valet/Configuration.php
@@ -4,9 +4,7 @@
 
 class Configuration
 {
-    public function __construct(public Filesystem $files)
-    {
-    }
+    public function __construct(public Filesystem $files) {}
 
     /**
      * Install the Valet configuration file.
@@ -117,7 +115,7 @@ public function addPath(string $path, bool $prepend = false): void
         $this->write(tap($this->read(), function (&$config) use ($path, $prepend) {
             $method = $prepend ? 'prepend' : 'push';
 
-            $config['paths'] = collect($config['paths'])->{$method}($path)->unique()->all();
+            $config['paths'] = collect($config['paths'])->{$method}($path)->unique()->values()->all();
         }));
     }
 
diff --git a/cli/Valet/Diagnose.php b/cli/Valet/Diagnose.php
@@ -55,9 +55,7 @@ class Diagnose
 
     public $progressBar;
 
-    public function __construct(public CommandLine $cli, public Filesystem $files)
-    {
-    }
+    public function __construct(public CommandLine $cli, public Filesystem $files) {}
 
     /**
      * Run diagnostics.
diff --git a/cli/Valet/DnsMasq.php b/cli/Valet/DnsMasq.php
@@ -10,9 +10,7 @@ class DnsMasq
 
     public $resolverPath = '/etc/resolver';
 
-    public function __construct(public Brew $brew, public CommandLine $cli, public Filesystem $files, public Configuration $configuration)
-    {
-    }
+    public function __construct(public Brew $brew, public CommandLine $cli, public Filesystem $files, public Configuration $configuration) {}
 
     /**
      * Install and configure DnsMasq.
diff --git a/cli/Valet/Drivers/Specific/KirbyValetDriver.php b/cli/Valet/Drivers/Specific/KirbyValetDriver.php
@@ -48,6 +48,17 @@ public function frontControllerPath(string $sitePath, string $siteName, string $
             $indexPath = $sitePath.'/panel/index.php';
         }
 
+        // add this block
+        if (preg_match('/^\/(?!(kirby|site|content)\/).+\.php$/', $uri)) {
+            if (
+                $this->isActualFile($sitePath.$uri) ||
+                $isAboveWebroot && $this->isActualFile($sitePath.'/public'.$uri)
+            ) {
+                $scriptName = $uri;
+                $indexPath = $sitePath.$scriptName;
+            }
+        }
+
         $sitePathPrefix = ($isAboveWebroot) ? $sitePath.'/public' : $sitePath;
 
         $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
diff --git a/cli/Valet/Drivers/Specific/NetteValetDriver.php b/cli/Valet/Drivers/Specific/NetteValetDriver.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Valet\Drivers\Specific;
+
+use Valet\Drivers\ValetDriver;
+
+class NetteValetDriver extends ValetDriver
+{
+    /**
+     * Determine if the driver serves the request.
+     */
+    public function serves(string $sitePath, string $siteName, string $uri): bool
+    {
+        return file_exists($sitePath.'/www/index.php')
+            && file_exists($sitePath.'/www/.htaccess')
+            && file_exists($sitePath.'/config/common.neon')
+            && file_exists($sitePath.'/config/services.neon');
+    }
+
+    /**
+     * Determine if the incoming request is for a static file.
+     */
+    public function isStaticFile(string $sitePath, string $siteName, string $uri)/*: string|false */
+    {
+        if ($this->isActualFile($staticFilePath = $sitePath.'/www/'.$uri)) {
+            return $staticFilePath;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the fully resolved path to the application's front controller.
+     */
+    public function frontControllerPath(string $sitePath, string $siteName, string $uri): ?string
+    {
+        $_SERVER['DOCUMENT_ROOT'] = $sitePath.'/www';
+        $_SERVER['SCRIPT_FILENAME'] = $sitePath.'/www/index.php';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['PHP_SELF'] = '/index.php';
+
+        return $sitePath.'/www/index.php';
+    }
+}
diff --git a/cli/Valet/Expose.php b/cli/Valet/Expose.php
@@ -7,9 +7,7 @@
 
 class Expose
 {
-    public function __construct(public Composer $composer, public CommandLine $cli)
-    {
-    }
+    public function __construct(public Composer $composer, public CommandLine $cli) {}
 
     public function currentTunnelUrl(?string $domain = null): ?string
     {
diff --git a/cli/Valet/Nginx.php b/cli/Valet/Nginx.php
@@ -10,9 +10,7 @@ class Nginx
     const NGINX_CONF = BREW_PREFIX.'/etc/nginx/nginx.conf';
 
     public function __construct(public Brew $brew, public CommandLine $cli, public Filesystem $files,
-        public Configuration $configuration, public Site $site)
-    {
-    }
+        public Configuration $configuration, public Site $site) {}
 
     /**
      * Install the configuration files for Nginx.
diff --git a/cli/Valet/Ngrok.php b/cli/Valet/Ngrok.php
@@ -13,9 +13,7 @@ class Ngrok
         'http://127.0.0.1:4041/api/tunnels',
     ];
 
-    public function __construct(public CommandLine $cli, public Brew $brew)
-    {
-    }
+    public function __construct(public CommandLine $cli, public Brew $brew) {}
 
     /**
      * Get the current tunnel URL from the Ngrok API.
diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php
@@ -12,9 +12,7 @@ class PhpFpm
         'shivammathur/php',
     ];
 
-    public function __construct(public Brew $brew, public CommandLine $cli, public Filesystem $files, public Configuration $config, public Site $site, public Nginx $nginx)
-    {
-    }
+    public function __construct(public Brew $brew, public CommandLine $cli, public Filesystem $files, public Configuration $config, public Site $site, public Nginx $nginx) {}
 
     /**
      * Install and configure PhpFpm.
diff --git a/cli/Valet/Server.php b/cli/Valet/Server.php
@@ -160,6 +160,10 @@ public function sitePath(string $siteName): ?string
         $domain = static::domainFromSiteName($siteName);
 
         foreach ($this->config['paths'] as $path) {
+            if (! is_dir($path)) {
+                continue;
+            }
+
             $handle = opendir($path);
 
             if ($handle === false) {
diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php
@@ -9,9 +9,7 @@
 
 class Site
 {
-    public function __construct(public Brew $brew, public Configuration $config, public CommandLine $cli, public Filesystem $files)
-    {
-    }
+    public function __construct(public Brew $brew, public Configuration $config, public CommandLine $cli, public Filesystem $files) {}
 
     /**
      * Get the name of the site.
@@ -477,17 +475,18 @@ public function secure(string $url, ?string $siteConf = null, int $certificateEx
         // Extract in order to later preserve custom PHP version config when securing
         $phpVersion = $this->customPhpVersion($url);
 
-        $this->unsecure($url);
-
+        // Create the CA if it doesn't exist.
+        // If the user cancels the trust operation, the old certificate will not be removed.
         $this->files->ensureDirExists($this->caPath(), user());
+        $caExpireInDate = (new \DateTime())->diff(new \DateTime("+{$caExpireInYears} years"));
+        $this->createCa($caExpireInDate->format('%a'));
+
+        $this->unsecure($url);
 
         $this->files->ensureDirExists($this->certificatesPath(), user());
 
         $this->files->ensureDirExists($this->nginxPath(), user());
 
-        $caExpireInDate = (new \DateTime())->diff(new \DateTime("+{$caExpireInYears} years"));
-
-        $this->createCa($caExpireInDate->format('%a'));
         $this->createCertificate($url, $certificateExpireInDays);
 
         $siteConf = $this->buildSecureNginxServer($url, $siteConf);
@@ -525,6 +524,15 @@ public function createCa(int $caExpireInDays): void
         $caKeyPath = $this->caPath('LaravelValetCASelfSigned.key');
 
         if ($this->files->exists($caKeyPath) && $this->files->exists($caPemPath)) {
+
+            $isTrusted = $this->cli->run(sprintf(
+                'security verify-cert -c "%s"', $caPemPath
+            ));
+
+            if (strpos($isTrusted, '...certificate verification successful.') === false) {
+                $this->trustCa($caPemPath);
+            }
+
             return;
         }
 
@@ -607,8 +615,6 @@ public function createCertificate(string $url, int $caExpireInDays): void
                 $caExpireInDays, $caPemPath, $caKeyPath, $caSrlParam, $csrPath, $crtPath, $confPath
             ));
         }
-
-        $this->trustCertificate($crtPath);
     }
 
     /**
@@ -635,9 +641,14 @@ public function createSigningRequest(string $url, string $keyPath, string $csrPa
      */
     public function trustCa(string $caPemPath): void
     {
-        $this->cli->run(sprintf(
-            'sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain "%s"', $caPemPath
+        info('Trusting Laravel Valet Certificate Authority...');
+        $result = $this->cli->run(sprintf(
+            'sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain "%s"',
+            $caPemPath
         ));
+        if ($result) {
+            throw new DomainException('The Certificate Authority must be trusted. Please run the command again.');
+        }
     }
 
     /**
diff --git a/cli/Valet/Status.php b/cli/Valet/Status.php
@@ -10,9 +10,7 @@ class Status
 
     public $debugInstructions = [];
 
-    public function __construct(public Configuration $config, public Brew $brew, public CommandLine $cli, public Filesystem $files)
-    {
-    }
+    public function __construct(public Configuration $config, public Brew $brew, public CommandLine $cli, public Filesystem $files) {}
 
     /**
      * Check the status of the entire Valet ecosystem and return a status boolean
diff --git a/cli/Valet/Upgrader.php b/cli/Valet/Upgrader.php
@@ -7,9 +7,7 @@
 
 class Upgrader
 {
-    public function __construct(public Filesystem $files)
-    {
-    }
+    public function __construct(public Filesystem $files) {}
 
     /**
      * Run all the upgrades that should be run every time Valet commands are run.
diff --git a/cli/Valet/Valet.php b/cli/Valet/Valet.php
@@ -8,9 +8,7 @@ class Valet
 {
     public $valetBin = BREW_PREFIX.'/bin/valet';
 
-    public function __construct(public CommandLine $cli, public Filesystem $files)
-    {
-    }
+    public function __construct(public CommandLine $cli, public Filesystem $files) {}
 
     /**
      * Symlink the Valet Bash script into the user's local bin.
diff --git a/cli/app.php b/cli/app.php
@@ -33,7 +33,7 @@
  */
 Container::setInstance(new Container);
 
-$version = '4.6.1';
+$version = '4.7.1';
 
 $app = new Application('Laravel Valet', $version);
 
@@ -499,6 +499,13 @@ function (ConsoleCommandEvent $event) {
                 return info('PHP has been restarted.');
         }
 
+        // Handle restarting specific PHP version (e.g. `valet restart php@8.2`)
+        if (str_contains($service, 'php')) {
+            PhpFpm::restart($normalized = PhpFpm::normalizePhpVersion($service));
+
+            return info($normalized.' has been restarted.');
+        }
+
         return warning(sprintf('Invalid valet service name [%s]', $service));
     })->descriptions('Restart the Valet services');
 
diff --git a/cli/includes/facades.php b/cli/includes/facades.php
diff --git a/cli/stubs/valet.conf b/cli/stubs/valet.conf
diff --git a/composer.json b/composer.json
diff --git a/server.php b/server.php
diff --git a/tests/CliTest.php b/tests/CliTest.php
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
diff --git a/valet b/valet

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ public function runAsUser(string $command, ?callable $onError = null): string`
`51`	`51`	`*/`
`52`	`52`	`public function runCommand(string $command, ?callable $onError = null): string`
`53`	`53`	`{`
`54`		`- $onError = $onError ?: function () {`
`55`		`- };`
	`54`	`+ $onError = $onError ?: function () {};`
`56`	`55`
`57`	`56`	`// Symfony's 4.x Process component has deprecated passing a command string`
`58`	`57`	`// to the constructor, but older versions (which Valet's Composer`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,7 @@`
`6`	`6`
`7`	`7`	`class Composer`
`8`	`8`	`{`
`9`		`- public function __construct(public CommandLine $cli)`
`10`		`- {`
`11`		`- }`
	`9`	`+ public function __construct(public CommandLine $cli) {}`
`12`	`10`
`13`	`11`	`public function installed(string $namespacedPackage): bool`
`14`	`12`	`{`