Skip to content

Better support for quotes in commands #73

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

Draft
wants to merge 1 commit into
base: 1.x
Choose a base branch
from
Draft

Better support for quotes in commands #73

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
25 changes: 15 additions & 10 deletions src/runtime/event/CliHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,38 @@ class CliHandler implements Handler
*/
public function handle(mixed $event, Context $context, $throw = false): array
{
$commandArgs = $event['command'] ?? null;
$commandString = $event['command'] ?? null;

if (!$commandArgs) {
if (!$commandString) {
throw new \Exception('No command found.');
}

$php = PHP_BINARY;
$command = escapeshellcmd("{$php} {$this->scriptPath} {$commandArgs}");
$remainingSeconds = $context->getRemainingTimeInMillis() / 1000;
$timeout = max(1, $remainingSeconds - 1);
$this->process = Process::fromShellCommandline($command, null, [
'LAMBDA_INVOCATION_CONTEXT' => json_encode($context, JSON_THROW_ON_ERROR),
], null, $timeout);
$commandArgs = explode(' ', $commandString);
$this->process = new Process(
[PHP_BINARY, $this->scriptPath, ...$commandArgs],
null,
[
'LAMBDA_INVOCATION_CONTEXT' => json_encode($context, JSON_THROW_ON_ERROR),
],
null,
$timeout,
);

echo "Function time remaining: {$remainingSeconds} seconds";

try {
echo "Running command with $timeout second timeout: $command";
echo "Running command with $timeout second timeout: {$this->process->getCommandLine()}";

/** @throws ProcessTimedOutException|ProcessFailedException */
$this->process->mustRun(function($type, $buffer): void {
echo $buffer;
});

echo "Command succeeded after {$this->getTotalRunningTime()} seconds: $command\n";
echo "Command succeeded after {$this->getTotalRunningTime()} seconds: {$this->process->getCommandLine()}\n";
} catch (\Throwable $e) {
echo "Command failed after {$this->getTotalRunningTime()} seconds: $command\n";
echo "Command failed after {$this->getTotalRunningTime()} seconds: {$this->process->getCommandLine()}\n";
echo "Exception while handling CLI event:\n";
echo "{$e->getMessage()}\n";
echo "{$e->getTraceAsString()}\n";
Expand Down