|
@@ -76,7 +76,7 @@ discard block |
|
|
block discarded – undo |
|
76
|
76
|
* |
|
77
|
77
|
* @var \SimpleSAML\SAML2\XML\md\EntitiesDescriptor|\SimpleSAML\SAML2\XML\md\EntityDescriptor|null |
|
78
|
78
|
*/ |
|
79
|
|
- protected EntityDescriptor|EntitiesDescriptor|null $metadata = null; |
|
|
79
|
+ protected EntityDescriptor | EntitiesDescriptor | null $metadata = null; |
|
80
|
80
|
|
|
81
|
81
|
/** |
|
82
|
82
|
* The cache ID. |
|
@@ -129,7 +129,7 @@ discard block |
|
|
block discarded – undo |
|
129
|
129
|
* @return \SimpleSAML\SAML2\XML\md\EntitiesDescriptor|\SimpleSAML\SAML2\XML\md\EntityDescriptor|null |
|
130
|
130
|
* The downloaded metadata or NULL if we were unable to download or parse it. |
|
131
|
131
|
*/ |
|
132
|
|
- private function downloadMetadata(): EntitiesDescriptor|EntityDescriptor|null |
|
|
132
|
+ private function downloadMetadata(): EntitiesDescriptor | EntityDescriptor | null |
|
133
|
133
|
{ |
|
134
|
134
|
Logger::debug($this->logLoc . 'Downloading metadata from ' . var_export($this->url, true)); |
|
135
|
135
|
$configUtils = new Utils\Config(); |
|
@@ -252,7 +252,7 @@ discard block |
|
|
block discarded – undo |
|
252
|
252
|
* @return \SimpleSAML\SAML2\XML\md\EntityDescriptor|\SimpleSAML\SAML2\XML\md\EntitiesDescriptor|null |
|
253
|
253
|
* The downloaded metadata. |
|
254
|
254
|
*/ |
|
255
|
|
- public function getMetadata(): EntityDescriptor|EntitiesDescriptor|null |
|
|
255
|
+ public function getMetadata(): EntityDescriptor | EntitiesDescriptor | null |
|
256
|
256
|
{ |
|
257
|
257
|
if ($this->metadata !== null) { |
|
258
|
258
|
/* We have already downloaded the metdata. */ |
Please login to merge, or discard this patch.