Properly compare AnyURI-values by specification

Author: tvdijen

composer.json

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

src/XMLSchema/Type/AnyURIValue.php

@@ -4,9 +4,12 @@
 
 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;
 
 /**
  * @package simplesaml/xml-common
@@ -37,4 +40,23 @@ protected function validateValue(string $value): void
     {
         Assert::validAnyURI($value, SchemaViolationException::class);
     }
+
+
+    /**
+     * Compare the value to another one
+     *
+     * @param \SimpleSAML\XMLSchema\Type\Interface\ValueTypeInterface|string $other
+     * @return bool
+     */
+    public function equals(ValueTypeInterface|string $other): bool
+    {
+        if (is_string($other)) {
+            $other = static::fromString($other);
+        }
+
+        $selfUri = new Uri($this->getValue());
+        $otherUri = new Uri($other->getValue());
+
+        return UriNormalizer::isEquivalent($selfUri, $otherUri);
+    }
 }

tests/XMLSchema/Type/AnyURIValueTest.php

@@ -48,11 +48,19 @@ public function testEquals(): void
         $this->assertTrue(AnyURIValue::fromString('hello')->equals(AnyURIValue::fromString('hello')));
         $this->assertTrue(AnyURIValue::fromString('hello')->equals(StringValue::fromString('hello')));
         $this->assertTrue(AnyURIValue::fromString('hello')->equals('hello'));
+        $this->assertTrue(
+            AnyURIValue::fromString('https://simplesamlphp.org/index.html')
+              ->equals('https://simplesamlphp.org:443/index.html'),
+        );
 
         // Assert that two different values are not equal
         $this->assertFalse(AnyURIValue::fromString('hello')->equals(AnyURIValue::fromString('world')));
         $this->assertFalse(AnyURIValue::fromString('hello')->equals(StringValue::fromString('world')));
         $this->assertFalse(AnyURIValue::fromString('hello')->equals('world'));
+        $this->assertFalse(
+            AnyURIValue::fromString('https://simplesamlphp.org:8443/index.html')
+              ->equals('https://simplesamlphp.org:443/index.html'),
+        );
     }