Move XPath-constants to xml-common

Author: tvdijen

composer.json

@@ -44,7 +44,7 @@
         "ext-spl": "*",
 
         "simplesamlphp/assert": "^1.3",
-        "simplesamlphp/xml-common": "^1.18"
+        "simplesamlphp/xml-common": "^1.18.5"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "^1.7"

src/Constants.php

@@ -152,6 +152,4 @@ class Constants extends \SimpleSAML\XML\Constants
     public const XMLENC_ELEMENT = 'http://www.w3.org/2001/04/xmlenc#Element';
     public const XMLENC_ENCRYPTEDKEY = 'http://www.w3.org/2001/04/xmlenc#EncryptedKey';
     public const XMLENC_EXI = 'http://www.w3.org/2009/xmlenc11#EXI';
-
-    public const XPATH_URI = 'http://www.w3.org/TR/1999/REC-xpath-19991116';
 }

src/Utils/XML.php

@@ -101,7 +101,7 @@ public static function processTransforms(
                         }
                     }
                     break;
-                case C::XPATH_URI:
+                case C::XPATH10_URI:
                     $xpath = $transform->getXPath();
                     if ($xpath !== null) {
                         $arXPath = [];

src/XML/ds/Transform.php

@@ -38,8 +38,8 @@ final public function __construct(
         if ($xpath !== null) {
             Assert::nullOrEq(
                 $this->algorithm,
-                C::XPATH_URI,
-                sprintf('Transform algorithm "%s" required if XPath provided.', C::XPATH_URI),
+                C::XPATH10_URI,
+                sprintf('Transform algorithm "%s" required if XPath provided.', C::XPATH10_URI),
             );
         }
 
@@ -135,7 +135,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         $e->setAttribute('Algorithm', $algorithm);
 
         switch ($algorithm) {
-            case C::XPATH_URI:
+            case C::XPATH10_URI:
                 $this->getXpath()?->toXML($e);
                 break;
             case C::C14N_EXCLUSIVE_WITH_COMMENTS:

tests/XML/ds/RetrievalMethodTest.php

@@ -51,7 +51,7 @@ public static function setUpBeforeClass(): void
     public function testMarshalling(): void
     {
         $transforms = new Transforms(
-            [new Transform(C::XPATH_URI, new XPath('self::xenc:CipherValue[@Id="example1"]', ['xenc' => C::NS_XENC]))],
+            [new Transform(C::XPATH10_URI, new XPath('self::xenc:CipherValue[@Id="example1"]', ['xenc' => C::NS_XENC]))],
         );
 
         $retrievalMethod = new RetrievalMethod($transforms, '#Encrypted_KEY_ID', C:: XMLENC_ENCRYPTEDKEY);

tests/XML/ds/TransformTest.php

@@ -50,7 +50,7 @@ public static function setUpBeforeClass(): void
     public function testMarshalling(): void
     {
         $transform = new Transform(
-            C::XPATH_URI,
+            C::XPATH10_URI,
             new XPath('count(//. | //@* | //namespace::*)'),
         );
 

tests/XML/ds/TransformsTest.php

@@ -51,7 +51,7 @@ public function testMarshalling(): void
         $transforms = new Transforms(
             [
                 new Transform(
-                    C::XPATH_URI,
+                    C::XPATH10_URI,
                     new XPath(
                         'count(//. | //@* | //namespace::*)',
                     ),

tests/XML/xenc/CipherReferenceTest.php

@@ -54,7 +54,7 @@ public static function setUpBeforeClass(): void
         );
 
         $xpath = new XPath('count(//. | //@* | //namespace::*)');
-        $transform = new Transform(C::XPATH_URI, $xpath);
+        $transform = new Transform(C::XPATH10_URI, $xpath);
         self::$transforms = new Transforms([$transform]);
     }
 

tests/XML/xenc/DataReferenceTest.php

@@ -60,7 +60,7 @@ public function testMarshalling(): void
                 new Transforms(
                     [
                         new Transform(
-                            C::XPATH_URI,
+                            C::XPATH10_URI,
                             new XPath('self::xenc:EncryptedData[@Id="example1"]'),
                         ),
                     ],

tests/XML/xenc/KeyReferenceTest.php

@@ -60,7 +60,7 @@ public function testMarshalling(): void
                 new Transforms(
                     [
                         new Transform(
-                            C::XPATH_URI,
+                            C::XPATH10_URI,
                             new XPath('self::xenc:EncryptedKey[@Id="example1"]'),
                         ),
                     ],

tests/XML/xenc/ReferenceListTest.php

@@ -58,11 +58,11 @@ public static function setUpBeforeClass(): void
     public function testMarshalling(): void
     {
         $transformData = new Transform(
-            C::XPATH_URI,
+            C::XPATH10_URI,
             new XPath('self::xenc:EncryptedData[@Id="example1"]'),
         );
         $transformKey = new Transform(
-            C::XPATH_URI,
+            C::XPATH10_URI,
             new XPath('self::xenc:EncryptedKey[@Id="example1"]'),
         );
 

tests/XML/xenc/TransformsTest.php

@@ -51,7 +51,7 @@ public function testMarshalling(): void
         $transforms = new Transforms(
             [
                 new Transform(
-                    C::XPATH_URI,
+                    C::XPATH10_URI,
                     new XPath(
                         'count(//. | //@* | //namespace::*)',
                     ),