From 98126950548a0c827c99feed309966f5b2982670 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 26 Apr 2022 19:28:29 +0200
Subject: [PATCH] Fix syntax errors
---
lib/SimpleSAML/Controller/Metadata.php | 12 ++++++------
lib/SimpleSAML/Controller/SingleLogout.php | 4 ++--
lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/SimpleSAML/Controller/Metadata.php b/lib/SimpleSAML/Controller/Metadata.php
index 1b2f70769..1e0e49d65 100644
--- a/lib/SimpleSAML/Controller/Metadata.php
+++ b/lib/SimpleSAML/Controller/Metadata.php
@@ -2,12 +2,12 @@
declare(strict_types=1);
-namespace SimpleSAML\Module\Controller;
+namespace SimpleSAML\Controller;
use Exception;
use SimpleSAML\Configuration;
use SimpleSAML\Error;
-use SimpleSAML\Metadata;
+use SimpleSAML\Metadata as SSPMetadata;
use SimpleSAML\Module;
use SimpleSAML\Module\saml\IdP\SAML2 as SAML2_IdP;
use SimpleSAML\Utils;
@@ -35,7 +35,7 @@ class Metadata
/**
* Controller constructor.
- *
+- *
* It initializes the global configuration for the controllers implemented here.
*
* @param \SimpleSAML\Configuration $config The configuration to use by the controllers.
@@ -76,7 +76,7 @@ class Metadata
return new RunnableResponse([$this->authUtils, 'requireAdmin']);
}
- $metadata = Metadata\MetaDataStorageHandler::getMetadataHandler();
+ $metadata = SSPMetadata\MetaDataStorageHandler::getMetadataHandler();
try {
if ($request->query->has('idpentityid')) {
@@ -86,14 +86,14 @@ class Metadata
}
$metaArray = SAML2_IdP::getHostedMetadata($idpentityid);
- $metaBuilder = new Metadata\SAMLBuilder($idpentityid);
+ $metaBuilder = new SSPMetadata\SAMLBuilder($idpentityid);
$metaBuilder->addMetadataIdP20($metaArray);
$metaBuilder->addOrganizationInfo($metaArray);
$metaxml = $metaBuilder->getEntityDescriptorText();
// sign the metadata if enabled
- $metaxml = Metadata\Signer::sign($metaxml, $metaArray, 'SAML 2 IdP');
+ $metaxml = SSPMetadata\Signer::sign($metaxml, $metaArray, 'SAML 2 IdP');
// make sure to export only the md:EntityDescriptor
$i = strpos($metaxml, '<md:EntityDescriptor');
diff --git a/lib/SimpleSAML/Controller/SingleLogout.php b/lib/SimpleSAML/Controller/SingleLogout.php
index 4b62a0882..b5eafd0ce 100644
--- a/lib/SimpleSAML/Controller/SingleLogout.php
+++ b/lib/SimpleSAML/Controller/SingleLogout.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace SimpleSAML\Module\Controller;
+namespace SimpleSAML\Controller;
use SAML2\Exception\Protocol\UnsupportedBindingException;
use SimpleSAML\Assert\Assert;
@@ -104,7 +104,7 @@ class SingleLogout
$httpUtils = new Utils\HTTP();
return new RunnableResponse(
[$idp, 'doLogoutRedirect'],
- [$httpUtils->checkURLAllowed($request->query->get('RelayState')]
+ [$httpUtils->checkURLAllowed($request->query->get('RelayState'))]
);
}
}
diff --git a/lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php b/lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php
index 12a9e1374..76fd2b984 100644
--- a/lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php
+++ b/lib/SimpleSAML/Controller/WebBrowserSingleSignOn.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace SimpleSAML\Module\Controller;
+namespace SimpleSAML\Controller;
use SAML2\Exception\Protocol\UnsupportedBindingException;
use SAML2\ArtifactResolve;
--
GitLab