From 4ddd84b6a9b976b86d31d4c26da021636d7fd6bb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 13 Jan 2019 11:17:58 +0100
Subject: [PATCH] Fix undefined method
---
lib/SimpleSAML/Metadata/SAMLBuilder.php | 2 +-
lib/SimpleSAML/Metadata/SAMLParser.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index 66afa9345..929cb5ebf 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -192,7 +192,7 @@ class SAMLBuilder
$ea->addChildren($a);
}
$this->entityDescriptor->setExtensions(
- array_merge($this->entityDescriptor(), [$ea])
+ array_merge($this->entityDescriptor->getExtensions(), [$ea])
);
}
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 3f9eb3bca..961971758 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -353,7 +353,7 @@ class SAMLParser
} elseif (\SimpleSAML\Utils\XML::isDOMNodeOfType($element, 'EntitiesDescriptor', '@md') === true) {
return self::processDescriptorsElement(new \SAML2\XML\md\EntitiesDescriptor($element));
} else {
- throw new \Exception('Unexpected root node: ['.$element->getNamespaceURI().']:'.$element->getLocalName());
+ throw new \Exception('Unexpected root node: ['.$element->namespaceURI.']:'.$element->localName);
}
}
--
GitLab