Skip to content

Commit 071893e

Browse files
revert: use "(default)" instead of "(global)" for PHP version label
Reverts the "(global)" label back to "(default)" in both the Go source (php_list.go, status.go) and the e2e test scripts. Co-authored-by: Clovis <munezaclovis@users.noreply.github.com>
1 parent 188c562 commit 071893e

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

cmd/php_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var phpListCmd = &cobra.Command{
5151
// Version number
5252
if v == globalV {
5353
parts = append(parts, ui.Green.Bold(true).Render(v))
54-
parts = append(parts, ui.Muted.Render("(global)"))
54+
parts = append(parts, ui.Muted.Render("(default)"))
5555
} else {
5656
parts = append(parts, ui.Purple.Render(v))
5757
}

cmd/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var statusCmd = &cobra.Command{
7171
var labels []string
7272
for _, v := range versions {
7373
if v == globalPHP {
74-
labels = append(labels, ui.Green.Bold(true).Render(v)+" "+ui.Muted.Render("(global)"))
74+
labels = append(labels, ui.Green.Bold(true).Render(v)+" "+ui.Muted.Render("(default)"))
7575
} else {
7676
labels = append(labels, ui.Purple.Render(v))
7777
}

scripts/e2e/link-verify.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ echo "==> pv php list (project associations)"
2323
PHP_OUTPUT=$(pv php list 2>&1)
2424
echo "$PHP_OUTPUT"
2525
echo "$PHP_OUTPUT" | grep "8.3" | grep -q "e2e-php83" || { echo "FAIL: php83 not associated with 8.3"; exit 1; }
26-
echo "$PHP_OUTPUT" | grep "8.4" | grep -q "(global)" || { echo "FAIL: 8.4 not marked default"; exit 1; }
26+
echo "$PHP_OUTPUT" | grep "8.4" | grep -q "(default)" || { echo "FAIL: 8.4 not marked default"; exit 1; }
2727

2828
echo "==> Verify site configs"
2929

scripts/e2e/start-curl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "==> pv status"
99
STATUS=$(sudo -E pv status 2>&1)
1010
echo "$STATUS"
1111
assert_contains "$STATUS" "Running" "server not running"
12-
assert_contains "$STATUS" "8.4 (global)" "global PHP not shown"
12+
assert_contains "$STATUS" "8.4 (default)" "global PHP not shown"
1313
assert_contains "$STATUS" "5 linked" "wrong site count"
1414

1515
# Version Caddyfile for 8.3 generated at start time

scripts/e2e/verify-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ls -la ~/.pv/php/8.3/php
1313
echo "==> pv php list"
1414
OUTPUT=$(pv php list 2>&1)
1515
echo "$OUTPUT"
16-
assert_contains "$OUTPUT" "(global)" "8.4 not marked as default"
16+
assert_contains "$OUTPUT" "(default)" "8.4 not marked as default"
1717
assert_contains "$OUTPUT" "8.3" "8.3 not listed"
1818

1919
echo "==> Verify frankenphp symlink points to 8.4"

0 commit comments

Comments
 (0)