Migrate from league to guzzle for uri validation

Author: tvdijen

composer.json

@@ -19,13 +19,13 @@
         "ext-pcre": "*",
         "ext-spl": "*",
 
-        "league/uri-interfaces": "^7.4",
-        "webmozart/assert": "^1.11"
+        "guzzlehttp/psr7": "~2.7.0",
+        "webmozart/assert": "~1.11.0"
     },
     "require-dev": {
         "ext-intl": "*",
 
-        "simplesamlphp/simplesamlphp-test-framework": "^1.7"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.8.0"
     },
     "autoload": {
         "psr-4": {

src/CustomAssertionTrait.php

@@ -4,9 +4,9 @@
 
 namespace SimpleSAML\Assert;
 
+use GuzzleHttp\Psr7\Exception\MalformedUriException;
+use GuzzleHttp\Psr7\Uri;
 use InvalidArgumentException;
-use League\Uri\Exceptions\SyntaxError;
-use League\Uri\UriString;
 
 use function array_map;
 use function base64_decode;
@@ -197,17 +197,17 @@ private static function notInArray($value, array $values, string $message = ''):
     private static function validURN(string $value, string $message = ''): void
     {
         try {
-            $uri = UriString::parse($value);
-        } catch (SyntaxError $e) {
+            $uri = new Uri($value);
+        } catch (MalformedUriException $e) {
             throw new InvalidArgumentException(sprintf(
                 $message ?: '\'%s\' is not a valid RFC3986 compliant URI',
                 $value,
             ));
         }
 
         if (
-            $uri['scheme'] !== 'urn'
-            || (($uri['scheme'] !== null) && $uri['path'] !== substr($value, strlen($uri['scheme']) + 1))
+            $uri->getScheme() !== 'urn'
+            || (($uri->getScheme() !== null) && $uri->getPath() !== substr($value, strlen($uri->getScheme()) + 1))
         ) {
             throw new InvalidArgumentException(sprintf(
                 $message ?: '\'%s\' is not a valid RFC8141 compliant URN',
@@ -224,15 +224,15 @@ private static function validURN(string $value, string $message = ''): void
     private static function validURL(string $value, string $message = ''): void
     {
         try {
-            $uri = UriString::parse($value);
-        } catch (SyntaxError $e) {
+            $uri = new Uri($value);
+        } catch (MalformedUriException $e) {
             throw new InvalidArgumentException(sprintf(
                 $message ?: '\'%s\' is not a valid RFC3986 compliant URI',
                 $value,
             ));
         }
 
-        if ($uri['scheme'] !== 'http' && $uri['scheme'] !== 'https') {
+        if ($uri->getScheme() !== 'http' && $uri->getScheme() !== 'https') {
             throw new InvalidArgumentException(sprintf(
                 $message ?: '\'%s\' is not a valid RFC2396 compliant URL',
                 $value,
@@ -248,8 +248,8 @@ private static function validURL(string $value, string $message = ''): void
     private static function validURI(string $value, string $message = ''): void
     {
         try {
-            UriString::parse($value);
-        } catch (SyntaxError $e) {
+            new Uri($value);
+        } catch (MalformedUriException $e) {
             throw new InvalidArgumentException(sprintf(
                 $message ?: '\'%s\' is not a valid RFC3986 compliant URI',
                 $value,

tests/Assert/URITest.php

@@ -75,7 +75,7 @@ public static function provideURI(): array
             'urn' => [true, 'urn:x-simplesamlphp:phpunit'],
             'same-doc' => [true, '#_53d830ab1be17291a546c95c7f1cdf8d3d23c959e6'],
             'url' => [true, 'https://www.simplesamlphp.org'],
-            'invalid_char' => [false, 'https://a⒈com'],
+            'utf8_char' => [true, 'https://aä.com'],
             'intl' => [true, 'https://niño.com'],
             'spn' => [true, 'spn:a4cf592f-a64c-46ff-a788-b260f474525b'],
             'typos' => [true, 'https//www.uni.l/en/'],
@@ -95,7 +95,7 @@ public static function provideURL(): array
             'url' => [true, 'https://www.simplesamlphp.org'],
             'same-doc' => [false, '#_53d830ab1be17291a546c95c7f1cdf8d3d23c959e6'],
             'urn' => [false, 'urn:x-simplesamlphp:phpunit'],
-            'invalid_char' => [false, 'https://a⒈com'],
+            'utf8_char' => [true, 'https://aä.com'],
             'intl' => [true, 'https://niño.com'],
             'spn' => [false, 'spn:a4cf592f-a64c-46ff-a788-b260f474525b'],
             'typos' => [false, 'https//www.uni.l/en/'],
@@ -114,7 +114,7 @@ public static function provideURN(): array
             'newline_suffix' => [false, "urn:x-simplesamlphp:phpunit\n"],
             'url' => [false, 'https://www.simplesamlphp.org'],
             'same-doc' => [false, '#_53d830ab1be17291a546c95c7f1cdf8d3d23c959e6'],
-            'invalid_char' => [false, 'https://a⒈com'],
+            'utf8_char' => [false, 'https://aä.com'],
             'intl' => [false, 'https://niño.com'],
             'spn' => [false, 'spn:a4cf592f-a64c-46ff-a788-b260f474525b'],
             'typos' => [false, 'https//www.uni.l/en/'],