Skip to content

Fix PHP 8.5 deprecation #734

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
giggsey merged 4 commits into from
Jan 15, 2026
+9 −0
Merged

Fix PHP 8.5 deprecation #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3de0f3
Fix deprecation: Using null as an array offset is deprecated, use an …
grzybu Jan 15, 2026
e505348
:art: CS
giggsey Jan 15, 2026
d177309
:green_heart: Fix PHPStan
giggsey Jan 15, 2026
5a1cbbd
:art: CS
giggsey Jan 15, 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
5 changes: 5 additions & 0 deletions src/PhoneNumberUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,11 @@ protected function isValidRegionCode(?string $regionCode): bool
public function getRegionCodeForNumber(PhoneNumber $number): ?string
{
$countryCode = $number->getCountryCode();

if ($countryCode === null) {
return null;
}

if (!isset($this->countryCallingCodeToRegionCodeMap[$countryCode])) {
return null;
}
Expand Down
4 changes: 4 additions & 0 deletions tests/core/PhoneNumberUtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class PhoneNumberUtilTest extends TestCase
private static PhoneNumber $aeUAN;
private static PhoneNumber $unknownCountryCodeNoRawInput;
protected PhoneNumberUtil $phoneUtil;
private static PhoneNumber $notAPhoneNumber;

public function setUp(): void
{
Expand Down Expand Up @@ -142,6 +143,7 @@ private static function initializePhoneUtilForTesting(): PhoneNumberUtil
self::$aeUAN->setCountryCode(971)->setNationalNumber('600123456');
self::$unknownCountryCodeNoRawInput = new PhoneNumber();
self::$unknownCountryCodeNoRawInput->setCountryCode(2)->setNationalNumber('12345');
self::$notAPhoneNumber = (new PhoneNumber())->setNationalNumber('not-a-phone-number');

PhoneNumberUtil::resetInstance();
return PhoneNumberUtil::getInstance(
Expand Down Expand Up @@ -1775,6 +1777,8 @@ public function testGetRegionCodeForNumber(): void
self::assertEquals(RegionCode::GB, $this->phoneUtil->getRegionCodeForNumber(self::$gbMobile));
self::assertEquals(RegionCode::UN001, $this->phoneUtil->getRegionCodeForNumber(self::$internationalTollFree));
self::assertEquals(RegionCode::UN001, $this->phoneUtil->getRegionCodeForNumber(self::$universalPremiumRate));
self::assertEquals(null, $this->phoneUtil->getRegionCodeForNumber(self::$notAPhoneNumber));

}

public function testGetRegionCodesForCountryCode(): void
Expand Down
Loading