From 83f1a2e50374c27125671084b445b2599815f114 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:04:14 +0200
Subject: [PATCH] fix(domains): allow adding domains without explicit ports
 (#11442)

---
 app/Support/DomainUrlParts.php    | 4 ++--
 tests/Unit/DomainUrlPartsTest.php | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Support/DomainUrlParts.php b/app/Support/DomainUrlParts.php
index 2e6da7868..c86d5fa9a 100644
--- a/app/Support/DomainUrlParts.php
+++ b/app/Support/DomainUrlParts.php
@@ -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, '#')) {
diff --git a/tests/Unit/DomainUrlPartsTest.php b/tests/Unit/DomainUrlPartsTest.php
index 086599a1a..5c2994934 100644
--- a/tests/Unit/DomainUrlPartsTest.php
+++ b/tests/Unit/DomainUrlPartsTest.php
@@ -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');
+});