Finish PHPUnit 11 compat

dvdoug · Mar 24, 2024 · 8522d6f · 8522d6f
1 parent c4bc936
commit 8522d6f
Show file tree

Hide file tree

Showing 35 changed files with 215 additions and 321 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,6 @@ jobs:
           - "8.3"
           - "8.2"
           - "8.1"
-          - "8.0"
 
         dependencies:
           - "highest"
@@ -122,11 +121,13 @@ jobs:
     - name: PHPUnit (Unit)
       run: |
         if [ "${{ matrix.php-version }}" = "8.2" ] && [ "${{ matrix.dependencies }}" = "highest" ]; then
-          php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=build/coverage-phpunit/clover.xml --exclude-group=integration,gigs;
+          php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --coverage-clover=build/coverage-phpunit/clover.xml --exclude-group=integration --exclude-group=gigs;
           composer global require scrutinizer/ocular;
           ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover build/coverage-phpunit/clover.xml;
-        else
+        elif [ "${{ matrix.php-version }}" = "8.1" ] || [ "${{ matrix.dependencies }}" = "lowest" ]; then
           php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --exclude-group=integration,gigs --no-coverage;
+        else
+          php -dmemory_limit=-1 vendor/phpunit/phpunit/phpunit --exclude-group=integration --exclude-group=gigs --no-coverage;
         fi;
 
     - name: PHPUnit (Integration)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -19,6 +19,7 @@
         '@PHP74Migration' => true,
         '@PHP80Migration:risky' => true,
         '@PHP80Migration' => true,
+        '@PHP81Migration' => true,
         'concat_space' => ['spacing' => 'one'],
         'fopen_flags' => ['b_mode' => true],
         'native_function_invocation' => ['include' => ['@all']],

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -17,7 +17,7 @@ build:
   environment:
     # Languages
     php:
-      version: "8.0"
+      version: "8.1"
       ini:
         memory_limit: "-1"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Changed
 - Updates to data for Czechia, Denmark, ETRS89, Portugal and St Helena
+- Minimum PHP version increased to 8.1
 
 ## [5.8.0] - 2024-02-03
 ### Added

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "license": "(MIT and proprietary)",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-zip": "*",
         "composer-runtime-api": "^2.1",
         "composer/pcre": "^3.1",
@@ -32,7 +32,7 @@
         "php-coord/datapack-oceania": "dev-master",
         "php-coord/datapack-southamerica": "dev-master",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.6||^10.0||^11.0"
+        "phpunit/phpunit": "^10.5||^11.0"
     },
     "suggest": {
         "php-coord/datapack-africa": "High-accuracy addon datapack for Africa",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,7 +25,7 @@
         <ini name="error_logging" value="-1"/>
     </php>
 
-    <coverage pathCoverage="true" cacheDirectory="build/php-code-coverage-cache">
+    <source>
         <include>
             <directory suffix=".php">src</directory>
         </include>
@@ -34,7 +34,9 @@
             <directory suffix=".php">src/CoordinateOperation/Params</directory>
             <directory suffix=".php">src/Geometry/Extents</directory>
         </exclude>
+    </source>
 
+    <coverage pathCoverage="true" cacheDirectory="build/php-code-coverage-cache">
         <report>
             <text outputFile="php://stdout" showOnlySummary="true"/>
             <html outputDirectory="build/coverage-phpunit"/>

diff --git a/tests/CoordinateOperation/AutoConversionTest.php b/tests/CoordinateOperation/AutoConversionTest.php
@@ -31,6 +31,8 @@
 use PHPCoord\UnitOfMeasure\Angle\Radian;
 use PHPCoord\UnitOfMeasure\Length\Foot;
 use PHPCoord\UnitOfMeasure\Length\Metre;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function array_unique;
@@ -565,10 +567,8 @@ public function testRDNAPToITRF2014(): void
         self::assertEqualsWithDelta(43.0197, $to->getHeight()->asMetres()->getValue(), 0.0001);
     }
 
-    /**
-     * @group integration
-     * @dataProvider EPSGConcatenatedOperations
-     */
+    #[DataProvider('EPSGConcatenatedOperations')]
+    #[Group('integration')]
     public function testEPSGConcatenatedOperations(string $sourceCrsSrid, string $targetCrsSrid, array $extentCodes, bool $canReverse): void
     {
         $extent = BoundingArea::createFromExtentCodes($extentCodes);

diff --git a/tests/CoordinateReferenceSystem/CompoundTest.php b/tests/CoordinateReferenceSystem/CompoundTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateReferenceSystem;
 
 use PHPCoord\Exception\UnknownCoordinateReferenceSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -37,10 +39,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider coordinateReferenceSystems
-     */
+    #[DataProvider('coordinateReferenceSystems')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Compound::fromSRID($srid);

diff --git a/tests/CoordinateReferenceSystem/GeocentricTest.php b/tests/CoordinateReferenceSystem/GeocentricTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateReferenceSystem;
 
 use PHPCoord\Exception\UnknownCoordinateReferenceSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -37,10 +39,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider coordinateReferenceSystems
-     */
+    #[DataProvider('coordinateReferenceSystems')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Geocentric::fromSRID($srid);

diff --git a/tests/CoordinateReferenceSystem/Geographic2DTest.php b/tests/CoordinateReferenceSystem/Geographic2DTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateReferenceSystem;
 
 use PHPCoord\Exception\UnknownCoordinateReferenceSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -37,10 +39,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider coordinateReferenceSystems
-     */
+    #[DataProvider('coordinateReferenceSystems')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Geographic2D::fromSRID($srid);

diff --git a/tests/CoordinateReferenceSystem/Geographic3DTest.php b/tests/CoordinateReferenceSystem/Geographic3DTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateReferenceSystem;
 
 use PHPCoord\Exception\UnknownCoordinateReferenceSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -37,10 +39,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider coordinateReferenceSystems
-     */
+    #[DataProvider('coordinateReferenceSystems')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Geographic3D::fromSRID($srid);

diff --git a/tests/CoordinateReferenceSystem/ProjectedTest.php b/tests/CoordinateReferenceSystem/ProjectedTest.php
@@ -10,6 +10,8 @@
 
 use PHPCoord\CoordinateOperation\CoordinateOperations;
 use PHPCoord\Exception\UnknownCoordinateReferenceSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -38,10 +40,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider coordinateReferenceSystems
-     */
+    #[DataProvider('coordinateReferenceSystems')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Projected::fromSRID($srid);

diff --git a/tests/CoordinateReferenceSystem/VerticalTest.php b/tests/CoordinateReferenceSystem/VerticalTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateReferenceSystem;
 
 use PHPCoord\Exception\UnknownCoordinateReferenceSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -37,10 +39,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider coordinateReferenceSystems
-     */
+    #[DataProvider('coordinateReferenceSystems')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Vertical::fromSRID($srid);

diff --git a/tests/CoordinateSystem/CartesianTest.php b/tests/CoordinateSystem/CartesianTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateSystem;
 
 use PHPCoord\Exception\UnknownCoordinateSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -35,10 +37,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider cartesian
-     */
+    #[DataProvider('cartesian')]
+    #[Group('integration')]
     public function testCanCreateSupportedCartesian(string $srid): void
     {
         $object = Cartesian::fromSRID($srid);

diff --git a/tests/CoordinateSystem/EllipsoidalTest.php b/tests/CoordinateSystem/EllipsoidalTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateSystem;
 
 use PHPCoord\Exception\UnknownCoordinateSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -35,10 +37,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider ellipsoidal
-     */
+    #[DataProvider('ellipsoidal')]
+    #[Group('integration')]
     public function testCanCreateSupportedEllipsoidal(string $srid): void
     {
         $object = Ellipsoidal::fromSRID($srid);

diff --git a/tests/CoordinateSystem/VerticalTest.php b/tests/CoordinateSystem/VerticalTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\CoordinateSystem;
 
 use PHPCoord\Exception\UnknownCoordinateSystemException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -35,10 +37,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider vertical
-     */
+    #[DataProvider('vertical')]
+    #[Group('integration')]
     public function testCanCreateSupportedVertical(string $srid): void
     {
         $object = Vertical::fromSRID($srid);

diff --git a/tests/Datum/DatumTest.php b/tests/Datum/DatumTest.php
@@ -10,6 +10,8 @@
 
 use PHPCoord\Exception\UnknownDatumException;
 use PHPCoord\UnitOfMeasure\Length\Metre;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -36,10 +38,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider datums
-     */
+    #[DataProvider('datums')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Datum::fromSRID($srid);

diff --git a/tests/Datum/EllipsoidTest.php b/tests/Datum/EllipsoidTest.php
@@ -9,6 +9,8 @@
 namespace PHPCoord\Datum;
 
 use PHPCoord\Exception\UnknownEllipsoidException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -35,10 +37,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider ellipsoids
-     */
+    #[DataProvider('ellipsoids')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = Ellipsoid::fromSRID($srid);

diff --git a/tests/Datum/PrimeMeridianTest.php b/tests/Datum/PrimeMeridianTest.php
@@ -10,6 +10,8 @@
 
 use PHPCoord\Exception\UnknownPrimeMeridianException;
 use PHPCoord\UnitOfMeasure\Angle\Degree;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -36,10 +38,8 @@ public function testCanGetSupportedWithHelp(): void
         }
     }
 
-    /**
-     * @group integration
-     * @dataProvider primeMeridians
-     */
+    #[DataProvider('primeMeridians')]
+    #[Group('integration')]
     public function testCanCreateSupported(string $srid): void
     {
         $object = PrimeMeridian::fromSRID($srid);