Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(domains): allow adding domains without explicit ports (#11442)

Andras Bacsai83f1a2e50374
diff --git a/app/Support/DomainUrlParts.php b/app/Support/DomainUrlParts.php
index 2e6da7868c..c86d5fa9a9 100644
--- a/app/Support/DomainUrlParts.php
+++ b/app/Support/DomainUrlParts.php
@@ -4,11 +4,11 @@ namespace App\Support;
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 086599a1a2..5c2994934c 100644
--- a/tests/Unit/DomainUrlPartsTest.php
+++ b/tests/Unit/DomainUrlPartsTest.php
@@ -28,3 +28,8 @@ it('defaults empty values for an invalid URL', function () {
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');
+});