Skip to content
Snippets Groups Projects
Unverified Commit 9d33e884 authored by Tim van Dijen's avatar Tim van Dijen Committed by GitHub
Browse files

Update Configuration.php

parent acfb5d31
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,6 @@
*/
class SimpleSAML_Configuration implements \SimpleSAML\Utils\ClearableState
{
/**
* A default value which means that the given option is required.
*
......@@ -1294,7 +1293,7 @@ class SimpleSAML_Configuration implements \SimpleSAML\Utils\ClearableState
* @param string $prefix The prefix which should be used when reading from the metadata
* array. Defaults to ''.
*
* @return array|null Public key data, or null if no public key or was found.
* @return array Public key data, or null if no public key or was found.
*
* @throws Exception If the certificate or public key cannot be loaded from a file.
* @throws SimpleSAML_Error_Exception If the file does not contain a valid PEM-encoded certificate, or there is no
......@@ -1359,11 +1358,7 @@ class SimpleSAML_Configuration implements \SimpleSAML\Utils\ClearableState
);
}
if ($required) {
throw new SimpleSAML_Error_Exception($this->location.': Missing certificate in metadata.');
} else {
return null;
}
throw new SimpleSAML_Error_Exception($this->location.': Missing certificate in metadata.');
}
/**
......
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