From 4f9c3e67ef1ca6264c6904e224e3c2aa680ab54e Mon Sep 17 00:00:00 2001 From: Tim van Dijen Date: Wed, 20 Mar 2024 10:21:15 +0100 Subject: [PATCH] Migrate phpunit metadata to attributes --- composer.json | 4 ++-- tests/XML/cas/AttributesTest.php | 9 +++++---- tests/XML/cas/AuthenticationDateTest.php | 7 ++++--- tests/XML/cas/AuthenticationFailureTest.php | 10 ++++++---- tests/XML/cas/AuthenticationSuccessTest.php | 12 +++++++----- tests/XML/cas/IsFromNewLoginTest.php | 7 ++++--- .../LongTermAuthenticationRequestTokenUsedTest.php | 7 ++++--- tests/XML/cas/ProxiesTest.php | 7 ++++--- tests/XML/cas/ProxyFailureTest.php | 10 ++++++---- tests/XML/cas/ProxyGrantingTicketTest.php | 7 ++++--- tests/XML/cas/ProxySuccessTest.php | 10 ++++++---- tests/XML/cas/ProxyTest.php | 7 ++++--- tests/XML/cas/ProxyTicketTest.php | 7 ++++--- tests/XML/cas/ServiceResponseTest.php | 7 ++++--- tests/XML/cas/UserTest.php | 7 ++++--- 15 files changed, 68 insertions(+), 50 deletions(-) diff --git a/composer.json b/composer.json index 20745e2..856e93a 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ "php": "^8.1", "ext-dom": "*", - "simplesamlphp/assert": "^1.0", - "simplesamlphp/xml-common": "^1.14" + "simplesamlphp/assert": "^1.1", + "simplesamlphp/xml-common": "^1.16" }, "require-dev": { "simplesamlphp/simplesamlphp-test-framework": "^1.5" diff --git a/tests/XML/cas/AttributesTest.php b/tests/XML/cas/AttributesTest.php index bddf42d..66279ec 100644 --- a/tests/XML/cas/AttributesTest.php +++ b/tests/XML/cas/AttributesTest.php @@ -5,8 +5,10 @@ namespace SimpleSAML\CAS\Test\XML\cas; use DateTimeImmutable; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; use SimpleSAML\CAS\Utils\XPath; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\Attributes; use SimpleSAML\CAS\XML\cas\AuthenticationDate; use SimpleSAML\CAS\XML\cas\IsFromNewLogin; @@ -21,12 +23,11 @@ /** * Class \SimpleSAML\CAS\XML\cas\AttributesTest * - * @covers \SimpleSAML\CAS\Utils\XPath - * @covers \SimpleSAML\CAS\XML\cas\Attributes - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(XPath::class)] +#[CoversClass(Attributes::class)] +#[CoversClass(AbstractCasElement::class)] final class AttributesTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/AuthenticationDateTest.php b/tests/XML/cas/AuthenticationDateTest.php index 4605661..0d9f494 100644 --- a/tests/XML/cas/AuthenticationDateTest.php +++ b/tests/XML/cas/AuthenticationDateTest.php @@ -5,7 +5,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; use DateTimeImmutable; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\AuthenticationDate; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,11 +18,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\AuthenticationDateTest * - * @covers \SimpleSAML\CAS\XML\cas\AuthenticationDate - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(AuthenticationDate::class)] +#[CoversClass(AbstractCasElement::class)] final class AuthenticationDateTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/AuthenticationFailureTest.php b/tests/XML/cas/AuthenticationFailureTest.php index 46b4600..a7739a8 100644 --- a/tests/XML/cas/AuthenticationFailureTest.php +++ b/tests/XML/cas/AuthenticationFailureTest.php @@ -4,8 +4,11 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; use SimpleSAML\CAS\Error as ERR; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; +use SimpleSAML\CAS\XML\cas\AbstractResponse; use SimpleSAML\CAS\XML\cas\AuthenticationFailure; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,12 +19,11 @@ /** * Class \SimpleSAML\CAS\XML\cas\AuthenticationFailureTest * - * @covers \SimpleSAML\CAS\XML\cas\AuthenticationFailure - * @covers \SimpleSAML\CAS\XML\cas\AbstractResponse - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(AuthenticationFailure::class)] +#[CoversClass(AbstractResponse::class)] +#[CoversClass(AbstractCasElement::class)] final class AuthenticationFailureTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/AuthenticationSuccessTest.php b/tests/XML/cas/AuthenticationSuccessTest.php index bfc8c33..acff1f1 100644 --- a/tests/XML/cas/AuthenticationSuccessTest.php +++ b/tests/XML/cas/AuthenticationSuccessTest.php @@ -5,8 +5,11 @@ namespace SimpleSAML\CAS\Test\XML\cas; use DateTimeImmutable; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; use SimpleSAML\CAS\Utils\XPath; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; +use SimpleSAML\CAS\XML\cas\AbstractResponse; use SimpleSAML\CAS\XML\cas\Attributes; use SimpleSAML\CAS\XML\cas\AuthenticationDate; use SimpleSAML\CAS\XML\cas\AuthenticationSuccess; @@ -26,13 +29,12 @@ /** * Class \SimpleSAML\CAS\XML\cas\AuthenticationSuccessTest * - * @covers \SimpleSAML\CAS\Utils\XPath - * @covers \SimpleSAML\CAS\XML\cas\AuthenticationSuccess - * @covers \SimpleSAML\CAS\XML\cas\AbstractResponse - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(XPath::class)] +#[CoversClass(AuthenticationSuccess::class)] +#[CoversClass(AbstractResponse::class)] +#[CoversClass(AbstractCasElement::class)] final class AuthenticationSuccessTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/IsFromNewLoginTest.php b/tests/XML/cas/IsFromNewLoginTest.php index 214c693..83e068f 100644 --- a/tests/XML/cas/IsFromNewLoginTest.php +++ b/tests/XML/cas/IsFromNewLoginTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\IsFromNewLogin; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -15,11 +17,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\IsFromNewLoginTest * - * @covers \SimpleSAML\CAS\XML\cas\IsFromNewLogin - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(IsFromNewLogin::class)] +#[CoversClass(AbstractCasElement::class)] final class IsFromNewLoginTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/LongTermAuthenticationRequestTokenUsedTest.php b/tests/XML/cas/LongTermAuthenticationRequestTokenUsedTest.php index 306378b..98ba087 100644 --- a/tests/XML/cas/LongTermAuthenticationRequestTokenUsedTest.php +++ b/tests/XML/cas/LongTermAuthenticationRequestTokenUsedTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\LongTermAuthenticationRequestTokenUsed; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -15,11 +17,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\LongTermAuthenticationRequestTokenUsedTest * - * @covers \SimpleSAML\CAS\XML\cas\LongTermAuthenticationRequestTokenUsed - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(LongTermAuthenticationRequestTokenUsed::class)] +#[CoversClass(AbstractCasElement::class)] final class LongTermAuthenticationRequestTokenUsedTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ProxiesTest.php b/tests/XML/cas/ProxiesTest.php index 8294065..cc4e270 100644 --- a/tests/XML/cas/ProxiesTest.php +++ b/tests/XML/cas/ProxiesTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\Proxies; use SimpleSAML\CAS\XML\cas\Proxy; use SimpleSAML\XML\DOMDocumentFactory; @@ -16,11 +18,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\ProxiesTest * - * @covers \SimpleSAML\CAS\XML\cas\Proxies - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(Proxies::class)] +#[CoversClass(AbstractCasElement::class)] final class ProxiesTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ProxyFailureTest.php b/tests/XML/cas/ProxyFailureTest.php index a56a958..9aea01d 100644 --- a/tests/XML/cas/ProxyFailureTest.php +++ b/tests/XML/cas/ProxyFailureTest.php @@ -4,8 +4,11 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; use SimpleSAML\CAS\Error as ERR; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; +use SimpleSAML\CAS\XML\cas\AbstractResponse; use SimpleSAML\CAS\XML\cas\ProxyFailure; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -16,12 +19,11 @@ /** * Class \SimpleSAML\CAS\XML\cas\ProxyFailureTest * - * @covers \SimpleSAML\CAS\XML\cas\ProxyFailure - * @covers \SimpleSAML\CAS\XML\cas\AbstractResponse - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(ProxyFailure::class)] +#[CoversClass(AbstractResponse::class)] +#[CoversClass(AbstractCasElement::class)] final class ProxyFailureTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ProxyGrantingTicketTest.php b/tests/XML/cas/ProxyGrantingTicketTest.php index 0688935..c6c0711 100644 --- a/tests/XML/cas/ProxyGrantingTicketTest.php +++ b/tests/XML/cas/ProxyGrantingTicketTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\ProxyGrantingTicket; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -15,11 +17,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\ProxyGrantingTicketTest * - * @covers \SimpleSAML\CAS\XML\cas\ProxyGrantingTicket - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(ProxyGrantingTicket::class)] +#[CoversClass(AbstractCasElement::class)] final class ProxyGrantingTicketTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ProxySuccessTest.php b/tests/XML/cas/ProxySuccessTest.php index 35c465f..b76036f 100644 --- a/tests/XML/cas/ProxySuccessTest.php +++ b/tests/XML/cas/ProxySuccessTest.php @@ -4,7 +4,10 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; +use SimpleSAML\CAS\XML\cas\AbstractResponse; use SimpleSAML\CAS\XML\cas\ProxySuccess; use SimpleSAML\CAS\XML\cas\ProxyTicket; use SimpleSAML\XML\DOMDocumentFactory; @@ -16,12 +19,11 @@ /** * Class \SimpleSAML\CAS\XML\cas\ProxySuccessTest * - * @covers \SimpleSAML\CAS\XML\cas\ProxySuccess - * @covers \SimpleSAML\CAS\XML\cas\AbstractResponse - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(ProxySuccess::class)] +#[CoversClass(AbstractResponse::class)] +#[CoversClass(AbstractCasElement::class)] final class ProxySuccessTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ProxyTest.php b/tests/XML/cas/ProxyTest.php index f29c730..d0b66b6 100644 --- a/tests/XML/cas/ProxyTest.php +++ b/tests/XML/cas/ProxyTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\Proxy; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -15,11 +17,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\ProxyTest * - * @covers \SimpleSAML\CAS\XML\cas\Proxy - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(Proxy::class)] +#[CoversClass(AbstractCasElement::class)] final class ProxyTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ProxyTicketTest.php b/tests/XML/cas/ProxyTicketTest.php index c09d085..bb724d9 100644 --- a/tests/XML/cas/ProxyTicketTest.php +++ b/tests/XML/cas/ProxyTicketTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\ProxyTicket; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -15,11 +17,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\ProxyTicketTest * - * @covers \SimpleSAML\CAS\XML\cas\ProxyTicket - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(ProxyTicket::class)] +#[CoversClass(AbstractCasElement::class)] final class ProxyTicketTest extends TestCase { use SerializableElementTestTrait; diff --git a/tests/XML/cas/ServiceResponseTest.php b/tests/XML/cas/ServiceResponseTest.php index 6f91664..2820b97 100644 --- a/tests/XML/cas/ServiceResponseTest.php +++ b/tests/XML/cas/ServiceResponseTest.php @@ -5,7 +5,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; use DateTimeImmutable; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\Attributes; use SimpleSAML\CAS\XML\cas\AuthenticationDate; use SimpleSAML\CAS\XML\cas\AuthenticationSuccess; @@ -25,11 +27,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\ServiceResponseTest * - * @covers \SimpleSAML\CAS\XML\cas\ServiceResponse - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(ServiceResponse::class)] +#[CoversClass(AbstractCasElement::class)] final class ServiceResponseTest extends TestCase { use SchemaValidationTestTrait; diff --git a/tests/XML/cas/UserTest.php b/tests/XML/cas/UserTest.php index 912455a..64fb1d9 100644 --- a/tests/XML/cas/UserTest.php +++ b/tests/XML/cas/UserTest.php @@ -4,7 +4,9 @@ namespace SimpleSAML\CAS\Test\XML\cas; +use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; +use SimpleSAML\CAS\XML\cas\AbstractCasElement; use SimpleSAML\CAS\XML\cas\User; use SimpleSAML\XML\DOMDocumentFactory; use SimpleSAML\XML\TestUtils\SerializableElementTestTrait; @@ -15,11 +17,10 @@ /** * Class \SimpleSAML\CAS\XML\cas\UserTest * - * @covers \SimpleSAML\CAS\XML\cas\User - * @covers \SimpleSAML\CAS\XML\cas\AbstractCasElement - * * @package simplesamlphp/cas */ +#[CoversClass(User::class)] +#[CoversClass(AbstractCasElement::class)] final class UserTest extends TestCase { use SerializableElementTestTrait;