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

Move string concat to one line

Browse Source
This commit is contained in:
Matt Stauffer
2022-03-12 00:23:35 -05:00
parent 55c7dcb99d e797774ade
commit 5aa253ad6d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli/Valet/PhpFpm.php
View File

@@ -71,7 +71,7 @@ public function uninstall()
/**
* Create (or re-create) the PHP FPM configuration files.
* Writes FPM config file, pointing to the correct .sock file, and log and ini files
* Writes FPM config file, pointing to the correct .sock file, and log and ini files.
*
* @param string|null $phpVersion
* @return void
@@ -93,7 +93,7 @@ public function createConfigurationFiles($phpVersion = null)
$this->files->put($fpmConfigFile, $contents);
// Set log and ini files
$destDir = dirname(dirname($fpmConfigFile)) . '/conf.d';
$destDir = dirname(dirname($fpmConfigFile)).'/conf.d';
$this->files->ensureDirExists($destDir, user());
$contents = $this->files->get(__DIR__.'/../stubs/php-memory-limits.ini');
@@ -191,7 +191,7 @@ public function stopIfUnused($phpVersion = null)
*/
public function isolateDirectoryToVersion($directory, $version)
{
if (!$site = $this->site->getSiteUrl($directory)) {
if (! $site = $this->site->getSiteUrl($directory)) {
throw new DomainException("The [{$directory}] site could not be found in Valet's site list.");
}
@@ -212,7 +212,7 @@ public function isolateDirectoryToVersion($directory, $version)
}
/**
* Remove PHP version isolation for a given directory
* Remove PHP version isolation for a given directory.
*
* @param string $directory
* @return void
@@ -300,7 +300,7 @@ public function normalizePhpVersion($version)
{
// @todo There's probably a way to incorporate this into the regex
if (strpos($version, 'php') === false) {
$version = 'php' . $version;
$version = 'php'.$version;
}
return preg_replace('/(php)([0-9+])(?:.)?([0-9+])/i', '$1@$2.$3', $version);
@@ -309,7 +309,7 @@ public function normalizePhpVersion($version)
/**
* Validate the requested version to be sure we can support it.
*
* @param string $version
* @param string $version
* @return string
*/
public function validateRequestedVersion($version)

1
tests/BrewTest.php
View File

@@ -154,7 +154,6 @@ public function test_linked_php_returns_linked_php_formula_name()
$files = Mockery::mock(Filesystem::class);
$files->shouldReceive('readLink')->once()->with(BREW_PREFIX.'/bin/php')->andReturn('/test/path/php72/7.2.9_2/test');
$this->assertSame('php@7.2', $getBrewMock($files)->linkedPhp());
}
public function test_linked_php_throws_exception_if_no_php_link()