Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/Uri/IncludePathBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,34 @@

namespace Soap\Wsdl\Uri;

use League\Uri\BaseUri;
use League\Uri\Modifier;
use League\Uri\Uri;
use function Psl\Str\starts_with;

final class IncludePathBuilder
{
public static function build(string $relativePath, string $fromFile): string
{
return Modifier::from(BaseUri::from($fromFile)->resolve($relativePath))
$baseUri = match(true) {
starts_with($fromFile, '/') => Uri::fromUnixPath($fromFile),
default => Uri::new($fromFile),
};

$resolvedUri = $baseUri->resolve($relativePath);
$modifier = Modifier::wrap($resolvedUri)
->removeDotSegments()
->removeEmptySegments()
->getUri()
->__toString()
;
->removeEmptySegments();

/**
* @var Uri $relativeUri
* @psalm-suppress UndefinedClass PHP's URI classes are only available from PHP 8.5
*/
$relativeUri = $modifier->unwrap();

if ($relativeUri->getScheme() === 'file') {
return $relativeUri->getPath();
}

return $relativeUri->toString();
}
}
8 changes: 4 additions & 4 deletions tests/Unit/Uri/IncludePathBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ public static function provideBuildPaths()
{
yield 'same-dir-file' => [
'relativePath' => 'otherfile.xml',
'fromFile' => 'somedir/somefile.xml',
'expected' => 'somedir/otherfile.xml',
'fromFile' => '/somedir/somefile.xml',
'expected' => '/somedir/otherfile.xml',
];
yield 'child-dir-file' => [
'relativePath' => '../otherfile.xml',
'fromFile' => 'somedir/child/somefile.xml',
'expected' => 'somedir/otherfile.xml',
'fromFile' => '/somedir/child/somefile.xml',
'expected' => '/somedir/otherfile.xml',
];
yield 'http-file' => [
'relativePath' => 'otherfile.xml',
Expand Down
Loading