Fix constants

simplesamlphp · May 8, 2023 · f56cf09 · f56cf09
1 parent fa791c3
commit f56cf09
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/src/SAML2/Constants.php b/src/SAML2/Constants.php
@@ -257,6 +257,26 @@ class Constants extends \SimpleSAML\XMLSecurity\Constants
      */
     public const NS_MD = 'urn:oasis:names:tc:SAML:2.0:metadata';
 
+    /**
+     * The namespace for the SAML 2 Metadata Extensions for Registration and Publication Information.
+     */
+    public const NS_MDRPI = 'urn:oasis:names:tc:SAML:metadata:rpi';
+
+    /**
+     * The namespace for the SAML 2 Metadata Extensions for Login and Discovery User Interface Version.
+     */
+    public const NS_MDUI = 'urn:oasis:names:tc:SAML:metadata:ui';
+
+    /**
+     * The namespace for the SAML 2 metadata attributes.
+     */
+    public const NS_MDATTR = 'urn:oasis:names:tc:SAML:metadata:attribute';
+
+    /**
+     * The namespace for the Shibboleth Metadata profile.
+     */
+    public const NS_SHIBMD = 'urn:mace:shibboleth:metadata:1.0';
+
     /**
      * The namespace for the SAML 2 assertions.
      */

diff --git a/src/SAML2/XML/alg/AbstractAlgElement.php b/src/SAML2/XML/alg/AbstractAlgElement.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\SAML2\XML\alg;
 
-use SAML2\Constants as C;
+use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\XML\AbstractElement;
 
 /**

diff --git a/src/SAML2/XML/mdattr/AbstractMdattrElement.php b/src/SAML2/XML/mdattr/AbstractMdattrElement.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\SAML2\XML\mdattr;
 
+use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\XML\AbstractElement;
 
 /**
@@ -14,7 +15,7 @@
 abstract class AbstractMdattrElement extends AbstractElement
 {
     /** @var string */
-    public const NS = 'urn:oasis:names:tc:SAML:metadata:attribute';
+    public const NS = C::NS_MDATTR;
 
     /** @var string */
     public const NS_PREFIX = 'mdattr';

diff --git a/src/SAML2/XML/mdrpi/AbstractMdrpiElement.php b/src/SAML2/XML/mdrpi/AbstractMdrpiElement.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\SAML2\XML\mdrpi;
 
+use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\XML\AbstractElement;
 
 /**
@@ -16,7 +17,7 @@
 abstract class AbstractMdrpiElement extends AbstractElement
 {
     /** @var string */
-    public const NS = 'urn:oasis:names:tc:SAML:metadata:rpi';
+    public const NS = C::NS_MDRPI;
 
     /** @var string */
     public const NS_PREFIX = 'mdrpi';

diff --git a/src/SAML2/XML/mdui/AbstractMduiElement.php b/src/SAML2/XML/mdui/AbstractMduiElement.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\SAML2\XML\mdui;
 
+use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\XML\AbstractElement;
 
 /**
@@ -16,7 +17,7 @@
 abstract class AbstractMduiElement extends AbstractElement
 {
     /** @var string */
-    public const NS = 'urn:oasis:names:tc:SAML:metadata:ui';
+    public const NS = C::NS_MDUI;
 
     /** @var string */
     public const NS_PREFIX = 'mdui';

diff --git a/src/SAML2/XML/shibmd/AbstractShibmdElement.php b/src/SAML2/XML/shibmd/AbstractShibmdElement.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\SAML2\XML\shibmd;
 
+use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\XML\AbstractElement;
 
 /**
@@ -14,7 +15,7 @@
 abstract class AbstractShibmdElement extends AbstractElement
 {
     /** @var string */
-    public const NS = 'urn:mace:shibboleth:metadata:1.0';
+    public const NS = C::NS_SHIBMD;
 
     /** @var string */
     public const NS_PREFIX = 'shibmd';