Skip to content

Remove escapeshellarg() quoting for configure flags #94

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

Merged
asgrim merged 1 commit into from
Nov 15, 2024
+3 −5
Merged

Remove escapeshellarg() quoting for configure flags #94

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
3 changes: 1 addition & 2 deletions src/Command/CommandHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use Webmozart\Assert\Assert;

use function array_key_exists;
use function escapeshellarg;
use function is_array;
use function is_string;
use function reset;
Expand Down Expand Up @@ -225,7 +224,7 @@ public static function processConfigureOptionsFromInput(Package $package, InputI

if ($configureOption->needsValue) {
if (is_string($value) && $value !== '') {
$configureOptionsValues[] = '--' . $configureOption->name . '=' . escapeshellarg($value);
$configureOptionsValues[] = '--' . $configureOption->name . '=' . $value;
}

continue;
Expand Down
2 changes: 1 addition & 1 deletion test/behaviour/CliContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function theExtensionShouldHaveBeenBuiltWithOptions(): void
}

Assert::contains($this->output, 'phpize complete.');
Assert::contains($this->output, 'Configure complete with options: --with-hello-name=\'sup\'');
Assert::contains($this->output, 'Configure complete with options: --with-hello-name=sup');
Assert::contains($this->output, 'Build complete:');
}

Expand Down
3 changes: 1 addition & 2 deletions test/unit/Command/CommandHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

use function array_combine;
use function array_map;
use function escapeshellarg;

#[CoversClass(CommandHelper::class)]
final class CommandHelperTest extends TestCase
Expand Down Expand Up @@ -174,7 +173,7 @@ public function testProcessingConfigureOptionsFromInput(): void

self::assertSame(
[
'--with-stuff=' . escapeshellarg('lolz'),
'--with-stuff=lolz',
'--enable-thing',
],
$options,
Expand Down