Replace Guzzle with native Uri-capabilities

Author: tvdijen

composer.json

@@ -43,7 +43,6 @@
         "ext-pcre": "*",
         "ext-spl": "*",
 
-        "guzzlehttp/psr7": "~2.8",
         "psr/clock": "~1.0",
         "simplesamlphp/assert": "~3.0",
         "simplesamlphp/composer-xmlprovider-installer": "~1.3"

src/XMLSchema/Type/AnyURIValue.php

@@ -4,12 +4,11 @@
 
 namespace SimpleSAML\XMLSchema\Type;
 
-use GuzzleHttp\Psr7\Uri;
-use GuzzleHttp\Psr7\UriNormalizer;
 use SimpleSAML\XML\Assert\Assert;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 use SimpleSAML\XMLSchema\Type\Interface\AbstractAnySimpleType;
 use SimpleSAML\XMLSchema\Type\Interface\ValueTypeInterface;
+use Uri\Rfc3986\Uri;
 
 /**
  * @package simplesaml/xml-common
@@ -57,6 +56,6 @@ public function equals(ValueTypeInterface|string $other): bool
         $selfUri = new Uri($this->getValue());
         $otherUri = new Uri($other->getValue());
 
-        return UriNormalizer::isEquivalent($selfUri, $otherUri);
+        return $selfUri->equals($otherUri);
     }
 }

tests/XMLSchema/Type/AnyURIValueTest.php

@@ -50,7 +50,7 @@ public function testEquals(): void
         $this->assertTrue(AnyURIValue::fromString('hello')->equals('hello'));
         $this->assertTrue(
             AnyURIValue::fromString('https://simplesamlphp.org/index.html')
-              ->equals('https://simplesamlphp.org:443/index.html'),
+              ->equals('HTTPS://simplesamlphp.org/index.html'),
         );
 
         // Assert that two different values are not equal