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

Fix switching php versions not listening to error states #455

Merged
merged 4 commits into from
Feb 10, 2020
Merged

Fix switching php versions not listening to error states #455

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a605a0
Fix switching php versions not listening to error states
Neodork Feb 7, 2020
a4c7427
Fix typo in comment
Neodork Feb 7, 2020
799ecd5
Fix typo in comment
Neodork Feb 7, 2020
130b89d
Fix typo in PHP doc
Neodork Feb 7, 2020
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
73 changes: 69 additions & 4 deletions cli/Valet/PhpFpm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,85 @@ public function switchTo($version)
$this->brew->ensureInstalled(self::SUPPORTED_PHP_FORMULAE[$version]);
}

info("[php@$currentVersion] Unlinking");
output($this->cli->runAsUser('brew unlink ' . self::SUPPORTED_PHP_FORMULAE[$currentVersion]));
// Unlink the current PHP version.
if (!$this->unlinkPhp($currentVersion)) {
return;
}

// Relink libjpeg
info('[libjpeg] Relinking');
$this->cli->passthru('sudo ln -fs /usr/local/Cellar/jpeg/8d/lib/libjpeg.8.dylib /usr/local/opt/jpeg/lib/libjpeg.8.dylib');

info("[php@$version] Linking");
output($this->cli->runAsUser('brew link ' . self::SUPPORTED_PHP_FORMULAE[$version] . ' --force --overwrite'));
if (!$this->linkPHP($version, $currentVersion)) {
return;
}

$this->stop();
$this->install();
info("Valet is now using " . self::SUPPORTED_PHP_FORMULAE[$version]);
}

/**
* Link a PHP version to be used as binary.
*
* @param $version
* @param $currentVersion
* @return bool
*/
private function linkPhp($version, $currentVersion = null)
{
$isLinked = true;
info("[php@$version] Linking");
$output = $this->cli->runAsUser('brew link ' . self::SUPPORTED_PHP_FORMULAE[$version] . ' --force --overwrite', function () use (&$isLinked) {
$isLinked = false;
});

// The output is about how many symlinks were created.
// Sanitize the second half to prevent users from being confused.
// So the only output would be:
// Linking /usr/local/Cellar/[email protected]/7.3.8... 25 symlinks created
// Without the directions to create exports pointing towards the binaries.
if (strpos($output, 'symlinks created')) {
$output = substr($output, 0, strpos($output, 'symlinks created') + 8);
}
output($output);

if ($isLinked === false) {
warning("Could not link PHP version!" . PHP_EOL .
"There appears to be an issue with your PHP $version installation!" . PHP_EOL .
"See the output above for more information." . PHP_EOL);
}

if ($currentVersion !== null && $isLinked === false) {
info("Linking back to previous version to prevent broken installation!");
$this->linkPhp($currentVersion);
}

return $isLinked;
}

/**
* Unlink a PHP version, removing the binary symlink.
*
* @param $version
* @return bool
*/
private function unlinkPhp($version)
{
$isUnlinked = true;
info("[php@$version] Unlinking");
output($this->cli->runAsUser('brew unlink ' . self::SUPPORTED_PHP_FORMULAE[$version], function () use (&$isUnlinked) {
$isUnlinked = false;
}));
if ($isUnlinked === false) {
warning("Could not unlink PHP version!" . PHP_EOL .
"There appears to be an issue with your PHP $version installation!" . PHP_EOL .
"See the output above for more information.");
}

return $isUnlinked;
}

/**
* @deprecated Deprecated in favor of Pecl#installExtension();
*
Expand Down