Skip to content

Fix deprecation for null array offset on PHP 8.5 #1960

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
Oct 17, 2025
+6 −6
Merged

Fix deprecation for null array offset on PHP 8.5 #1960

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: 2 additions & 1 deletion src/Core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Changed

- Apply no CodingStandard from latest php-cs-fixer.
- Fix PHP 8.5 deprecation by avoiding using `null` as an array offset.

### Fixed

Expand All @@ -15,7 +16,7 @@

### Fixed

- SignerV4: fix sort of query parameters to build correct canoncal query string
- SignerV4: fix sort of query parameters to build correct canonical query string

## 1.27.0

Expand Down
9 changes: 4 additions & 5 deletions src/Core/src/AbstractApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,14 @@ private function getDiscoveredEndpoint(string $uri, array $query, ?string $regio
*/
private function getSigner(?string $region): Signer
{
/** @var string $region */
$region = $region ?? ($this->configuration->isDefault('region') ? null : $this->configuration->get('region'));
if (!isset($this->signers[$region])) {
if (!isset($this->signers[$region ?? ''])) {
$factories = $this->getSignerFactories();
$factory = null;
if ($this->configuration->isDefault('endpoint') || $this->configuration->isDefault('region')) {
$metadata = $this->getEndpointMetadata($region);
} else {
\assert(null !== $region);
// Allow non-aws region with custom endpoint
$metadata = $this->getEndpointMetadata(Configuration::DEFAULT_REGION);
$metadata['signRegion'] = $region;
Expand All @@ -349,10 +349,9 @@ private function getSigner(?string $region): Signer
throw new InvalidArgument(\sprintf('None of the signatures "%s" is implemented.', implode(', ', $metadata['signVersions'])));
}

$this->signers[$region] = $factory($metadata['signService'], $metadata['signRegion']);
$this->signers[$region ?? ''] = $factory($metadata['signService'], $metadata['signRegion']);
}

/** @psalm-suppress PossiblyNullArrayOffset */
return $this->signers[$region];
return $this->signers[$region ?? ''];
}
}