Reflect changes in xml-common 2.0

Author: tvdijen

composer.json

@@ -44,7 +44,7 @@
         "ext-spl": "*",
 
         "simplesamlphp/assert": "~1.8.1",
-        "simplesamlphp/xml-common": "~2.0.4"
+        "simplesamlphp/xml-common": "~2.0.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "~1.9.2"

src/TestUtils/SignedElementTestTrait.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\XMLSecurity\TestUtils;
 
 use DOMDocument;
-use SimpleSAML\XMLSchema\Type\Builtin\Base64BinaryValue;
+use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;

src/Type/CryptoBinaryValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\XMLSecurity\Type;
 
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
-use SimpleSAML\XMLSchema\Type\Builtin\Base64BinaryValue;
+use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 /**

src/Type/DigestValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\XMLSecurity\Type;
 
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
-use SimpleSAML\XMLSchema\Type\Builtin\Base64BinaryValue;
+use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 /**

src/Type/HMACOutputLengthValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\XMLSecurity\Type;
 
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
-use SimpleSAML\XMLSchema\Type\Builtin\IntegerValue;
+use SimpleSAML\XMLSchema\Type\IntegerValue;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 /**

src/Type/KeySizeValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\XMLSecurity\Type;
 
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
-use SimpleSAML\XMLSchema\Type\Builtin\IntegerValue;
+use SimpleSAML\XMLSchema\Type\IntegerValue;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 
 /**

src/Utils/XML.php

@@ -7,6 +7,7 @@
 use DOMElement;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\XML\ds\Transforms;
+use SimpleSAML\XPath\Constants as XPATH_C;
 
 use function array_map;
 use function is_null;
@@ -101,7 +102,7 @@ public static function processTransforms(
                         }
                     }
                     break;
-                case C::XPATH10_URI:
+                case XPATH_C::XPATH10_URI:
                     $xpath = $transform->getXPath();
                     if ($xpath !== null) {
                         $arXPath = [];

src/Utils/XPath.php

@@ -8,9 +8,9 @@
 use DOMElement;
 use DOMNode;
 use DOMXPath;
-use SimpleSAML\XML\Utils\XPath as XPathUtils;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;
+use SimpleSAML\XPath\XPath as XPathUtils;
 
 /**
  * Compilation of utilities for XPath.

src/XML/EncryptableElementTrait.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\XMLSecurity\XML;
 
-use SimpleSAML\XMLSchema\Type\Builtin\{AnyURIValue, Base64BinaryValue};
+use SimpleSAML\XMLSchema\Type\{AnyURIValue, Base64BinaryValue};
 use SimpleSAML\XMLSecurity\Alg\Encryption\{EncryptionAlgorithmFactory, EncryptionAlgorithmInterface};
 use SimpleSAML\XMLSecurity\Backend\EncryptionBackend;
 use SimpleSAML\XMLSecurity\Constants as C;

src/XML/SignableElementInterface.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\XMLSecurity\XML;
 
-use SimpleSAML\XMLSchema\Type\Builtin\IDValue;
+use SimpleSAML\XMLSchema\Type\IDValue;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmInterface;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;