Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 49 commits into from
Mar 14, 2022
Merged

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

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
37b4af4
Multiple/Parallel PHP Version Support for Valet
NasirNobin Feb 6, 2022
acf190c
Apply suggestions from code review
NasirNobin Feb 14, 2022
c247dc9
Add Valet PHP isolation remover option & apply more suggestions from …
NasirNobin Feb 14, 2022
8de8d9b
Stop unused PHP versions
NasirNobin Feb 14, 2022
794e366
StyleCI Patch
NasirNobin Feb 14, 2022
5c10437
Apply refactor & cleanup from the code review
NasirNobin Feb 15, 2022
49ca4ae
Apply suggestions from code review
NasirNobin Feb 16, 2022
3c83367
Apply more suggestions from code review
NasirNobin Feb 16, 2022
cc41e3c
Update cli/Valet/PhpFpm.php
NasirNobin Feb 17, 2022
9a5d30b
Tests for Parallel PHP Version Support
NasirNobin Feb 18, 2022
7a80a2e
Apply suggestions from code review
NasirNobin Feb 19, 2022
a34073e
Merge branch 'master' of https://github.com/NasirNobin/valet into Nas…
mattstauffer Mar 12, 2022
eefc06b
Drop PHP 5.6; extract site-specific PHP version isolation to its own …
mattstauffer Mar 12, 2022
e797774
Apply fixes from StyleCI
StyleCIBot Mar 12, 2022
33c797f
Drop need to pass sock to isolate command
mattstauffer Mar 12, 2022
55c7dcb
Move string concat to one line
mattstauffer Mar 12, 2022
5aa253a
Move string concat to one line
mattstauffer Mar 12, 2022
0a677e2
Apply fixes from StyleCI
StyleCIBot Mar 12, 2022
c5903ee
Drop config files from new test layout
mattstauffer Mar 12, 2022
79da3e1
Merge branch 'NasirNobin-master' of github.com:laravel/valet into Nas…
mattstauffer Mar 12, 2022
5923548
Rename isolateDirectory
mattstauffer Mar 13, 2022
3570c74
Clean up PhpFPM readability
mattstauffer Mar 13, 2022
51742b3
Make primary valet.sock a symlink to an existing version
mattstauffer Mar 13, 2022
89fd8bc
Apply fixes from StyleCI
StyleCIBot Mar 13, 2022
7226da5
Update valet.sock symlink
mattstauffer Mar 14, 2022
530e4c3
Update normalizePhpVersion regex
mattstauffer Mar 14, 2022
34f776b
Re-work isolate and unisolate to run in cwd
mattstauffer Mar 14, 2022
4ab6f46
Merge branch 'mes/symlink-valet-socks' of github.com:laravel/valet in…
mattstauffer Mar 14, 2022
fd47384
Apply fixes from StyleCI
StyleCIBot Mar 14, 2022
148eb01
Drop test coverage for deprecated method
mattstauffer Mar 14, 2022
95aa039
Add command to list isolated sites
mattstauffer Mar 14, 2022
9b8c41e
Apply fixes from StyleCI
StyleCIBot Mar 14, 2022
10eeaea
Merge
mattstauffer Mar 14, 2022
8f7ea04
Test isolatedDirectories
mattstauffer Mar 14, 2022
38a1929
Apply fixes from StyleCI
StyleCIBot Mar 14, 2022
3cdb7c7
Drop space before colon in magic isolation string
mattstauffer Mar 14, 2022
8590d8e
Merge
mattstauffer Mar 14, 2022
118e0a3
Update str_contains to strpos
mattstauffer Mar 14, 2022
984d7eb
Add PHP Version to the isolated command
mattstauffer Mar 14, 2022
ce4682f
Fix PHPFpm tests
mattstauffer Mar 14, 2022
791a047
Apply fixes from StyleCI
StyleCIBot Mar 14, 2022
17cda5d
Drop todos
mattstauffer Mar 14, 2022
021dfe9
Merge branch 'mes/symlink-valet-socks' of github.com:laravel/valet in…
mattstauffer Mar 14, 2022
b8885a4
Move deleting valet.sock into install()
mattstauffer Mar 14, 2022
e4c7a9b
Symlink valet.sock *after* restarting so it's not deleted by restarti…
mattstauffer Mar 14, 2022
383aa62
Change magic isolation config string to "ISOLATED_PHP_VERSION"
mattstauffer Mar 14, 2022
80b7e61
Merge pull request #1201 from laravel/mes/symlink-valet-socks
mattstauffer Mar 14, 2022
b1d9b2b
Clean up
mattstauffer Mar 14, 2022
b09a916
Inline site check in unisolate command
mattstauffer Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [5.6, '7.0', 7.1, 7.2, 7.3, 7.4, '8.0', 8.1]
php: ['7.0', 7.1, 7.2, 7.3, 7.4, '8.0', 8.1]

name: PHP ${{ matrix.php }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ composer.lock
error.log
.idea
.phpunit.result.cache
tests/conf.d
2 changes: 0 additions & 2 deletions cli/Valet/Brew.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ class Brew
'[email protected]',
'[email protected]',
'[email protected]',
'[email protected]',
'php73',
'php72',
'php71',
'php70',
'php56',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably requires a new major version release?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@driesvints Yah.. good call, thank you.

];

const LATEST_PHP_VERSION = '[email protected]';
Expand Down
19 changes: 1 addition & 18 deletions cli/Valet/Nginx.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function installServer()
str_replace(
['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_STATIC_PREFIX'],
[VALET_HOME_PATH, VALET_SERVER_PATH, VALET_STATIC_PREFIX],
$this->replaceLoopback($this->files->get(__DIR__.'/../stubs/valet.conf'))
$this->site->replaceLoopback($this->files->get(__DIR__.'/../stubs/valet.conf'))
)
);

Expand All @@ -90,23 +90,6 @@ public function installServer()
);
}

public function replaceLoopback($siteConf)
{
$loopback = $this->configuration->read()['loopback'];

if ($loopback === VALET_LOOPBACK) {
return $siteConf;
}

$str = '#listen VALET_LOOPBACK:80; # valet loopback';

return str_replace(
$str,
substr(str_replace('VALET_LOOPBACK', $loopback, $str), 1),
$siteConf
);
}

/**
* Install the Nginx configuration directory to the ~/.config/valet directory.
*
Expand Down
Loading