From 123405901aa769057042319da4f1933d9acd9e01 Mon Sep 17 00:00:00 2001 From: Joshua Gigg Date: Fri, 4 Oct 2024 12:03:22 +0100 Subject: [PATCH] PHP 7.4 minimum --- .github/workflows/ci.yml | 15 ++----- README.md | 6 +-- composer.json | 18 ++++---- phpunit | 20 --------- phpunit.xml.dist | 43 ++++++++----------- tests/Issues/CodeCoverageTest.php | 2 +- tests/Issues/Issue106Test.php | 4 +- tests/Issues/Issue135Test.php | 2 +- tests/Issues/Issue14Test.php | 2 +- tests/Issues/Issue152Test.php | 2 +- tests/Issues/Issue159Test.php | 2 +- tests/Issues/Issue175Test.php | 2 +- tests/Issues/Issue17Test.php | 2 +- tests/Issues/Issue21Test.php | 2 +- tests/Issues/Issue23Test.php | 2 +- tests/Issues/Issue34Test.php | 2 +- tests/Issues/Issue35Test.php | 2 +- tests/Issues/Issue36Test.php | 2 +- tests/Issues/Issue3Test.php | 2 +- tests/Issues/Issue44Test.php | 2 +- tests/Issues/Issue4Test.php | 2 +- tests/Issues/LocaleTest.php | 2 +- tests/Issues/PHP7Test.php | 2 +- .../Issues/RegionCodeCaseInsensitiveTest.php | 2 +- tests/Issues/UKNumbersTest.php | 2 +- .../GeneratePhonePrefixDataTest.php | 2 +- .../PhoneNumberToCarrierMapperTest.php | 4 +- tests/core/AsYouTypeFormatterTest.php | 2 +- tests/core/ExampleNumbersTest.php | 4 +- .../core/MultiFileMetadataSourceImplTest.php | 2 +- tests/core/PhoneNumberMatcherTest.php | 2 +- tests/core/PhoneNumberUtilTest.php | 2 +- tests/core/ShortNumberInfoTest.php | 2 +- .../PhoneNumberOfflineGeocoderTest.php | 4 +- tests/prefixmapper/PrefixFileReaderTest.php | 4 +- tests/timezone/PrefixTimeZonesMapTest.php | 2 +- tests/timezone/UKTest.php | 2 +- 37 files changed, 71 insertions(+), 105 deletions(-) delete mode 100755 phpunit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c343b39ec..67c16cfc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,21 +20,14 @@ jobs: strategy: matrix: php-version: - - "5.3" - - "5.4" - - "5.5" - - "5.6" - - "7.0" - - "7.1" - - "7.2" - - "7.3" - "7.4" - "8.0" - "8.1" - "8.2" - "8.3" + - "8.4" include: - - php-version: 8.1 + - php-version: 8.3 coverage: coverage steps: - name: Checkout @@ -72,10 +65,10 @@ jobs: - name: Test with phpunit (with coverage) id: phpunit-coverage if: "matrix.coverage == 'coverage'" - run: ./phpunit --verbose ${{ env.COVERAGE_FLAGS }} + run: vendor/bin/phpunit --verbose ${{ env.COVERAGE_FLAGS }} - name: Test with phpunit (without coverage) if: "matrix.coverage != 'coverage'" - run: ./phpunit --verbose + run: vendor/bin/phpunit --verbose - name: Submit Coveralls if: steps.phpunit-coverage.outcome == 'success' uses: nick-invision/retry@v1 diff --git a/README.md b/README.md index c96be2152..e10f91a77 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,14 @@ A PHP library for parsing, formatting, storing and validating international phon ## Installation -PHP versions 5.3 to PHP 8.3 are currently supported. +PHP versions 7.4 to PHP 8.4 are currently supported. The PECL [mbstring](http://php.net/mbstring) extension is required. It is recommended to use [composer](https://getcomposer.org) to install the library. ```bash -$ composer require giggsey/libphonenumber-for-php +composer require giggsey/libphonenumber-for-php ``` You can also use any other [PSR-4](http://www.php-fig.org/psr/psr-4/) compliant autoloader. @@ -241,7 +241,7 @@ Generating the data is not normally needed, as this repository will generally al If you do need to generate the data, the commands are provided by [Phing](https://www.phing.info). Ensure you have all the dev composer dependencies installed, then run ```bash -$ vendor/bin/phing compile +vendor/bin/phing compile ``` This compile process clones the [libphonenumber](https://github.com/google/libphonenumber) project at the version specified in [METADATA-VERSION.txt](METADATA-VERSION.txt). diff --git a/composer.json b/composer.json index 8edafe74f..534b42975 100644 --- a/composer.json +++ b/composer.json @@ -60,18 +60,18 @@ ] }, "require": { - "php": ">=5.3.2", - "giggsey/locale": "^1.7|^2.0", + "php": "^7.4|^8.0", + "giggsey/locale": "^2.0", "symfony/polyfill-mbstring": "^1.17" }, "require-dev": { - "phing/phing": "^2.7", - "pear/versioncontrol_git": "^0.5", - "pear/pear-core-minimal": "^1.9", + "phing/phing": "^3.0", + "pear/versioncontrol_git": "^0.7", + "pear/pear-core-minimal": "^1.10", "pear/pear_exception": "^1.0", - "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/console": "^2.8|^3.0|^v4.4|^v5.2", - "php-coveralls/php-coveralls": "^1.0|^2.0" + "phpunit/phpunit": "^9.0", + "symfony/console": "^v5.2", + "php-coveralls/php-coveralls": "^2.0" }, "replace": { "giggsey/libphonenumber-for-php-lite": "self.version" @@ -82,7 +82,7 @@ } }, "scripts": { - "test": "./phpunit", + "test": "vendor/bin/phpunit", "metadata": "vendor/bin/phing compile" } } diff --git a/phpunit b/phpunit deleted file mode 100755 index ab4b03887..000000000 --- a/phpunit +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php - 80000) { - putenv('SYMFONY_PHPUNIT_VERSION=9.5'); - } elseif (\PHP_VERSION_ID > 70400) { - putenv('SYMFONY_PHPUNIT_VERSION=7.5'); - } -} - -require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit'; diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a7226e8c3..0bdcd124e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,33 +1,26 @@ - - + colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"> + + + ./src/ + + + ./src/data/ + ./src/carrier/data/ + ./src/geocoding/data/ + ./src/timezone/data/ + ./src/AlternateFormatsCountryCodeSet.php + ./src/CountryCodeToRegionCodeMap.php + ./src/CountryCodeToRegionCodeMapForTesting.php + ./src/RegionCode.php + + ./tests/ - - - - ./src/ - - - ./src/data/ - ./src/carrier/data/ - ./src/geocoding/data/ - ./src/timezone/data/ - ./src/AlternateFormatsCountryCodeSet.php - ./src/CountryCodeToRegionCodeMap.php - ./src/CountryCodeToRegionCodeMapForTesting.php - ./src/RegionCode.php - - - - diff --git a/tests/Issues/CodeCoverageTest.php b/tests/Issues/CodeCoverageTest.php index 081b49b69..4e9c3dc65 100644 --- a/tests/Issues/CodeCoverageTest.php +++ b/tests/Issues/CodeCoverageTest.php @@ -13,7 +13,7 @@ class CodeCoverageTest extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue106Test.php b/tests/Issues/Issue106Test.php index 3714ee9aa..30fd7c553 100644 --- a/tests/Issues/Issue106Test.php +++ b/tests/Issues/Issue106Test.php @@ -14,13 +14,13 @@ class Issue106Test extends TestCase */ protected $geocoder; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { self::$TW_Number1 = new PhoneNumber(); self::$TW_Number1->setCountryCode(886)->setNationalNumber(223113731); } - public function setUp() + public function setUp(): void { PhoneNumberOfflineGeocoder::resetInstance(); $this->geocoder = PhoneNumberOfflineGeocoder::getInstance(); diff --git a/tests/Issues/Issue135Test.php b/tests/Issues/Issue135Test.php index 5a63241dc..3d8698099 100644 --- a/tests/Issues/Issue135Test.php +++ b/tests/Issues/Issue135Test.php @@ -14,7 +14,7 @@ */ class Issue135Test extends TestCase { - public function setUp() + public function setUp(): void { // Reset instance each time PhoneNumberUtil::resetInstance(); diff --git a/tests/Issues/Issue14Test.php b/tests/Issues/Issue14Test.php index 82a180c91..f39bdd88b 100644 --- a/tests/Issues/Issue14Test.php +++ b/tests/Issues/Issue14Test.php @@ -13,7 +13,7 @@ class Issue14Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue152Test.php b/tests/Issues/Issue152Test.php index b5d2754aa..69437cd6d 100644 --- a/tests/Issues/Issue152Test.php +++ b/tests/Issues/Issue152Test.php @@ -14,7 +14,7 @@ */ class Issue152Test extends TestCase { - public function setUp() + public function setUp(): void { // Reset instance each time PhoneNumberUtil::resetInstance(); diff --git a/tests/Issues/Issue159Test.php b/tests/Issues/Issue159Test.php index 4210357f5..93fb09c17 100644 --- a/tests/Issues/Issue159Test.php +++ b/tests/Issues/Issue159Test.php @@ -16,7 +16,7 @@ class Issue159Test extends TestCase { const LOS_ANGELES_TZ = 'America/Los_Angeles'; - public function setUp() + public function setUp(): void { // Reset instance each time PhoneNumberUtil::resetInstance(); diff --git a/tests/Issues/Issue175Test.php b/tests/Issues/Issue175Test.php index 89e75b720..51108760b 100644 --- a/tests/Issues/Issue175Test.php +++ b/tests/Issues/Issue175Test.php @@ -12,7 +12,7 @@ */ class Issue175Test extends TestCase { - public function setUp() + public function setUp(): void { // Reset instance each time PhoneNumberUtil::resetInstance(); diff --git a/tests/Issues/Issue17Test.php b/tests/Issues/Issue17Test.php index f7b2e63a8..01e86a5ee 100644 --- a/tests/Issues/Issue17Test.php +++ b/tests/Issues/Issue17Test.php @@ -18,7 +18,7 @@ class Issue17Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); PhoneNumberOfflineGeocoder::resetInstance(); diff --git a/tests/Issues/Issue21Test.php b/tests/Issues/Issue21Test.php index 81a032bae..016185f18 100644 --- a/tests/Issues/Issue21Test.php +++ b/tests/Issues/Issue21Test.php @@ -12,7 +12,7 @@ class Issue21Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue23Test.php b/tests/Issues/Issue23Test.php index 8b98ea00e..cc50dcd43 100644 --- a/tests/Issues/Issue23Test.php +++ b/tests/Issues/Issue23Test.php @@ -18,7 +18,7 @@ class Issue23Test extends TestCase */ private $geocoder; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue34Test.php b/tests/Issues/Issue34Test.php index ca96d1d88..3eadd7200 100644 --- a/tests/Issues/Issue34Test.php +++ b/tests/Issues/Issue34Test.php @@ -11,7 +11,7 @@ class Issue34Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue35Test.php b/tests/Issues/Issue35Test.php index 30ecf703a..4e8d7aed3 100644 --- a/tests/Issues/Issue35Test.php +++ b/tests/Issues/Issue35Test.php @@ -12,7 +12,7 @@ class Issue35Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue36Test.php b/tests/Issues/Issue36Test.php index 371f14e99..14b91449e 100644 --- a/tests/Issues/Issue36Test.php +++ b/tests/Issues/Issue36Test.php @@ -18,7 +18,7 @@ class Issue36Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); PhoneNumberOfflineGeocoder::resetInstance(); diff --git a/tests/Issues/Issue3Test.php b/tests/Issues/Issue3Test.php index d4b4f90fb..37cf64918 100644 --- a/tests/Issues/Issue3Test.php +++ b/tests/Issues/Issue3Test.php @@ -13,7 +13,7 @@ class Issue3Test extends TestCase */ public $phoneNumberUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneNumberUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue44Test.php b/tests/Issues/Issue44Test.php index 21bd8903e..1d6d932ae 100644 --- a/tests/Issues/Issue44Test.php +++ b/tests/Issues/Issue44Test.php @@ -19,7 +19,7 @@ class Issue44Test extends TestCase */ private $geocoder; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/Issue4Test.php b/tests/Issues/Issue4Test.php index 0de3042d1..213efe7be 100644 --- a/tests/Issues/Issue4Test.php +++ b/tests/Issues/Issue4Test.php @@ -13,7 +13,7 @@ class Issue4Test extends TestCase */ public $phoneNumberUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneNumberUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/LocaleTest.php b/tests/Issues/LocaleTest.php index 9f6706308..ced34a69a 100644 --- a/tests/Issues/LocaleTest.php +++ b/tests/Issues/LocaleTest.php @@ -27,7 +27,7 @@ class LocaleTest extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); PhoneNumberOfflineGeocoder::resetInstance(); diff --git a/tests/Issues/PHP7Test.php b/tests/Issues/PHP7Test.php index 64dea03ed..b1d1c7d77 100644 --- a/tests/Issues/PHP7Test.php +++ b/tests/Issues/PHP7Test.php @@ -14,7 +14,7 @@ class PHP7Test extends TestCase */ private $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/RegionCodeCaseInsensitiveTest.php b/tests/Issues/RegionCodeCaseInsensitiveTest.php index fcdfa5b9e..cc23bad11 100644 --- a/tests/Issues/RegionCodeCaseInsensitiveTest.php +++ b/tests/Issues/RegionCodeCaseInsensitiveTest.php @@ -19,7 +19,7 @@ class RegionCodeCaseInsensitiveTest extends TestCase */ private $shortInfo; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/Issues/UKNumbersTest.php b/tests/Issues/UKNumbersTest.php index c88fabdda..912d451b8 100644 --- a/tests/Issues/UKNumbersTest.php +++ b/tests/Issues/UKNumbersTest.php @@ -15,7 +15,7 @@ class UKNumbersTest extends TestCase */ protected $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance(); diff --git a/tests/buildtools/GeneratePhonePrefixDataTest.php b/tests/buildtools/GeneratePhonePrefixDataTest.php index c11a74278..5947e1860 100644 --- a/tests/buildtools/GeneratePhonePrefixDataTest.php +++ b/tests/buildtools/GeneratePhonePrefixDataTest.php @@ -9,7 +9,7 @@ class GeneratePhonePrefixDataTest extends TestCase { private static $available_data_files; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { $temporaryMap = array(); diff --git a/tests/carrier/PhoneNumberToCarrierMapperTest.php b/tests/carrier/PhoneNumberToCarrierMapperTest.php index a970940a7..e5f88f94e 100644 --- a/tests/carrier/PhoneNumberToCarrierMapperTest.php +++ b/tests/carrier/PhoneNumberToCarrierMapperTest.php @@ -28,7 +28,7 @@ class PhoneNumberToCarrierMapperTest extends TestCase */ protected $carrierMapper; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { PhoneNumberUtil::resetInstance(); @@ -75,7 +75,7 @@ public static function setUpBeforeClass() self::$INTERNATIONAL_TOLL_FREE->setCountryCode(800)->setNationalNumber(12345678); } - public function setUp() + public function setUp(): void { $this->carrierMapper = PhoneNumberToCarrierMapper::getInstance(__DIR__ . '/../carrier/data/'); } diff --git a/tests/core/AsYouTypeFormatterTest.php b/tests/core/AsYouTypeFormatterTest.php index 0f87bd5c0..5485a6d81 100644 --- a/tests/core/AsYouTypeFormatterTest.php +++ b/tests/core/AsYouTypeFormatterTest.php @@ -14,7 +14,7 @@ class AsYouTypeFormatterTest extends TestCase */ protected $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance( diff --git a/tests/core/ExampleNumbersTest.php b/tests/core/ExampleNumbersTest.php index 7da4a4102..a6b09e80f 100644 --- a/tests/core/ExampleNumbersTest.php +++ b/tests/core/ExampleNumbersTest.php @@ -27,14 +27,14 @@ class ExampleNumbersTest extends TestCase */ private $shortNumberInfo; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { PhoneNumberUtil::resetInstance(); PhoneNumberUtil::getInstance(); ShortNumberInfo::resetInstance(); } - public function setUp() + public function setUp(): void { $this->phoneNumberUtil = PhoneNumberUtil::getInstance(); $this->shortNumberInfo = ShortNumberInfo::getInstance(); diff --git a/tests/core/MultiFileMetadataSourceImplTest.php b/tests/core/MultiFileMetadataSourceImplTest.php index db93d6b7d..cc1602e70 100644 --- a/tests/core/MultiFileMetadataSourceImplTest.php +++ b/tests/core/MultiFileMetadataSourceImplTest.php @@ -14,7 +14,7 @@ class MultiFileMetadataSourceImplTest extends TestCase */ private $multiFileMetadataSource; - public function setUp() + public function setUp(): void { $this->multiFileMetadataSource = new MultiFileMetadataSourceImpl( new DefaultMetadataLoader(), diff --git a/tests/core/PhoneNumberMatcherTest.php b/tests/core/PhoneNumberMatcherTest.php index 05be4d40a..0bf7a8517 100644 --- a/tests/core/PhoneNumberMatcherTest.php +++ b/tests/core/PhoneNumberMatcherTest.php @@ -19,7 +19,7 @@ class PhoneNumberMatcherTest extends TestCase */ protected $phoneUtil; - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); $this->phoneUtil = PhoneNumberUtil::getInstance( diff --git a/tests/core/PhoneNumberUtilTest.php b/tests/core/PhoneNumberUtilTest.php index 7f459c123..8a066b1b4 100644 --- a/tests/core/PhoneNumberUtilTest.php +++ b/tests/core/PhoneNumberUtilTest.php @@ -62,7 +62,7 @@ class PhoneNumberUtilTest extends TestCase */ protected $phoneUtil; - public function setUp() + public function setUp(): void { $this->phoneUtil = self::initializePhoneUtilForTesting(); } diff --git a/tests/core/ShortNumberInfoTest.php b/tests/core/ShortNumberInfoTest.php index a83e6effd..fa51d2ee1 100644 --- a/tests/core/ShortNumberInfoTest.php +++ b/tests/core/ShortNumberInfoTest.php @@ -23,7 +23,7 @@ class ShortNumberInfoTest extends TestCase */ private $shortInfo; - public function setUp() + public function setUp(): void { self::$plusSymbol = \pack('H*', 'efbc8b'); diff --git a/tests/geocoding/PhoneNumberOfflineGeocoderTest.php b/tests/geocoding/PhoneNumberOfflineGeocoderTest.php index 3cbf02afd..e4044ce09 100644 --- a/tests/geocoding/PhoneNumberOfflineGeocoderTest.php +++ b/tests/geocoding/PhoneNumberOfflineGeocoderTest.php @@ -29,7 +29,7 @@ class PhoneNumberOfflineGeocoderTest extends TestCase */ protected $geocoder; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { self::$KO_Number1 = new PhoneNumber(); self::$KO_Number1->setCountryCode(82)->setNationalNumber(22123456); @@ -80,7 +80,7 @@ public static function setUpBeforeClass() self::$internationalTollFree->setCountryCode(800)->setNationalNumber(12345678); } - public function setUp() + public function setUp(): void { PhoneNumberOfflineGeocoder::resetInstance(); $this->geocoder = PhoneNumberOfflineGeocoder::getInstance(__DIR__ . '/../prefixmapper/data/'); diff --git a/tests/prefixmapper/PrefixFileReaderTest.php b/tests/prefixmapper/PrefixFileReaderTest.php index deb30ae7f..686c152c7 100644 --- a/tests/prefixmapper/PrefixFileReaderTest.php +++ b/tests/prefixmapper/PrefixFileReaderTest.php @@ -18,7 +18,7 @@ class PrefixFileReaderTest extends TestCase */ protected $reader; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { self::$KO_NUMBER = new PhoneNumber(); self::$KO_NUMBER->setCountryCode(82)->setNationalNumber(22123456); @@ -36,7 +36,7 @@ public static function setUpBeforeClass() self::$SE_NUMBER->setCountryCode(46)->setNationalNumber(81234567); } - public function setUp() + public function setUp(): void { $this->reader = new PrefixFileReader(__DIR__ . '/data/'); } diff --git a/tests/timezone/PrefixTimeZonesMapTest.php b/tests/timezone/PrefixTimeZonesMapTest.php index b05aa33d5..fe86f1798 100644 --- a/tests/timezone/PrefixTimeZonesMapTest.php +++ b/tests/timezone/PrefixTimeZonesMapTest.php @@ -28,7 +28,7 @@ class PrefixTimeZonesMapTest extends TestCase */ private static $prefixTimeZonesMapForRU; - public static function setUpBeforeClass() + public static function setUpBeforeClass(): void { $sortedMapForUS = array(); $sortedMapForUS[1] = self::NEW_YORK_TZ . '&' . self::CHICAGO_TZ . '&' . self::LOS_ANGELES_TZ . '&' . self::DENVER_TZ; diff --git a/tests/timezone/UKTest.php b/tests/timezone/UKTest.php index c0ca12c55..3da56b4ee 100644 --- a/tests/timezone/UKTest.php +++ b/tests/timezone/UKTest.php @@ -9,7 +9,7 @@ class UKTest extends TestCase { - public function setUp() + public function setUp(): void { PhoneNumberUtil::resetInstance(); }