Address more deprecations

Author: jaapio

packages/guides/src/ParserContext.php

@@ -14,8 +14,7 @@
 namespace phpDocumentor\Guides;
 
 use League\Flysystem\FilesystemInterface;
-use League\Uri\Uri;
-use League\Uri\UriInfo;
+use League\Uri\BaseUri;
 use phpDocumentor\FileSystem\FileSystem;
 use phpDocumentor\Guides\Nodes\ProjectNode;
 use phpDocumentor\Guides\ReferenceResolvers\DocumentNameResolverInterface;
@@ -47,8 +46,7 @@ public function getInitialHeaderLevel(): int
 
     public function absoluteRelativePath(string $url): string
     {
-        $uri = Uri::createFromString($url);
-        if (UriInfo::isAbsolutePath($uri)) {
+        if (BaseUri::from($url)->isAbsolutePath()) {
             return $this->currentDirectory . '/' . ltrim($url, '/');
         }
 

packages/guides/src/ReferenceResolvers/DocumentNameResolver.php

@@ -13,8 +13,7 @@
 
 namespace phpDocumentor\Guides\ReferenceResolvers;
 
-use League\Uri\UriInfo;
-use phpDocumentor\Guides\UriFactory;
+use League\Uri\BaseUri;
 
 use function array_pop;
 use function explode;
@@ -32,13 +31,12 @@ final class DocumentNameResolver implements DocumentNameResolverInterface
      */
     public function absoluteUrl(string $basePath, string $url): string
     {
-        $uri = UriFactory::createUri($url);
-
-        if (UriInfo::isAbsolute($uri)) {
+        $uri = BaseUri::from($url);
+        if ($uri->isAbsolute()) {
             return $url;
         }
 
-        if (UriInfo::isAbsolutePath($uri)) {
+        if ($uri->isAbsolutePath()) {
             return $url;
         }
 

packages/guides/src/Renderer/UrlGenerator/AbstractUrlGenerator.php

@@ -14,10 +14,9 @@
 namespace phpDocumentor\Guides\Renderer\UrlGenerator;
 
 use Exception;
-use League\Uri\UriInfo;
+use League\Uri\BaseUri;
 use phpDocumentor\Guides\ReferenceResolvers\DocumentNameResolverInterface;
 use phpDocumentor\Guides\RenderContext;
-use phpDocumentor\Guides\UriFactory;
 
 use function filter_var;
 use function sprintf;
@@ -84,9 +83,7 @@ public function generateInternalUrl(
 
     private function isRelativeUrl(string $url): bool
     {
-        $uri = UriFactory::createUri($url);
-
-        return UriInfo::isRelativePath($uri);
+        return BaseUri::from($url)->isRelativePath();
     }
 
     public function getCurrentFileUrl(RenderContext $renderContext): string

packages/guides/src/Renderer/UrlGenerator/RelativeUrlGenerator.php

@@ -30,8 +30,8 @@ public function generateInternalPathFromRelativeUrl(
         RenderContext $renderContext,
         string $canonicalUrl,
     ): string {
-        $currentPathUri = Uri::createFromString($renderContext->getOutputFilePath());
-        $canonicalUrlUri = Uri::createFromString($canonicalUrl);
+        $currentPathUri = Uri::new($renderContext->getOutputFilePath());
+        $canonicalUrlUri = Uri::new($canonicalUrl);
 
         $canonicalAnchor = $canonicalUrlUri->getFragment();
 

packages/guides/src/Twig/AssetsExtension.php

@@ -13,8 +13,8 @@
 
 namespace phpDocumentor\Guides\Twig;
 
+use League\Uri\BaseUri;
 use League\Uri\Uri;
-use League\Uri\UriInfo;
 use phpDocumentor\Guides\Meta\InternalTarget;
 use phpDocumentor\Guides\Meta\Target;
 use phpDocumentor\Guides\NodeRenderers\NodeRenderer;
@@ -79,7 +79,7 @@ public function getTests(): array
             ),
             new TwigTest(
                 'external_target',
-                static fn (string|Stringable $value): bool => UriInfo::isAbsolute(Uri::createFromString($value)),
+                static fn (string|Stringable $value): bool => BaseUri::from(Uri::new($value))->isAbsolute(),
             ),
         ];
     }

packages/guides/src/UriFactory.php

@@ -46,10 +46,10 @@ public static function createUri(string $uriString): UriInterface
                     $uriString = substr($uriString, strlen('file:///'));
                 }
 
-                return LeagueUri::createFromWindowsPath($uriString);
+                return LeagueUri::fromWindowsPath($uriString);
             }
 
-            return LeagueUri::createFromString($uriString);
+            return LeagueUri::new($uriString);
         } catch (Throwable $exception) {
             throw new InvalidArgumentException(
                 sprintf(
@@ -70,7 +70,7 @@ private static function createPharUri(string $uriString): UriInterface
             $path = '/' . $path;
         }
 
-        return LeagueUri::createFromComponents(
+        return LeagueUri::fromComponents(
             [
                 'scheme' => 'phar',
                 'host' => '',

phpunit-baseline.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <files version="1">
+ <file path="packages/filesystem/Flysystem/FilesystemInterface.php">
+  <line number="286" hash="e2010bb2ff8572975ea792898ad31f72ea87a511">
+   <issue><![CDATA[League\Flysystem\FilesystemInterface::get(): Implicitly marking parameter $handler as nullable is deprecated, the explicit nullable type must be used instead]]></issue>
+  </line>
+ </file>
  <file path="vendor/league/flysystem/src/FilesystemInterface.php">
   <line number="274" hash="974a66e314c847f29d4b178ad6b47395be68d98f">
    <issue><![CDATA[League\Flysystem\FilesystemInterface::get(): Implicitly marking parameter $handler as nullable is deprecated, the explicit nullable type must be used instead]]></issue>