Drop PHP 8.0 support

.github/workflows/mutation-tests.yml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ 8.1 ]
+        php-version: [ 8.3 ]
         composer: [ highest ]
 
     steps:

.github/workflows/php-cs-fixer.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
 
       - uses: "ramsey/composer-install@v3"
         with:

.github/workflows/sast.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.3
 
       - uses: "ramsey/composer-install@v3"
         with:

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', 8.1, 8.2, 8.3]
+        php-version: [8.1, 8.2, 8.3]
         composer: [highest, lowest]
 
     steps:

.gitignore

@@ -6,3 +6,4 @@ build/logs/
 /.php-cs-fixer.cache
 /.phpunit.result.cache
 /infection.txt
+/.phpunit.cache

.php-cs-fixer.dist.php

@@ -10,7 +10,7 @@
     [
         '@PSR2' => true,
         '@PSR12' => true,
-        '@PHP80Migration' => true,
+        '@PHP81Migration' => true,
         'single_quote' => true,
     ]
 )->setFinder($finder);

build/BuildMetadataFromXml.php

@@ -65,8 +65,8 @@ public static function validateRE(string $regex, bool $removeWhitespace = false)
     {
         $compressedRegex = $removeWhitespace ? \preg_replace('/\\s/', '', $regex) : $regex;
         // Match regex against an empty string to check the regex is valid
-        if (\preg_match('/' . $compressedRegex . '/', '') === false) {
-            throw new \RuntimeException('Regex error: ' . \preg_last_error());
+        if (@preg_match('/' . $compressedRegex . '/', '') === false) {
+            throw new \RuntimeException('Regex error: ' . \preg_last_error_msg());
         }
         // We don't ever expect to see | followed by a ) in our metadata - this would be an indication
         // of a bug. If one wants to make something optional, we prefer ? to using an empty group.

composer.json

@@ -59,21 +59,21 @@
     ]
   },
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "symfony/polyfill-mbstring": "^1.17"
   },
   "require-dev": {
     "ext-dom": "*",
     "friendsofphp/php-cs-fixer": "^3.12",
-    "infection/infection": "^0.26.16",
+    "infection/infection": "^0.28",
     "pear/pear-core-minimal": "^1.10.11",
     "pear/pear_exception": "^1.0.2",
-    "pear/versioncontrol_git": "^0.5",
+    "pear/versioncontrol_git": "^0.7",
     "phing/phing": "^2.17.4",
     "phpstan/extension-installer": "^1.2",
     "phpstan/phpstan": "^1.8",
     "phpstan/phpstan-phpunit": "^1.2",
-    "phpunit/phpunit": "^9.5.26",
+    "phpunit/phpunit": "^10.5",
     "symfony/console": "^6.0"
   },
   "conflict": {

phpunit.xml.dist

@@ -1,12 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-         bootstrap="./tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="./tests/bootstrap.php"
          beStrictAboutTestsThatDoNotTestAnything="false"
-         convertDeprecationsToExceptions="true"
          executionOrder="random"
-         colors="true">
-    <coverage>
+         colors="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         failOnDeprecation="true"
+         failOnEmptyTestSuite="true"
+         failOnIncomplete="true"
+         failOnNotice="true"
+         failOnSkipped="true"
+         displayDetailsOnIncompleteTests="true"
+         displayDetailsOnSkippedTests="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         cacheDirectory=".phpunit.cache">
+    <testsuites>
+        <testsuite name="Unit Tests">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <source>
         <include>
             <directory suffix=".php">./src/</directory>
             <directory suffix=".php">./build/</directory>
@@ -20,10 +37,5 @@
             <file>./src/CountryCodeToRegionCodeMap.php</file>
             <file>./src/CountryCodeToRegionCodeMapForTesting.php</file>
         </exclude>
-    </coverage>
-    <testsuites>
-        <testsuite name="Unit Tests">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
+    </source>
 </phpunit>

tests/Issues/PHP7Test.php

@@ -4,6 +4,7 @@
 
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class PHP7Test extends TestCase
@@ -16,9 +17,7 @@ public function setUp(): void
         $this->phoneUtil = PhoneNumberUtil::getInstance();
     }
 
-    /**
-     * @dataProvider validPolishNumbers
-     */
+    #[DataProvider('validPolishNumbers')]
     public function testValidPolishNumbers(string $number): void
     {
         $phoneNumber = $this->phoneUtil->parse($number, 'PL');
@@ -30,7 +29,7 @@ public function testValidPolishNumbers(string $number): void
     /**
      * @return array<string[]>
      */
-    public function validPolishNumbers(): array
+    public static function validPolishNumbers(): array
     {
         return [
             ['22 222 22 22'],

tests/buildtools/BuildMetadataFromXmlTest.php

@@ -12,6 +12,8 @@
 use libphonenumber\NumberFormat;
 use libphonenumber\PhoneMetadata;
 use libphonenumber\PhoneNumberDesc;
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 
 class BuildMetadataFromXmlTest extends TestCase
@@ -25,46 +27,30 @@ public function testValidateRERemovesWhiteSpaces(): void
         $this->assertEquals(' hello world ', BuildMetadataFromXml::validateRE($input, false));
     }
 
-    public function testValidateREThrowsException(): void
+    #[TestWith([false])]
+    #[TestWith([true])]
+    public function testValidateREThrowsException(bool $removeWhitespace): void
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Regex error: Internal error');
+
         $invalidPattern = '[';
         // Should throw an exception when an invalid pattern is provided independently of the last
         // parameter (remove white spaces).
-        try {
-            BuildMetadataFromXml::validateRE($invalidPattern, false);
-            $this->fail();
-        } catch (\Exception $e) {
-            // Test passed.
-            $this->addToAssertionCount(1);
-        }
+        BuildMetadataFromXml::validateRE($invalidPattern, $removeWhitespace);
+    }
 
-        try {
-            BuildMetadataFromXml::validateRE($invalidPattern, true);
-            $this->fail();
-        } catch (\Exception $e) {
-            // Test passed.
-            $this->addToAssertionCount(1);
-        }
+    #[TestWith(['|)'])]
+    #[TestWith(["|\n)"])]
+    public function testValidateREThrowsExceptionWithPatterns(string $pattern): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Regex error: Internal error');
 
         // We don't allow | to be followed by ) because it introduces bugs, since we typically use it at
         // the end of each line and when a line is deleted, if the pipe from the previous line is not
         // removed, we end up erroneously accepting an empty group as well.
-        $patternWithPipeFollowedByClosingParentheses = '|)';
-        try {
-            BuildMetadataFromXml::validateRE($patternWithPipeFollowedByClosingParentheses, true);
-            $this->fail();
-        } catch (\Exception $e) {
-            // Test passed.
-            $this->addToAssertionCount(1);
-        }
-        $patternWithPipeFollowedByNewLineAndClosingParentheses = "|\n)";
-        try {
-            BuildMetadataFromXml::validateRE($patternWithPipeFollowedByNewLineAndClosingParentheses, true);
-            $this->fail();
-        } catch (\Exception $e) {
-            // Test passed.
-            $this->addToAssertionCount(1);
-        }
+        BuildMetadataFromXml::validateRE($pattern, true);
     }
 
     public function testValidateRE(): void