Skip to content

CLI-1839: Guard against missing 'type' key in oneOf loop #2025

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
deepakmishra2 merged 2 commits into from
Jul 21, 2026
Merged

CLI-1839: Guard against missing 'type' key in oneOf loop #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
440bb9e
fix(CLI-1839): guard against missing 'type' key in oneOf loop
deepakmishra2 Jul 20, 2026
b44aff8
Bump guzzlehttp/guzzle from 7.14.1 to 7.15.1 to fix security advisories
deepakmishra2 Jul 21, 2026
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
30 changes: 15 additions & 15 deletions composer.lock
View file
Open in desktop

@deepakmishra2 deepakmishra2 Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes done was because composer audit --locked was failing due to these vulnerabilities and dependabot has not yet created a PR to fix this.

Image

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Command/Api/ApiBaseCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ private function castParamType(array $paramSpec, array|string|bool|int $value):
if (isset($oneOf)) {
$types = [];
foreach ($oneOf as $type) {
if (!array_key_exists('type', $type)) {
continue;
}
if ($type['type'] === 'array' && str_contains($value, ',')) {
return $this->castParamToArray($type, $value);
}
Expand Down
18 changes: 18 additions & 0 deletions tests/phpunit/src/Commands/Api/ApiCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@ public function testTrustedProxiesCommandExecutesHttpGet(): void
$this->assertEquals(0, $this->getStatusCode());
}

/**
* oneOf entries that lack a 'type' key (e.g. unresolved $ref) must be
* skipped silently rather than throwing an "Undefined array key" warning.
*/
public function testCastParamTypeSkipsOneOfEntriesWithoutTypeKey(): void
{
$command = $this->getApiCommandByName('api:environments:code-switch');
$ref = new \ReflectionMethod($command, 'castParamType');
$paramSpec = [
'oneOf' => [
['$ref' => '#/components/schemas/SomeRef'],
Comment thread
deepakmishra2 marked this conversation as resolved.
['type' => 'integer'],
],
];
$result = $ref->invoke($command, $paramSpec, '42');
$this->assertSame(42, $result);
}

public function testTaskWait(): void
{
$environmentId = '24-a47ac10b-58cc-4372-a567-0e02b2c3d470';
Expand Down
Loading