From 6cf5e1f8832fe421f070146d696d1e0789b6143b Mon Sep 17 00:00:00 2001
From: Robin Gustafsson <robin@rgson.se>
Date: Mon, 3 Jun 2024 22:03:06 +0200
Subject: [PATCH 1/2] Fix PHPUnit 11 compatibility

---
 composer.json                 |  2 +-
 tests/DisplayRegionTest.php   | 18 +++++++++---------
 tests/PrimaryLanguageTest.php |  4 ++--
 tests/RegionTest.php          |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index a771089..46dfd22 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     "pear/versioncontrol_git": "^0.5",
     "pear/pear-core-minimal": "^1.9",
     "pear/pear_exception": "^1.0",
-    "phpunit/phpunit": "^8.5|^9.5",
+    "phpunit/phpunit": "^8.5|^9.5|^10|^11",
     "symfony/console": "^5.0|^6.0",
     "symfony/filesystem": "^5.0|^6.0",
     "symfony/process": "^5.0|^6.0",
diff --git a/tests/DisplayRegionTest.php b/tests/DisplayRegionTest.php
index 28577a5..79f018f 100644
--- a/tests/DisplayRegionTest.php
+++ b/tests/DisplayRegionTest.php
@@ -26,17 +26,17 @@ public function testGetDisplayRegion(string $locale, string $inLocale, string $e
      * @see testGetDisplayRegion
      * @return array
      */
-    public function dataDisplayRegions(): array
+    public static function dataDisplayRegions(): array
     {
         return array_merge(
-            $this->dataForUnitedKingdom(),
-            $this->dataForGermany(),
-            $this->dataForMissingEntries(),
-            $this->dataForInvalidRegions()
+            self::dataForUnitedKingdom(),
+            self::dataForGermany(),
+            self::dataForMissingEntries(),
+            self::dataForInvalidRegions()
         );
     }
 
-    protected function dataForUnitedKingdom(): array
+    protected static function dataForUnitedKingdom(): array
     {
         return [
             ['en-GB', 'en-GB', 'United Kingdom'],
@@ -60,7 +60,7 @@ protected function dataForUnitedKingdom(): array
         ];
     }
 
-    protected function dataForGermany(): array
+    protected static function dataForGermany(): array
     {
         return [
             ['-de', 'en-GB', 'Germany'],
@@ -74,7 +74,7 @@ protected function dataForGermany(): array
         ];
     }
 
-    protected function dataForMissingEntries(): array
+    protected static function dataForMissingEntries(): array
     {
         return [
             ['-rs', 'en', 'Serbia'],
@@ -82,7 +82,7 @@ protected function dataForMissingEntries(): array
         ];
     }
 
-    protected function dataForInvalidRegions(): array
+    protected static function dataForInvalidRegions(): array
     {
         return [
             ['fake-too', 'en', ''],
diff --git a/tests/PrimaryLanguageTest.php b/tests/PrimaryLanguageTest.php
index e3afe2d..d30a2c9 100644
--- a/tests/PrimaryLanguageTest.php
+++ b/tests/PrimaryLanguageTest.php
@@ -21,7 +21,7 @@ public function testGetPrimaryLanguage(string $locale, string $language): void
      * @see testGetPrimaryLanguage
      * @return array
      */
-    public function dataListOfPrimaryLanguages(): array
+    public static function dataListOfPrimaryLanguages(): array
     {
         return [
             ['af-ZA', 'af'],
@@ -256,7 +256,7 @@ public function testUnderscoreOrDash(string $locale, string $language): void
      * @see testUnderscoreOrDash
      * @return array
      */
-    public function dataUnderscoreOrDash(): array
+    public static function dataUnderscoreOrDash(): array
     {
         return [
             ['en-GB', 'en'],
diff --git a/tests/RegionTest.php b/tests/RegionTest.php
index e9b0043..f0a19ab 100644
--- a/tests/RegionTest.php
+++ b/tests/RegionTest.php
@@ -21,7 +21,7 @@ public function testGetRegion(string $locale, string $expectedRegion): void
      * @see testGetRegion
      * @return array
      */
-    public function dataListOfRegions(): array
+    public static function dataListOfRegions(): array
     {
         return [
             ['af-ZA', 'ZA'],

From 9ea3c698b15210b42c4d2da239862acd44ddb501 Mon Sep 17 00:00:00 2001
From: Joshua Gigg <giggsey@gmail.com>
Date: Mon, 10 Jun 2024 09:38:22 +0100
Subject: [PATCH 2/2] Remove PHPUnit verbose

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d8a6a6..12556e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,10 +63,10 @@ jobs:
       - name: Test with phpunit (with coverage)
         id: phpunit-coverage
         if: "matrix.coverage == 'coverage'"
-        run: composer run test -- --verbose ${{ env.COVERAGE_FLAGS }}
+        run: composer run test -- ${{ env.COVERAGE_FLAGS }}
       - name: Test with phpunit (without coverage)
         if: "matrix.coverage != 'coverage'"
-        run: composer run test -- --verbose
+        run: composer run test --
       - name: Submit Coveralls
         if: steps.phpunit-coverage.outcome == 'success'
         uses: nick-invision/retry@v1