fix(domains): allow adding domains without explicit ports (#11442)
This commit is contained in:
parent
15072b9cf7
commit
83f1a2e503
2 changed files with 7 additions and 2 deletions
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
class DomainUrlParts
|
||||
{
|
||||
public static function compose(string $scheme, string $host, string $port = '', string $path = ''): string
|
||||
public static function compose(string $scheme, string $host, ?string $port = '', string $path = ''): string
|
||||
{
|
||||
$scheme = strtolower(trim($scheme)) === 'http' ? 'http' : 'https';
|
||||
$host = trim($host);
|
||||
$port = trim($port);
|
||||
$port = trim((string) $port);
|
||||
$path = trim($path);
|
||||
|
||||
if ($path !== '' && ! str_starts_with($path, '/') && ! str_starts_with($path, '?') && ! str_starts_with($path, '#')) {
|
||||
|
|
|
|||
|
|
@ -28,3 +28,8 @@
|
|||
it('preserves an explicitly configured default port', function () {
|
||||
expect(DomainUrlParts::split('https://app.example.com:443')['port'])->toBe('443');
|
||||
});
|
||||
|
||||
it('composes a domain when Livewire hydrates an empty numeric port as null', function () {
|
||||
expect(DomainUrlParts::compose('https', 'app.example.com', null))
|
||||
->toBe('https://app.example.com');
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue