From 1f75b76a85c1d0912ee611eec9f4d0d9bbb75f4e Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Wed, 17 Jul 2024 14:57:18 -0600
Subject: [PATCH 1/3] fix: make phpmyadmin command work with nonstandard ports

---
 commands/host/phpmyadmin | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/commands/host/phpmyadmin b/commands/host/phpmyadmin
index f780468..2b3951e 100644
--- a/commands/host/phpmyadmin
+++ b/commands/host/phpmyadmin
@@ -7,9 +7,9 @@
 
 DDEV_PHPMYADMIN_PORT=8036
 DDEV_PHPMYADMIN_HTTPS_PORT=8037
-
+BASE_URL=${DDEV_PRIMARY_URL%:*}
 if [ ${DDEV_PRIMARY_URL%://*} = "http" ] || [ -n "${GITPOD_WORKSPACE_ID:-}" ] || [ "${CODESPACES:-}" = "true" ]; then
-    ddev launch $DDEV_PRIMARY_URL:$DDEV_PHPMYADMIN_PORT
+    ddev launch ${BASE_URL}:$DDEV_PHPMYADMIN_PORT
 else
-    ddev launch $DDEV_PRIMARY_URL:$DDEV_PHPMYADMIN_HTTPS_PORT
+    ddev launch ${BASE_URL}:$DDEV_PHPMYADMIN_HTTPS_PORT
 fi

From 7f17ef7262d4c62b38945ade25ef1ec7476e21ba Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Wed, 17 Jul 2024 15:09:22 -0600
Subject: [PATCH 2/3] Add test coverage

---
 tests/test.bats | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/test.bats b/tests/test.bats
index 1a31d76..a0a7e27 100644
--- a/tests/test.bats
+++ b/tests/test.bats
@@ -45,6 +45,7 @@ teardown() {
   health_checks
 }
 
+
 @test "install from release" {
   set -eu -o pipefail
   cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
@@ -54,3 +55,14 @@ teardown() {
   health_checks
 }
 
+@test "install from directory with nonstandard port" {
+  set -eu -o pipefail
+  cd ${TESTDIR}
+  ddev config --router-http-port=8080 --router-https-port=8443
+  echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
+  ddev get ${DIR} >/dev/null 2>&1
+  ddev mutagen sync >/dev/null 2>&1
+  health_checks
+}
+
+

From 8fd35e283c61f696185be5773de642cc6d60a6b5 Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Wed, 17 Jul 2024 15:20:38 -0600
Subject: [PATCH 3/3] Just use the port, not full url

---
 commands/host/phpmyadmin | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/commands/host/phpmyadmin b/commands/host/phpmyadmin
index 2b3951e..a1cdb80 100644
--- a/commands/host/phpmyadmin
+++ b/commands/host/phpmyadmin
@@ -7,9 +7,8 @@
 
 DDEV_PHPMYADMIN_PORT=8036
 DDEV_PHPMYADMIN_HTTPS_PORT=8037
-BASE_URL=${DDEV_PRIMARY_URL%:*}
 if [ ${DDEV_PRIMARY_URL%://*} = "http" ] || [ -n "${GITPOD_WORKSPACE_ID:-}" ] || [ "${CODESPACES:-}" = "true" ]; then
-    ddev launch ${BASE_URL}:$DDEV_PHPMYADMIN_PORT
+    ddev launch :$DDEV_PHPMYADMIN_PORT
 else
-    ddev launch ${BASE_URL}:$DDEV_PHPMYADMIN_HTTPS_PORT
+    ddev launch :$DDEV_PHPMYADMIN_HTTPS_PORT
 fi