Move tests to their own namespace

tvdijen · tvdijen · commit 698332c96eea · 2021-01-11T21:57:17.000+01:00
diff --git a/composer.json b/composer.json
@@ -28,7 +28,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SimpleSAML\\XMLSecurity\\": "tests"
+            "SimpleSAML\\XMLSecurity\\": "tests",
+            "SimpleSAML\\XMLSecurity\\Test\\Utils\\": "tests/Utils",
+            "SimpleSAML\\XMLSecurity\\Test\\XML\\": "tests/XML"
         }
     },
     "require": {
diff --git a/tests/Utils/CertificateTest.php b/tests/Utils/CertificateTest.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\Utils;
+namespace SimpleSAML\XMLSecurity\Test\Utils;
 
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\XMLSecurity\Utils\Certificate;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
 
 /**
diff --git a/tests/Utils/RandomTest.php b/tests/Utils/RandomTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SimpleSAML\XMLSecurity\Utils;
+namespace SimpleSAML\XMLSecurity\Test\Utils;
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XMLSecurity\Utils\Random;
diff --git a/tests/Utils/SecurityTest.php b/tests/Utils/SecurityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SimpleSAML\XMLSecurity\Utils;
+namespace SimpleSAML\XMLSecurity\Test\Utils;
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XMLSecurity\Utils\Security;
diff --git a/tests/XML/ds/KeyInfoTest.php b/tests/XML/ds/KeyInfoTest.php
@@ -2,13 +2,18 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\ds;
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\Chunk;
+use SimpleSAML\XMLSecurity\XML\ds\KeyName;
+use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
+use SimpleSAML\XMLSecurity\XML\ds\X509Data;
+use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
+use SimpleSAML\XMLSecurity\XML\ds\X509SubjectName;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
diff --git a/tests/XML/ds/KeyNameTest.php b/tests/XML/ds/KeyNameTest.php
@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\ds;
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\ds\KeyName;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
 /**
diff --git a/tests/XML/ds/X509CertificateTest.php b/tests/XML/ds/X509CertificateTest.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\ds;
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
+use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 use SimpleSAML\XMLSecurity\XMLSecurityKey;
 
diff --git a/tests/XML/ds/X509DataTest.php b/tests/XML/ds/X509DataTest.php
@@ -2,13 +2,16 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\ds;
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
+use SimpleSAML\XMLSecurity\XML\ds\X509Data;
+use SimpleSAML\XMLSecurity\XML\ds\X509SubjectName;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
diff --git a/tests/XML/ds/X509SubjectNameTest.php b/tests/XML/ds/X509SubjectNameTest.php
@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\ds;
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\ds\X509SubjectName;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
 /**
diff --git a/tests/XML/xenc/CipherDataTest.php b/tests/XML/xenc/CipherDataTest.php
@@ -2,12 +2,13 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\xenc\CipherData;
 use SimpleSAML\XMLSecurity\XMLSecurityDsig;
 
 /**
diff --git a/tests/XML/xenc/CipherReferenceTest.php b/tests/XML/xenc/CipherReferenceTest.php
@@ -2,12 +2,13 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\xenc\CipherReference;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
 /**
diff --git a/tests/XML/xenc/DataReferenceTest.php b/tests/XML/xenc/DataReferenceTest.php
@@ -2,12 +2,13 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\xenc\DataReference;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
 /**
diff --git a/tests/XML/xenc/EncryptedDataTest.php b/tests/XML/xenc/EncryptedDataTest.php
@@ -2,13 +2,17 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
+use SimpleSAML\XMLSecurity\XML\xenc\CipherData;
+use SimpleSAML\XMLSecurity\XML\xenc\EncryptedData;
+use SimpleSAML\XMLSecurity\XML\xenc\EncryptedKey;
+use SimpleSAML\XMLSecurity\XML\xenc\EncryptionMethod;
 use SimpleSAML\XMLSecurity\XMLSecurityDsig;
 
 /**
diff --git a/tests/XML/xenc/EncryptedKeyTest.php b/tests/XML/xenc/EncryptedKeyTest.php
@@ -2,14 +2,19 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\Utils as XMLUtils;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
+use SimpleSAML\XMLSecurity\XML\xenc\CipherData;
+use SimpleSAML\XMLSecurity\XML\xenc\DataReference;
+use SimpleSAML\XMLSecurity\XML\xenc\EncryptedKey;
+use SimpleSAML\XMLSecurity\XML\xenc\EncryptionMethod;
+use SimpleSAML\XMLSecurity\XML\xenc\ReferenceList;
 use SimpleSAML\XMLSecurity\XMLSecurityDsig;
 
 /**
diff --git a/tests/XML/xenc/EncryptionMethodTest.php b/tests/XML/xenc/EncryptionMethodTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
@@ -11,6 +11,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\Exception\MissingAttributeException;
 use SimpleSAML\XML\Utils as XMLUtils;
+use SimpleSAML\XMLSecurity\XML\xenc\EncryptionMethod;
 use SimpleSAML\XMLSecurity\Constants;
 
 /**
diff --git a/tests/XML/xenc/KeyReferenceTest.php b/tests/XML/xenc/KeyReferenceTest.php
@@ -2,12 +2,13 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\xenc\KeyReference;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
 /**
diff --git a/tests/XML/xenc/ReferenceListTest.php b/tests/XML/xenc/ReferenceListTest.php
@@ -2,12 +2,15 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\XMLSecurity\XML\xenc;
+namespace SimpleSAML\XMLSecurity\Test\XML\xenc;
 
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XMLSecurity\XML\xenc\DataReference;
+use SimpleSAML\XMLSecurity\XML\xenc\KeyReference;
+use SimpleSAML\XMLSecurity\XML\xenc\ReferenceList;
 use SimpleSAML\XMLSecurity\XMLSecurityDSig;
 
 /**
