Skip to content

Fix: Prevent extra-options from being overwritten #1353

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

Open
PPP01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Prevent extra-options from being overwritten #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/PhpBrew/Build.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
* A build object contains version information,
* variant configuration,
* paths and an build identifier (BuildId).
*
* @method array getEnabledVariants()
* @method array getDisabledVariants()
* @method bool isEnabledVariant(string $variant)
* @method bool isDisabledVariant(string $variant)
* @method array getExtraOptions()
* @method array getExtraOptionsProcessed()
* @method enableVariant(string $variant, string $value = null)
* @method disableVariant(string $variant)
* @method removeVariant(string $variant)
Expand Down
19 changes: 19 additions & 0 deletions src/PhpBrew/BuildSettings/BuildSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,25 @@ public function getExtraOptions()
return $this->extraOptions;
}

/**
* Get all extra options.
*
* @return array [option => value]
*/
public function getExtraOptionsProcessed(): array
{
$extraOptions = [];
foreach ($this->getExtraOptions() as $option) {
if (preg_match('/^(.*?)=(.*?)$/', $option, $matches)) {
$extraOptions[$matches[1]] = $matches[2];
} else {
$extraOptions[$option] = null;
}
}

return $extraOptions;
}

/**
* Load and return the variant info from file.
*/
Expand Down
12 changes: 9 additions & 3 deletions src/PhpBrew/Command/InstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,15 @@ public function execute($version)
);
}

$parameters = $parameters
->withOption('--with-config-file-path', $prefix . '/etc/' . $sapi)
->withOption('--with-config-file-scan-dir', $prefix . '/var/db/' . $sapi);
if (!array_key_exists('--with-config-file-path', $options)) {
$parameters = $parameters
->withOption('--with-config-file-path', $prefix.'/etc/'.$sapi);
}

if (!array_key_exists('--with-config-file-scan-dir', $options)) {
$parameters = $parameters
->withOption('--with-config-file-scan-dir', $prefix.'/var/db/'.$sapi);
}

$this->build($build, $parameters);

Expand Down
4 changes: 2 additions & 2 deletions src/PhpBrew/VariantBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,8 +1047,8 @@ public function build(Build $build, ConfigureParameters $parameters = null)
$parameters = $this->buildDisabledVariant($build, $variant, $parameters);
}

foreach ($build->getExtraOptions() as $option) {
$parameters = $parameters->withOption($option);
foreach ($build->getExtraOptionsProcessed() as $option => $value) {
$parameters = $parameters->withOption($option, $value);
}

return $parameters;
Expand Down