phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 00:20:08 +01:00
Code Activity

Merge pull request #1428 from mcaskill/improve-link-subcommands

Browse Source 
Fix link command's `--isolate` argument with custom name
This commit is contained in:
Matt Stauffer
2023-09-25 12:55:01 -04:00
committed by GitHub
parent 228834819e f9ee253db3
commit eb0bc01d9f
3 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tests/CliTest.php
View File

@@ -10,6 +10,7 @@
use Valet\Nginx;
use Valet\Ngrok;
use Valet\PhpFpm;
use function Valet\resolve;
use Valet\Site as RealSite;
use Valet\Valet;
@@ -254,6 +255,70 @@ public function test_link_command_with_secure_flag_secures()
$this->assertStringContainsString('site has been secured', $tester->getDisplay());
}
public function test_link_command_with_isolate_flag_isolates()
{
[$app, $tester] = $this->appAndTester();
$cwd = getcwd();
$name = 'tighten';
$host = $name.'.test';
$customPhpVersion = '82';
$phpRcVersion = '8.2';
$fullPhpVersion = 'php@8.2';
$brewMock = Mockery::mock(Brew::class);
$nginxMock = Mockery::mock(Nginx::class);
$siteMock = Mockery::mock(RealSite::class);
$phpFpmMock = Mockery::mock(PhpFpm::class, [
$brewMock,
resolve(CommandLine::class),
resolve(Filesystem::class),
resolve(RealConfiguration::class),
$siteMock,
$nginxMock,
])->makePartial();
swap(Brew::class, $brewMock);
swap(Nginx::class, $nginxMock);
swap(PhpFpm::class, $phpFpmMock);
swap(RealSite::class, $siteMock);
$brewMock->shouldReceive('supportedPhpVersions')->andReturn(collect([
'php@8.2',
'php@8.1',
]));
$brewMock->shouldReceive('ensureInstalled')->with($fullPhpVersion, [], $phpFpmMock->taps);
$brewMock->shouldReceive('installed')->with($fullPhpVersion);
$brewMock->shouldReceive('determineAliasedVersion')->with($fullPhpVersion)->andReturn($fullPhpVersion);
$siteMock->shouldReceive('link')->with($cwd, $name)->once();
$siteMock->shouldReceive('getSiteUrl')->with($name)->andReturn($host);
$siteMock->shouldReceive('phpRcVersion')->with($name, $cwd)->andReturn($phpRcVersion);
$siteMock->shouldReceive('customPhpVersion')->with($host)->andReturn($customPhpVersion);
$siteMock->shouldReceive('isolate')->with($host, $fullPhpVersion);
$phpFpmMock->shouldReceive('stopIfUnused')->with($customPhpVersion)->once();
$phpFpmMock->shouldReceive('createConfigurationFiles')->with($fullPhpVersion)->once();
$phpFpmMock->shouldReceive('restart')->with($fullPhpVersion)->once();
$nginxMock->shouldReceive('restart')->once();
// These should only run when doing global PHP switches
$brewMock->shouldNotReceive('stopService');
$brewMock->shouldNotReceive('link');
$brewMock->shouldNotReceive('unlink');
$phpFpmMock->shouldNotReceive('stopRunning');
$phpFpmMock->shouldNotReceive('install');
$tester->run(['command' => 'link', 'name' => 'tighten', '--isolate' => true]);
$tester->assertCommandIsSuccessful();
$this->assertStringContainsString('is now using '.$fullPhpVersion, $tester->getDisplay());
}
public function test_links_command()
{
[$app, $tester] = $this->appAndTester();