Skip to content

Fix PHP 8.5 deprecations #157

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
nyamsprod merged 2 commits into from
Sep 9, 2025
Merged

Fix PHP 8.5 deprecations #157

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
320576e
Fix PHP 8.5 deprecations
cedric-anne Sep 9, 2025
35000fa
shorter syntax
cedric-anne Sep 9, 2025
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: 5 additions & 2 deletions uri/Uri.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,10 @@ private function formatIp(string $host): string
*/
private function formatPort(?int $port = null): ?int
{
$defaultPort = self::SCHEME_DEFAULT_PORT[$this->scheme] ?? null;
$defaultPort = null;
if ($this->scheme !== null && array_key_exists($this->scheme, self::SCHEME_DEFAULT_PORT)) {
$defaultPort = self::SCHEME_DEFAULT_PORT[$this->scheme];
};

return match (true) {
null === $port, $defaultPort === $port => null,
Expand Down Expand Up @@ -1104,7 +1107,7 @@ private function setOrigin(): ?string
{
try {
if ('blob' !== $this->scheme) {
if (!isset(static::WHATWG_SPECIAL_SCHEMES[$this->scheme])) {
if ($this->scheme === null || !isset(static::WHATWG_SPECIAL_SCHEMES[$this->scheme])) {
return null;
}

Expand Down