Skip to content

Fix the generator when header is assigned to a required property #1851

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
merged 1 commit into from
Mar 1, 2025
Merged

Fix the generator when header is assigned to a required property #1851

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
7 changes: 1 addition & 6 deletions psalm.baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,6 @@
<code><![CDATA[list<Reason::*>]]></code>
</MoreSpecificReturnType>
</file>
<file src="src/Service/Route53/src/Result/CreateHostedZoneResponse.php">
<PossiblyNullPropertyAssignmentValue>
<code><![CDATA[$headers['location'][0] ?? null]]></code>
</PossiblyNullPropertyAssignmentValue>
</file>
<file src="src/Service/S3/src/Result/ListObjectsV2Output.php">
<LessSpecificReturnStatement>
<code>$items</code>
Expand Down Expand Up @@ -331,5 +326,5 @@
<code><![CDATA[list<KeyAgreementAlgorithmSpec::*>]]></code>
<code><![CDATA[list<SigningAlgorithmSpec::*>]]></code>
</MoreSpecificReturnType>
</file>
</file>
</files>
32 changes: 16 additions & 16 deletions src/CodeGenerator/src/Generator/CodeGenerator/PopulatorGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,39 +190,39 @@ private function generatePopulator(Operation $operation, StructureShape $shape,
$memberShape = $member->getShape();
switch ($memberShape->getType()) {
case 'timestamp':
$body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? new \DateTimeImmutable($headers["LOCATION_NAME"][0]) : null;' . "\n", [
'PROPERTY_NAME' => $propertyName,
'LOCATION_NAME' => $locationName,
]);
$propertyValue = 'new \DateTimeImmutable($headers["LOCATION_NAME"][0])';

break;
case 'integer':
case 'long':
$body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? (int) $headers["LOCATION_NAME"][0] : null;' . "\n", [
'PROPERTY_NAME' => $propertyName,
'LOCATION_NAME' => $locationName,
]);
$propertyValue = '(int) $headers["LOCATION_NAME"][0]';

break;
case 'boolean':
$this->requirementsRegistry->addRequirement('ext-filter');

$body .= strtr('$this->PROPERTY_NAME = isset($headers["LOCATION_NAME"][0]) ? filter_var($headers["LOCATION_NAME"][0], FILTER_VALIDATE_BOOLEAN) : null;' . "\n", [
'PROPERTY_NAME' => $propertyName,
'LOCATION_NAME' => $locationName,
]);
$propertyValue = 'filter_var($headers["LOCATION_NAME"][0], FILTER_VALIDATE_BOOLEAN)';

break;
case 'string':
$body .= strtr('$this->PROPERTY_NAME = $headers["LOCATION_NAME"][0] ?? null;' . "\n", [
'PROPERTY_NAME' => $propertyName,
'LOCATION_NAME' => $locationName,
]);
$propertyValue = '$headers["LOCATION_NAME"][0]';

break;
default:
throw new \RuntimeException(\sprintf('Type %s is not yet implemented', $memberShape->getType()));
}
if (!$member->isRequired()) {
if ('$headers["LOCATION_NAME"][0]' === $propertyValue) {
$propertyValue .= '?? null';
} else {
$propertyValue = 'isset($headers["LOCATION_NAME"][0]) ? ' . $propertyValue . ' : null';
}
}

$body .= strtr('$this->PROPERTY_NAME = ' . $propertyValue . ';' . "\n", [
'PROPERTY_NAME' => $propertyName,
'LOCATION_NAME' => $locationName,
]);
}

// This will catch arbitrary values that exists in undefined "headers"
Expand Down
4 changes: 4 additions & 0 deletions src/Service/Route53/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- AWS api-change: Added `us-isof-east-1` and `us-isof-south-1` regions

### Changed

- trust AWS's API response: And not check if required headers are present

## 2.6.0

### Added
Expand Down
2 changes: 1 addition & 1 deletion src/Service/Route53/src/Result/CreateHostedZoneResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected function populateResult(Response $response): void
{
$headers = $response->getHeaders();

$this->location = $headers['location'][0] ?? null;
$this->location = $headers['location'][0];

$data = new \SimpleXMLElement($response->getContent());
$this->hostedZone = $this->populateResultHostedZone($data->HostedZone);
Expand Down