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

Change magic isolation config string to "ISOLATED_PHP_VERSION"

Browse Source 
Co-Authored-By: Jacob Baker-Kretzmar <18192441+bakerkretzmar@users.noreply.github.com>
This commit is contained in:
Matt Stauffer
2022-03-14 14:40:45 -04:00
parent e4c7a9b3e5
commit 383aa62137
6 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/SiteTest.php
View File

@@ -659,13 +659,13 @@ public function test_can_install_nginx_site_config_for_specific_php_version()
$files->shouldReceive('get')
->once()
->with($siteMock->nginxPath('site1.test'))
->andReturn('# Valet isolated PHP version: php@7.4'.PHP_EOL.'server { fastcgi_pass: valet74.sock }');
->andReturn('# '.ISOLATED_PHP_VERSION.'=php@7.4'.PHP_EOL.'server { fastcgi_pass: valet74.sock }');
$files->shouldReceive('putAsUser')
->once()
->withArgs([
$siteMock->nginxPath('site1.test'),
'# Valet isolated PHP version: php@8.0'.PHP_EOL.'server { fastcgi_pass: valet80.sock }',
'# '.ISOLATED_PHP_VERSION.'=php@8.0'.PHP_EOL.'server { fastcgi_pass: valet80.sock }',
]);
$siteMock->isolate('site1.test', 'php@8.0');
@@ -682,7 +682,7 @@ public function test_can_install_nginx_site_config_for_specific_php_version()
->withArgs([
$siteMock->nginxPath('site2.test'),
Mockery::on(function ($argument) {
return preg_match('/^# Valet isolated PHP version: php@8.0/', $argument)
return preg_match('/^# '.ISOLATED_PHP_VERSION.'=php@8.0/', $argument)
&& preg_match('#fastcgi_pass "unix:.*/valet80.sock#', $argument)
&& strpos($argument, 'server_name site2.test www.site2.test *.site2.test;') !== false;
}),
@@ -733,7 +733,7 @@ public function test_retrieves_custom_php_version_from_nginx_config()
$files->shouldReceive('get')
->once()
->with($siteMock->nginxPath('site1.test'))
->andReturn('# Valet isolated PHP version: php@7.4');
->andReturn('# '.ISOLATED_PHP_VERSION.'=php@7.4');
$this->assertEquals('74', resolve(Site::class)->customPhpVersion('site1.test'));
// Site without any custom nginx config
@@ -757,28 +757,28 @@ public function test_replace_sock_file_in_nginx_config()
// When switching to php71, valet71.sock should be replaced with valet.sock;
// isolation header should be prepended
$this->assertEquals(
'# Valet isolated PHP version: 71'.PHP_EOL.'server { fastcgi_pass: valet71.sock }',
'# '.ISOLATED_PHP_VERSION.'=71'.PHP_EOL.'server { fastcgi_pass: valet71.sock }',
$site->replaceSockFile('server { fastcgi_pass: valet71.sock }', '71')
);
// When switching to php72, valet.sock should be replaced with valet72.sock
$this->assertEquals(
'# Valet isolated PHP version: 72'.PHP_EOL.'server { fastcgi_pass: valet72.sock }',
'# '.ISOLATED_PHP_VERSION.'=72'.PHP_EOL.'server { fastcgi_pass: valet72.sock }',
$site->replaceSockFile('server { fastcgi_pass: valet.sock }', '72')
);
// When switching to php73 from php72, valet72.sock should be replaced with valet73.sock;
// isolation header should be updated to php@7.3
$this->assertEquals(
'# Valet isolated PHP version: 73'.PHP_EOL.'server { fastcgi_pass: valet73.sock }',
$site->replaceSockFile('# Valet isolated PHP version: 72'.PHP_EOL.'server { fastcgi_pass: valet72.sock }', '73')
'# '.ISOLATED_PHP_VERSION.'=73'.PHP_EOL.'server { fastcgi_pass: valet73.sock }',
$site->replaceSockFile('# '.ISOLATED_PHP_VERSION.'=72'.PHP_EOL.'server { fastcgi_pass: valet72.sock }', '73')
);
// When switching to php72 from php74, valet72.sock should be replaced with valet74.sock;
// isolation header should be updated to php@7.4
$this->assertEquals(
'# Valet isolated PHP version: php@7.4'.PHP_EOL.'server { fastcgi_pass: valet74.sock }',
$site->replaceSockFile('# Valet isolated PHP version: 72'.PHP_EOL.'server { fastcgi_pass: valet.sock }', 'php@7.4')
'# '.ISOLATED_PHP_VERSION.'=php@7.4'.PHP_EOL.'server { fastcgi_pass: valet74.sock }',
$site->replaceSockFile('# '.ISOLATED_PHP_VERSION.'=72'.PHP_EOL.'server { fastcgi_pass: valet.sock }', 'php@7.4')
);
}