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

fix(php-fpm): correct socket creation

While my PR #1514 fixed recreating the FPM configs, it introduced a different issue:

Due to the use of `utilizedPhpVersions()`, the code now also configured the FPM config for the alias `php` version.
This caused it to invoke the configure function with an empty version string and thus overwriting the FPM config for (in my case) the php@8.4 config templated with `valet.sock` instead of the correct `valet84.sock`.

The nginx sites that were configured to proxy their requests to the `valet84.sock` then failed because it did not exist anymore.

We fixed this by always including the actual linked PHP version via the `linkedPhp` function. This returns `php8.4` instead of `php`.

`php` is an alias anyway and this also removes another unnecessary service restart call. Previously, this would also try to restart the `php` service via brew which was already restarted through the restart of `php@8.4`, which is an alias in brew.

This also fixes an issue with the previous PR, to correctly symlink `valet.sock` again to the linked PHP version, which we oversaw.
This commit is contained in:
Saibotk
2025-04-25 22:51:57 +02:00
parent 2c6a9357f2
commit 0525673051
3 changed files with 5 additions and 4 deletions

View File

@@ -122,7 +122,7 @@ public function test_utilized_php_versions()
'php@7.4',
]));
$brewMock->shouldReceive('getLinkedPhpFormula')->andReturn('php@7.3');
$brewMock->shouldReceive('linkedPhp')->andReturn('php@7.3');
$nginxMock->shouldReceive('configuredSites')
->once()