Reorder library files

composer.json

@@ -13,11 +13,11 @@
         "ext-dom": "*",
 
         "psr/log": "^2.0 || ^3.0",
-        "simplesamlphp/xml-common": "^0.12.0",
-        "simplesamlphp/assert": "^0.7.0"
+        "simplesamlphp/xml-common": "^1.5.0",
+        "simplesamlphp/assert": "^1.0.2"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.3.1"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.4.1"
     },
     "autoload": {
         "psr-4": {

tests/XML/cas/AttributesTest.php

@@ -11,9 +11,9 @@
 use SimpleSAML\CAS\XML\cas\AuthenticationDate;
 use SimpleSAML\CAS\XML\cas\IsFromNewLogin;
 use SimpleSAML\CAS\XML\cas\LongTermAuthenticationRequestTokenUsed;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -38,7 +38,7 @@ protected function setUp(): void
         $this->testedClass = Attributes::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_attributes.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_attributes.xml',
         );
     }
 

tests/XML/cas/AuthenticationDateTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\AuthenticationDate;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = AuthenticationDate::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_authenticationDate.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_authenticationDate.xml',
         );
     }
 

tests/XML/cas/AuthenticationFailureTest.php

@@ -8,8 +8,8 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\Constants as C;
 use SimpleSAML\CAS\XML\cas\AuthenticationFailure;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -34,7 +34,7 @@ protected function setUp(): void
         $this->testedClass = AuthenticationFailure::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_authenticationFailure.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_authenticationFailure.xml',
         );
     }
 

tests/XML/cas/AuthenticationSuccessTest.php

@@ -16,9 +16,9 @@
 use SimpleSAML\CAS\XML\cas\Proxies;
 use SimpleSAML\CAS\XML\cas\Proxy;
 use SimpleSAML\CAS\XML\cas\User;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -44,7 +44,7 @@ protected function setUp(): void
         $this->testedClass = AuthenticationSuccess::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_authenticationSuccess.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_authenticationSuccess.xml',
         );
     }
 

tests/XML/cas/IsFromNewLoginTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\IsFromNewLogin;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = IsFromNewLogin::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_isFromNewLogin.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_isFromNewLogin.xml',
         );
     }
 

tests/XML/cas/LongTermAuthenticationRequestTokenUsedTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\LongTermAuthenticationRequestTokenUsed;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = LongTermAuthenticationRequestTokenUsed::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_longTermAuthenticationRequestTokenUsed.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_longTermAuthenticationRequestTokenUsed.xml',
         );
     }
 

tests/XML/cas/ProxiesTest.php

@@ -8,9 +8,9 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\Proxies;
 use SimpleSAML\CAS\XML\cas\Proxy;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\Exception\MissingElementException;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -34,7 +34,7 @@ protected function setUp(): void
         $this->testedClass = Proxies::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_proxies.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_proxies.xml',
         );
     }
 

tests/XML/cas/ProxyFailureTest.php

@@ -8,8 +8,8 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\Constants as C;
 use SimpleSAML\CAS\XML\cas\ProxyFailure;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -34,7 +34,7 @@ protected function setUp(): void
         $this->testedClass = ProxyFailure::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_proxyFailure.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_proxyFailure.xml',
         );
     }
 

tests/XML/cas/ProxyGrantingTicketTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\ProxyGrantingTicket;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = ProxyGrantingTicket::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_proxyGrantingTicket.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_proxyGrantingTicket.xml',
         );
     }
 

tests/XML/cas/ProxySuccessTest.php

@@ -9,7 +9,7 @@
 use SimpleSAML\CAS\Constants as C;
 use SimpleSAML\CAS\XML\cas\ProxySuccess;
 use SimpleSAML\CAS\XML\cas\ProxyTicket;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 
 use function dirname;
@@ -35,7 +35,7 @@ protected function setUp(): void
         $this->testedClass = ProxySuccess::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_proxySuccess.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_proxySuccess.xml',
         );
     }
 

tests/XML/cas/ProxyTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\Proxy;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = Proxy::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_proxy.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_proxy.xml',
         );
     }
 

tests/XML/cas/ProxyTicketTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\ProxyTicket;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = ProxyTicket::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_proxyTicket.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_proxyTicket.xml',
         );
     }
 

tests/XML/cas/ServiceResponseTest.php

@@ -14,8 +14,8 @@
 use SimpleSAML\CAS\XML\cas\ProxyGrantingTicket;
 use SimpleSAML\CAS\XML\cas\ServiceResponse;
 use SimpleSAML\CAS\XML\cas\User;
-use SimpleSAML\Test\XML\SchemaValidationTestTrait;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
+use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 
@@ -39,12 +39,12 @@ final class ServiceResponseTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->schema = dirname(__FILE__, 4) . '/schemas/cas-server-protocol-3.0.xsd';
+        $this->schema = dirname(__FILE__, 4) . '/resources/schemas/cas-server-protocol-3.0.xsd';
 
         $this->testedClass = ServiceResponse::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_serviceResponse.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_serviceResponse.xml',
         );
     }
 

tests/XML/cas/UserTest.php

@@ -7,8 +7,8 @@
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\CAS\XML\cas\User;
-use SimpleSAML\Test\XML\SerializableElementTestTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
 
 use function dirname;
 use function strval;
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->testedClass = User::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 3) . '/resources/xml/cas_user.xml',
+            dirname(__FILE__, 4) . '/resources/xml/cas_user.xml',
         );
     }