Merge pull request #2 from stof/league_uri

Remove usage of deprecated league/uri APIs

Author: stof

composer.json

@@ -20,8 +20,8 @@
     },
     "require": {
         "php": ">=8.1",
-        "league/uri": "^7.4",
-        "league/uri-interfaces": "^7.4"
+        "league/uri": "^7.6",
+        "league/uri-interfaces": "^7.6"
     },
     "require-dev": {
         "phpstan/phpstan": "^2.0",

src/Util.php

@@ -2,8 +2,8 @@
 
 namespace SourceSpan;
 
-use League\Uri\BaseUri;
 use League\Uri\Contracts\UriInterface;
+use League\Uri\Uri;
 
 /**
  * @internal
@@ -349,10 +349,14 @@ public static function prettyUri(string|UriInterface $path): string
 
     private static function pathFromUri(UriInterface $uri): string
     {
+        if (!$uri instanceof Uri) {
+            $uri = Uri::new($uri);
+        }
+
         if (\DIRECTORY_SEPARATOR === '\\') {
-            return BaseUri::from($uri)->windowsPath() ?? throw new \InvalidArgumentException("Uri $uri must have scheme 'file:'.");
+            return $uri->toWindowsPath() ?? throw new \InvalidArgumentException("Uri $uri must have scheme 'file:'.");
         }
 
-        return BaseUri::from($uri)->unixPath() ?? throw new \InvalidArgumentException("Uri $uri must have scheme 'file:'.");
+        return $uri->toUnixPath() ?? throw new \InvalidArgumentException("Uri $uri must have scheme 'file:'.");
     }
 }