Multiple/Parallel PHP Version Support for Valet #1192

NasirNobin · 2022-02-06T06:50:15Z

Update on Valet 3.0 (March 31, 2022)

This PR got merged and released as Valet 3.0 with some changes. The original valet use [email protected] --site=site.test syntax was replaced with a new command called valet isolate.

cd path/to/app
 
# Isolate the current project
valet isolate [email protected]


# Isolate a site by name
valet isolate [email protected] --site=laravel9x


# Remove isolation from current project
valet unisolate

Multiple/Parallel PHP Version Support for Valet

This pull request introduces an optional --site flag on the valet use command, that allows users to run multiple versions of PHP in parallel on different sites.

Btw, I build this feature to solve my very own problem. I need to constantly switch between PHP versions, as I need to switch between old and new projects. This is being very handy for me.

To isolate a site's PHP version, run:

valet use [email protected] --site=site.test

or pass the site directory's name

valet use [email protected] --site=site2

or cd into the site's directory then use . to use current directory:

valet use [email protected] --site .

Remove isolation for a site:

valet use default --site .

Here's a video showing this feature up and running

CleanShot.2022-02-04.at.19.06.52.mp4

Behind the scene:

Updates the FPM config file /etc/php/8.0/php-fpm.d/valet-fpm.conf and updates the listen parameter to something like: valet80.sock
Publishes an Nginx config file on the ~/.config/valet/Nginx location for that site.
Updates that specific Nginx config file and replaces the fastcgi_pass param with valet80.sock

Few other notes:

System default linked PHP will keep running on valet.sock as expected.
Global PHP switching commands like valet use [email protected] would still work as expected. Alongside, it will perform some operations on the isolated site's Nginx config to make sure those isolated sites still work as expected.
Running valet install or valet restart would do a scan on isolated sites to determine what versions of PHP are being used. So it can restart each version of PHP correctly.
SSL-enabled sites could be isolated with the usual command. (or isolated site can obtain SSL, as well)
Running valet unsecure on an isolated site will still keep the isolation and will remove the SSL.

Future todos:

Need to have another command to list all the isolated sites and their PHP versions. (would be handy to have that)
~~Ideally, we would need to have a way to remove isolation for a site (valet use default --site .)~~

This modification doesn't seem to break any existing test cases or any existing flows.

I tried to add tests for the new methods that were introduced in this PR.

NasirNobin · 2022-02-06T06:54:05Z

I'll fix the test cases/issues and maybe re-submit this pull request again.

NasirNobin · 2022-02-06T08:11:29Z

Fixed StyleCI and updated a few tests. Please feel free to suggest any other changes 👍

rana01645 · 2022-02-08T09:25:56Z

Wow.. That is really a very useful feature (isolating php version for different projects). I would really love to have it in valet as I use different project with different php version and every-time I need to switch php version while switching between projects which is painful :(

bashar94 · 2022-02-08T09:58:03Z

Thank you so much @NasirNobin you have saved my valuable time

MishukAdhikari · 2022-02-08T11:16:59Z

I was looking for this kind of solution it's not only saving time, saving lots of work too. Very excited to use it on the next release.

faisal4590 · 2022-02-08T11:20:58Z

This feature will be really helpful in lots of cases. Often I need to switch php version of my separate projects, but it was really cumbersome before. With this addition, life will be much better for us developers.

driesvints · 2022-02-08T11:22:27Z

Hey all, we realize a lot of you want this. Please give us some time to review is and use the thumbs up feature if you want this and not comments as it spams our notifications. Thanks.

driesvints · 2022-02-09T11:58:04Z

Locking this until we've had time to review this.

mattstauffer · 2022-02-14T17:39:00Z

I'm reading through the code now--thanks for your patience!--but one note, I think it's unwise for us to merge this until we at least have the "remove isolation" command you suggested in your future todo's.

Ideally, we would need to have a way to remove isolation for a site (maybe a command or a --rm flag?)

This is just an idea, but in my mind, what if we can basically say "use the default PHP version for this site"? I can imagine the syntax being something like this:

valet use default --site .

It's introducing a new syntax, "default", but it means we're keeping it in the same way of basically valet use {phpVersion} --site {siteDir} instead of introducing a new concept of "isolation" or something else that the user hasn't actually had to comprehend up to this point.

Any thoughts, from OP or anyone else?

NasirNobin · 2022-02-14T18:18:39Z

@mattstauffer thanks for the review and positive feedback, appreciate it!

valet use default --site . suggestion looks solid to me. I'll update the PR accordingly.

mattstauffer

I'm not even remotely done reading this but I have to go for today, so here is my first round of notes :) Great work here so far!!

cli/Valet/PhpFpm.php

cli/Valet/Site.php

Co-authored-by: Matt Stauffer <[email protected]>

…code review

NasirNobin

Thanks for the review and feedback. I tried to update the PR accordingly.

I'll be available to work on other suggestions as needed.

mattstauffer

I did another round of review. Once these changes are implemented I think I want to do one more high-level view over everything, then I'll test it out some.

Thanks so much for your hard work on this!

cli/Valet/PhpFpm.php

cli/Valet/Site.php

tests/PhpFpmTest.php

Co-authored-by: Matt Stauffer <[email protected]>

mattstauffer

I just re-read it after your latest round of changes, and it looks great with just one small change here! Please @ message me once you've added some tests, or if you need any help adding them.

THanks!

cli/Valet/PhpFpm.php

Co-authored-by: Matt Stauffer <[email protected]>

NasirNobin · 2022-02-18T00:04:57Z

Finishing the tests here. Mostly done. I'll do some self-review before pushing into this PR.

https://github.com/NasirNobin/valet/pull/5/files

NasirNobin · 2022-02-18T09:39:58Z

@mattstauffer I have tried to add tests around the new methods introduced in this PR. Please feel free to suggest changes as needed.

Also, if you think there's some certian scenario missing in the tests, please let me know. I'll be available.

mattstauffer

Fantastic work! Just a few typos here and there.

tests/SiteTest.php

tests/PhpFpmTest.php

Co-authored-by: Matt Stauffer <[email protected]>

NasirNobin · 2022-02-20T19:06:35Z

@mattstauffer Just checking if there's anything else needed from my side on this PR. Got an additional day off from work tomorrow, which I can totally spend on this.

mattstauffer · 2022-02-23T17:22:51Z

@NasirNobin Thanks for checking in! Let me read it again, but I think what I want after this point is review from someone who's not me :D let me ask around at Tighten to see if anyone has time and energy.

curder · 2022-03-09T08:18:20Z

Thanks for your PR, We need this future.

mattstauffer · 2022-03-10T15:45:21Z

I'll be doing hopefully a final review tomorrow afternoon, and if it goes well, merging and releasing. 🤞

mattstauffer

I reviewed this with a team of wonderful folks from Tighten and they had some ideas for refactors; don't worry, I'll take these on, but just note these potential refactors need to be addressed before release.

mattstauffer · 2022-03-11T18:36:38Z

cli/Valet/PhpFpm.php

+            return $this->fpmSockName($this->normalizePhpVersion($version));
+        })->unique();
+
+        return collect($this->files->scandir(VALET_HOME_PATH.'/Nginx'))


Potential future refactor here to:

Make it clearer that this map and then the later filter is really rejecting any without a custom valet sock file

Stop looking for future instances of any given sock file (e.g. valet74.sock) once you find it in one site config

cli/Valet/PhpFpm.php

mattstauffer · 2022-03-14T19:05:27Z

Thank you so much for your hard work on this, @NasirNobin! I'm going to tag your work (and mine combined in) as a 3.0.0 beta shortly.

NasirNobin · 2022-03-14T19:10:57Z

Thanks for the hard work from your side @mattstauffer. This was my very first open-source contribution, learned a lot.

Excited to see this feature being used by other Valet users!

mattstauffer · 2022-03-14T19:27:30Z

@NasirNobin For your first open source contribution, this was really great code and you were a wonderful collaborator on the changes I requested. Thank you so much, and really fantastic work!

NasirNobin closed this Feb 6, 2022

NasirNobin reopened this Feb 6, 2022

Multiple/Parallel PHP Version Support for Valet

37b4af4

NasirNobin force-pushed the master branch from 3d73ef6 to 37b4af4 Compare February 6, 2022 07:57

driesvints requested a review from mattstauffer February 7, 2022 08:03

laravel deleted a comment from deKuddus Feb 9, 2022

laravel locked and limited conversation to collaborators Feb 9, 2022

laravel unlocked this conversation Feb 14, 2022

mattstauffer requested changes Feb 14, 2022

View reviewed changes

NasirNobin and others added 5 commits February 15, 2022 02:05

Apply suggestions from code review

acf190c

Co-authored-by: Matt Stauffer <[email protected]>

Add Valet PHP isolation remover option & apply more suggestions from …

c247dc9

…code review

Stop unused PHP versions

8de8d9b

StyleCI Patch

794e366

Apply refactor & cleanup from the code review

5c10437

NasirNobin commented Feb 15, 2022

View reviewed changes

NasirNobin requested a review from mattstauffer February 15, 2022 11:12

mattstauffer requested changes Feb 15, 2022

View reviewed changes

NasirNobin and others added 2 commits February 16, 2022 11:21

Apply suggestions from code review

49ca4ae

Co-authored-by: Matt Stauffer <[email protected]>

Apply more suggestions from code review

3c83367

mattstauffer requested changes Feb 17, 2022

View reviewed changes

cli/Valet/PhpFpm.php Outdated Show resolved Hide resolved

Update cli/Valet/PhpFpm.php

cc41e3c

Co-authored-by: Matt Stauffer <[email protected]>

Tests for Parallel PHP Version Support

9a5d30b

NasirNobin requested a review from mattstauffer February 18, 2022 09:35

mattstauffer requested changes Feb 18, 2022

View reviewed changes

Apply suggestions from code review

7a80a2e

Co-authored-by: Matt Stauffer <[email protected]>

NasirNobin requested a review from mattstauffer February 19, 2022 02:21

iamroi mentioned this pull request Mar 7, 2022

feat: add support for multiple PHP services cretueusebiu/valet-windows#195

Open

mattstauffer requested changes Mar 11, 2022

View reviewed changes

This was referenced Mar 12, 2022

[WIP] Multiple/Parallel PHP Version Support for Valet -- Updated #1198

Merged

Update valet.sock to be a symlink to an existing valet{version}.sock file #1201

Merged

mattstauffer merged commit a34073e into laravel:master Mar 14, 2022

dima2306 mentioned this pull request Mar 15, 2022

Bug: Cannot switch PHP versions cpriego/valet-linux#349

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multiple/Parallel PHP Version Support for Valet #1192

Multiple/Parallel PHP Version Support for Valet #1192

NasirNobin commented Feb 6, 2022 •

edited

Loading

NasirNobin commented Feb 6, 2022

NasirNobin commented Feb 6, 2022

rana01645 commented Feb 8, 2022 •

edited

Loading

bashar94 commented Feb 8, 2022

MishukAdhikari commented Feb 8, 2022

faisal4590 commented Feb 8, 2022

driesvints commented Feb 8, 2022

driesvints commented Feb 9, 2022

mattstauffer commented Feb 14, 2022

NasirNobin commented Feb 14, 2022

mattstauffer left a comment

NasirNobin left a comment

mattstauffer left a comment

mattstauffer left a comment

NasirNobin commented Feb 18, 2022

NasirNobin commented Feb 18, 2022

mattstauffer left a comment

NasirNobin commented Feb 20, 2022

mattstauffer commented Feb 23, 2022

curder commented Mar 9, 2022

mattstauffer commented Mar 10, 2022

mattstauffer left a comment

mattstauffer Mar 11, 2022

mattstauffer commented Mar 14, 2022

NasirNobin commented Mar 14, 2022

mattstauffer commented Mar 14, 2022

Multiple/Parallel PHP Version Support for Valet #1192

Multiple/Parallel PHP Version Support for Valet #1192

Conversation

NasirNobin commented Feb 6, 2022 • edited Loading

Update on Valet 3.0 (March 31, 2022)

Multiple/Parallel PHP Version Support for Valet

To isolate a site's PHP version, run:

Remove isolation for a site:

Behind the scene:

Few other notes:

Future todos:

NasirNobin commented Feb 6, 2022

NasirNobin commented Feb 6, 2022

rana01645 commented Feb 8, 2022 • edited Loading

bashar94 commented Feb 8, 2022

MishukAdhikari commented Feb 8, 2022

faisal4590 commented Feb 8, 2022

driesvints commented Feb 8, 2022

driesvints commented Feb 9, 2022

mattstauffer commented Feb 14, 2022

NasirNobin commented Feb 14, 2022

mattstauffer left a comment

Choose a reason for hiding this comment

NasirNobin left a comment

Choose a reason for hiding this comment

mattstauffer left a comment

Choose a reason for hiding this comment

mattstauffer left a comment

Choose a reason for hiding this comment

NasirNobin commented Feb 18, 2022

NasirNobin commented Feb 18, 2022

mattstauffer left a comment

Choose a reason for hiding this comment

NasirNobin commented Feb 20, 2022

mattstauffer commented Feb 23, 2022

curder commented Mar 9, 2022

mattstauffer commented Mar 10, 2022

mattstauffer left a comment

Choose a reason for hiding this comment

mattstauffer Mar 11, 2022

Choose a reason for hiding this comment

mattstauffer commented Mar 14, 2022

NasirNobin commented Mar 14, 2022

mattstauffer commented Mar 14, 2022

NasirNobin commented Feb 6, 2022 •

edited

Loading

rana01645 commented Feb 8, 2022 •

edited

Loading