Fix namespaces

tvdijen · tvdijen · commit b70b94581437 · 2023-09-02T12:45:18.000+02:00
diff --git a/modules/saml/src/Auth/Source/SP.php b/modules/saml/src/Auth/Source/SP.php
@@ -8,14 +8,15 @@
 use SimpleSAML\{Auth, Configuration, Error, IdP, Logger, Module, Session, Store, Utils};
 use SimpleSAML\Assert\{Assert, AssertionFailedException};
 use SimpleSAML\Metadata\MetaDataStorageHandler;
-use SimpleSAML\SAML2\{AuthnRequest, Binding, LogoutRequest};
+use SimpleSAML\SAML2\Binding;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
 use SimpleSAML\SAML2\Exception\Protocol\{NoAvailableIDPException, NoPassiveException, NoSupportedIDPException};
 use SimpleSAML\SAML2\XML\md\ContactPerson;
 use SimpleSAML\SAML2\XML\saml\NameID;
 use SimpleSAML\SAML2\XML\saml\{AuthnContextClassRef};
 use SimpleSAML\SAML2\XML\samlp\{Extensions, IDPEntry, IDPList, RequestedAuthnContext, RequesterID, Scoping};
+use SimpleSAML\SAML2\XML\samlp\{AuthnRequest, LogoutRequest};
 use SimpleSAML\Store\StoreFactory;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Component\HttpFoundation\{RedirectResponse, Request, Response};
diff --git a/tests/Utils/SpTester.php b/tests/Utils/SpTester.php
@@ -7,7 +7,8 @@
 use ReflectionObject;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\saml\Auth\Source\SP;
-use SimpleSAML\SAML2\{AuthnRequest, Binding, LogoutRequest};
+use SimpleSAML\SAML2\Binding;
+use SimpleSAML\SAML2\XML\samlp\{AuthnRequest, LogoutRequest};
 use Symfony\Component\HttpFoundation\Response;
 
 /**
diff --git a/tests/modules/saml/src/Auth/Source/SPTest.php b/tests/modules/saml/src/Auth/Source/SPTest.php
@@ -9,12 +9,12 @@
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\Exception;
-use SimpleSAML\SAML2\{AuthnRequest, LogoutRequest};
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\Protocol\{NoAvailableIDPException, NoSupportedIDPException};
 use SimpleSAML\SAML2\Utils\XPath;
 use SimpleSAML\SAML2\XML\saml\AuthnContextClassRef;
 use SimpleSAML\SAML2\XML\saml\NameID;
+use SimpleSAML\SAML2\XML\samlp\{AuthnRequest, LogoutRequest};
 use SimpleSAML\SAML2\XML\samlp\{IDPEntry, IDPList};
 use SimpleSAML\Test\Metadata\MetaDataStorageSourceTest;
 use SimpleSAML\TestUtils\ClearStateTestCase;
@@ -120,7 +120,7 @@ protected function setUp(): void
      * @param array $state The state array to use in the test. This is an array of the parameters described in section
      * 2 of https://simplesamlphp.org/docs/development/saml:sp
      *
-     * @return \SimpleSAML\SAML2\AuthnRequest The AuthnRequest generated.
+     * @return \SimpleSAML\SAML2\XML\samlp\AuthnRequest The AuthnRequest generated.
      */
     private function createAuthnRequest(array $state = []): AuthnRequest
     {
@@ -147,7 +147,7 @@ private function createAuthnRequest(array $state = []): AuthnRequest
      * @param array $state The state array to use in the test. This is an array of the parameters described in section
      * 2 of https://simplesamlphp.org/docs/development/saml:sp
      *
-     * @return \SimpleSAML\SAML2\LogoutRequest The LogoutRequest generated.
+     * @return \SimpleSAML\SAML2\XML\samlp\LogoutRequest The LogoutRequest generated.
      */
     private function createLogoutRequest(array $state = []): LogoutRequest
     {
