Migrate phpunit metadata to attributes

Author: tvdijen

tests/public/LoginIntegrationTest.php

@@ -6,6 +6,7 @@
 
 use CurlHandle;
 use DOMDocument;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\TestUtils\BuiltInServer;
@@ -162,10 +163,10 @@ public function testWrongServiceUrl(): void
 
     /**
      * Test a valid service URL
-     * @dataProvider validServiceUrlProvider
      * @param string $serviceParam The name of the query parameter to use for the service url
      * @param string $ticketParam The name of the query parameter that will contain the ticket
      */
+    #[DataProvider('validServiceUrlProvider')]
     public function testValidServiceUrl(string $serviceParam, string $ticketParam): void
     {
         $service_url = 'http://host1.domain:1234/path1';

tests/public/UtilsTest.php

@@ -11,6 +11,7 @@
 
 namespace SimpleSAML\Casserver;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 require_once dirname(__DIR__, 2) . '/public/utility/urlUtils.php';
@@ -20,8 +21,8 @@ class UtilsTest extends TestCase
     /**
      * @param string $service the service url to check
      * @param bool $allowed is the service url allowed?
-     * @dataProvider checkServiceURLProvider
      */
+    #[DataProvider('checkServiceURLProvider')]
     public function testCheckServiceURL(string $service, bool $allowed): void
     {
         $legalServices = [

tests/src/ServiceValidatorTest.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Casserver;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\casserver\Cas\ServiceValidator;
@@ -21,8 +22,8 @@ class ServiceValidatorTest extends TestCase
      *
      * @param string $service The service url to test
      * @param array $expectedConfig The expected CAS configuration to use
-     * @dataProvider overridingDataProvider
      */
+    #[DataProvider('overridingDataProvider')]
     public function testOverridingServiceConfig(string $service, array $expectedConfig): void
     {
         $casConfig = [
@@ -136,8 +137,8 @@ public function overridingDataProvider(): array
      * Test confirming service url matching and per service configuration
      * @param string $service the service url to check
      * @param bool $allowed is the service url allowed?
-     * @dataProvider checkServiceURLProvider
      */
+    #[DataProvider('checkServiceURLProvider')]
     public function testCheckServiceURL(string $service, bool $allowed): void
     {
         $casConfig = [

tests/src/TicketValidatorTest.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Casserver;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\casserver\Cas\CasException;
@@ -125,10 +126,10 @@ public function testExpiredTicket(): void
     }
 
     /**
-     * @dataProvider urlSanitizationProvider
      * @param string $serviceUrl The service url that will get sanitized
      * @param string $expectedSanitzedUrl The expected result
      */
+    #[DataProvider('urlSanitizationProvider')]
     public function testUrlSanitization(string $serviceUrl, string $expectedSanitzedUrl): void
     {
         $this->assertEquals($expectedSanitzedUrl, TicketValidator::sanitize($serviceUrl));
@@ -159,6 +160,7 @@ public function urlSanitizationProvider(): array
 
     /**
      * Create a ticket to use for testing
+     *
      * @param string $serviceUrl The service url for this ticket
      * @param int $expiration seconds from now that ticket should expire
      * @return array the ticket contents