Skip to content
Snippets Groups Projects
Commit 488154e3 authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Add www-directory to psalm-config and fix some issues

parent 89c25f18
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<directory name="modules/saml" /> <directory name="modules/saml" />
<directory name="tests" /> <directory name="tests" />
<directory name="www" />
<!-- Ignore deprecated classes --> <!-- Ignore deprecated classes -->
<ignoreFiles> <ignoreFiles>
......
...@@ -47,10 +47,8 @@ if (!($request instanceof \SAML2\ArtifactResolve)) { ...@@ -47,10 +47,8 @@ if (!($request instanceof \SAML2\ArtifactResolve)) {
} }
$issuer = $request->getIssuer(); $issuer = $request->getIssuer();
if (!is_string($issuer)) { \Webmozart\Assert\Assert::notNull($issuer);
$issuer = $issuer->getValue(); $issuer = $issuer->getValue();
}
$spMetadata = $metadata->getMetaDataConfig($issuer, 'saml20-sp-remote'); $spMetadata = $metadata->getMetaDataConfig($issuer, 'saml20-sp-remote');
$artifact = $request->getArtifact(); $artifact = $request->getArtifact();
...@@ -60,7 +58,7 @@ $store->delete('artifact', $artifact); ...@@ -60,7 +58,7 @@ $store->delete('artifact', $artifact);
if ($responseData !== null) { if ($responseData !== null) {
$document = \SAML2\DOMDocumentFactory::fromString($responseData); $document = \SAML2\DOMDocumentFactory::fromString($responseData);
$responseXML = $document->firstChild; $responseXML = $document->documentElement;
} else { } else {
$responseXML = null; $responseXML = null;
} }
......
...@@ -200,9 +200,11 @@ try { ...@@ -200,9 +200,11 @@ try {
$technicalContactEmail = $config->getString('technicalcontact_email', false); $technicalContactEmail = $config->getString('technicalcontact_email', false);
if ($technicalContactEmail && $technicalContactEmail !== 'na@example.org') { if ($technicalContactEmail && $technicalContactEmail !== 'na@example.org') {
$techcontact['emailAddress'] = $technicalContactEmail; $techcontact = [
$techcontact['name'] = $config->getString('technicalcontact_name', null); 'emailAddress' => $technicalContactEmail,
$techcontact['contactType'] = 'technical'; 'name' => $config->getString('technicalcontact_name', null),
'contactType' => 'technical',
];
$metaArray['contacts'][] = Metadata::getContact($techcontact); $metaArray['contacts'][] = Metadata::getContact($techcontact);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment