Fix merge

Author: tvdijen

tests/SecurityPolicy/XML/sp_200507/Type/IncludeTokenValueTest.php

@@ -8,10 +8,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
-<<<<<<< HEAD
 use SimpleSAML\WebServices\SecurityPolicy\Constants as C;
-=======
->>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\IncludeToken;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\Type\IncludeTokenValue;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
@@ -42,7 +39,6 @@ public function testIncludeToken(bool $shouldPass, string $uri): void
 
 
     /**
-<<<<<<< HEAD
      * Test helpers
      */
     public function testToAttribute(): void
@@ -68,8 +64,6 @@ public function testFromEnum(): void
 
 
     /**
-=======
->>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))
      * @return array<string, array{0: bool, 1: string}>
      */
     public static function provideURI(): array

tests/SecurityPolicy/XML/sp_200702/Type/IncludeTokenValueTest.php

@@ -8,10 +8,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
-<<<<<<< HEAD
 use SimpleSAML\WebServices\SecurityPolicy\Constants as C;
-=======
->>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\IncludeToken;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\Type\IncludeTokenValue;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
@@ -42,7 +39,6 @@ public function testIncludeToken(bool $shouldPass, string $uri): void
 
 
     /**
-<<<<<<< HEAD
      * Test helpers
      */
     public function testToAttribute(): void
@@ -68,21 +64,14 @@ public function testFromEnum(): void
 
 
     /**
-=======
->>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))
      * @return array<string, array{0: bool, 1: string}>
      */
     public static function provideURI(): array
     {
         return [
             'Always' => [true, IncludeToken::Always->value],
-<<<<<<< HEAD
-            'AlwaysToRecipient' => [true, IncludeToken::AlwaysToRecipient->value],
-            'AlwaysToInitiator' => [true, IncludeToken::AlwaysToInitiator->value],
-=======
             'AlwaysToInitiator' => [true, IncludeToken::AlwaysToInitiator->value],
             'AlwaysToRecipient' => [true, IncludeToken::AlwaysToRecipient->value],
->>>>>>> cca25c1 (Fix namespaced IncludeToken-attribute (both sp-versions and coverage))
             'Once' => [true, IncludeToken::Once->value],
             'Never' => [true, IncludeToken::Never->value],
             'urn' => [false, 'urn:x-simplesamlphp:phpunit'],