Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/install.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

set -e

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_REPO="https://raw.githubusercontent.com/devhardiyanto/phpvm/main"

Expand Down
26 changes: 22 additions & 4 deletions linux/phpvm.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
# phpvm use 8.3.0
# ==============================================================================

PHPVM_VERSION="1.13.1"
PHPVM_VERSION="1.13.2"
PHPVM_DIR="${PHPVM_DIR:-$HOME/.phpvm}"
PHPVM_VERSIONS="$PHPVM_DIR/versions"
PHPVM_CURRENT="$PHPVM_DIR/current"
Expand DownExpand Up@@ -238,9 +238,17 @@ _phpvm_detect_os() {
# what configure consults, so ask it first; the `openssl` CLI is a fallback and
# can disagree with the installed headers. Echoes "3.0.2"; non-zero if unknown.
_phpvm_openssl_version() {
# LibreSSL and BoringSSL answer `openssl version` and ship an openssl.pc of
# their own, but their 3.x still defines RSA_SSLV23_PADDING — the premise of
# the guard below. Their numbering says nothing about it, so report the host
# as unknown rather than block a build that would have succeeded.
local banner=""
command -v openssl &>/dev/null && banner=$(openssl version 2>/dev/null)
[[ -n "$banner" && "$banner" != OpenSSL* ]] && return 1

local v=""
command -v pkg-config &>/dev/null && v=$(pkg-config --modversion openssl 2>/dev/null)
[[ -z "$v" ]] && command -v openssl &>/dev/null && v=$(openssl version 2>/dev/null | awk '{print $2}')
[[ -z "$v" && -n "$banner" ]] && v=$(echo "$banner" | awk '{print $2}')
# Strip a letter suffix: OpenSSL 1.1.1w -> 1.1.1
v="${v%%[a-zA-Z]*}"
[[ -n "$v" ]] || return 1
Expand All@@ -264,9 +272,13 @@ _phpvm_check_openssl_compat() {
(( major > 8 )) && return 0
(( major == 8 && minor >= 1 )) && return 0

local ssl
local ssl ssl_major
ssl=$(_phpvm_openssl_version) || return 0 # can't tell -> don't block
[[ "${ssl%%.*}" -lt 3 ]] && return 0
ssl_major="${ssl%%.*}"
# A non-numeric major is something this probe doesn't model; `-lt` would
# error and fall through to blocking, so fail open here too.
[[ "$ssl_major" =~ ^[0-9]+$ ]] || return 0
(( ssl_major < 3 )) && return 0

_err "PHP $ver cannot be built against OpenSSL $ssl."
_dim "OpenSSL 3.0 removed RSA_SSLV23_PADDING; PHP's openssl extension only"
Expand DownExpand Up@@ -604,6 +616,12 @@ phpvm_install() {
local cpus
cpus=$(_phpvm_cpus)

# One install owns the log. Every step below appends, so without this the
# file accumulates across runs and _phpvm_show_build_error's `grep -m1`
# reports the first error of an *earlier* build — exactly the wrong line
# when someone is retrying the install they just watched fail.
: > "$PHPVM_LOG"

# The whole build runs in a subshell so the `cd` cannot escape: phpvm.sh is
# sourced, so a bare cd here would strand the user's own shell in the build
# directory — which is then deleted, leaving them in a dangling cwd.
Expand Down
52 changes: 52 additions & 0 deletions tests/linux/build_preflight.bats
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,13 @@ _stub_openssl() {
eval "_phpvm_openssl_version() { echo '$1'; }"
}

# Pin what `openssl version` reports, to exercise the probe itself. A function
# satisfies `command -v openssl`, so the probe takes the same path it would on
# a host that really ships this binary.
_stub_openssl_cli() {
eval "openssl() { [ \"\$1\" = version ] && echo '$1'; }"
}

# ── OpenSSL compatibility guard ───────────────────────────────────────────────

@test "openssl 3 blocks PHP 7.3" {
Expand DownExpand Up@@ -74,6 +81,34 @@ _stub_openssl() {
[[ "$output" == *"PHPVM_SKIP_OPENSSL_CHECK=1"* ]]
}

@test "a non-numeric openssl major does not block the build" {
_stub_openssl "unknown"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "libressl reports as unknown rather than blocking" {
_stub_openssl_cli "LibreSSL 3.3.6"
run _phpvm_openssl_version
[ "$status" -eq 1 ]
# LibreSSL 3.x still defines RSA_SSLV23_PADDING, so PHP 7.3 must build.
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "boringssl reports as unknown rather than blocking" {
_stub_openssl_cli "BoringSSL 3.0.0"
run _phpvm_check_openssl_compat 7.3.33
[ "$status" -eq 0 ]
}

@test "a genuine OpenSSL banner still yields a version" {
_stub_openssl_cli "OpenSSL 3.0.13 30 Jan 2024"
run _phpvm_openssl_version
[ "$status" -eq 0 ]
[[ "$output" =~ ^[0-9]+(\.[0-9]+)*$ ]]
}

@test "openssl version probe strips a letter suffix" {
# Only meaningful when the host actually has one of the probes.
if ! command -v pkg-config &>/dev/null && ! command -v openssl &>/dev/null; then
Expand DownExpand Up@@ -123,3 +158,20 @@ LOG
[ "$status" -eq 0 ]
[ -z "$output" ]
}

# Every build step appends, so one install must start the log from empty or
# `grep -m1` above surfaces the first error of a *previous* run. Driving a real
# install here would mean a compiler and ten minutes, so assert the ordering in
# phpvm_install's own body instead.
@test "install truncates the build log before anything appends to it" {
local src="$BATS_TEST_DIRNAME/../../linux/phpvm.sh"
local body trunc append
body=$(awk '/^phpvm_install\(\)/{f=1} f{print} f&&/^}$/{exit}' "$src")

trunc=$(printf '%s\n' "$body" | grep -n ': > "\$PHPVM_LOG"' | head -1 | cut -d: -f1)
append=$(printf '%s\n' "$body" | grep -n '>>"\?\$PHPVM_LOG"\?' | head -1 | cut -d: -f1)

[ -n "$trunc" ]
[ -n "$append" ]
[ "$trunc" -lt "$append" ]
}
18 changes: 18 additions & 0 deletions tests/linux/zsh-smoke.zsh
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,24 @@ print "8.3" > "$tmp/proj/.phpvmrc"
out=$(cd "$tmp/proj" && _phpvm_read_rc "$tmp/proj/.phpvmrc" 2>&1)
check "reads a .phpvmrc version" "8.3" "$out"

print -r -- "-- openssl guard (pattern and regex matching) --"
# The guard leans on [[ != OpenSSL* ]] globbing and [[ =~ ]] regex, both of
# which zsh parses on its own terms. bats only ever sees the bash reading.
# Probe first, while the real _phpvm_openssl_version is still in place.
openssl() { [[ "$1" == version ]] && print "LibreSSL 3.3.6" }
_phpvm_openssl_version >/dev/null 2>&1
check "libressl reports as unknown" "1" "$?"
unset -f openssl

_phpvm_openssl_version() { print 3.0.2 }
out=$(_phpvm_check_openssl_compat 7.3.33 2>&1)
check "openssl 3 blocks PHP 7.3" "cannot be built against OpenSSL 3.0.2" "$out"
_phpvm_check_openssl_compat 8.1.0 >/dev/null 2>&1
check "openssl 3 allows PHP 8.1" "0" "$?"
_phpvm_openssl_version() { print unknown }
_phpvm_check_openssl_compat 7.3.33 >/dev/null 2>&1
check "non-numeric openssl major fails open" "0" "$?"

print -r -- "-- older-patch hint --"
mkdir -p "$PHPVM_DIR/versions/8.5.1" "$PHPVM_DIR/versions/8.5.2" "$PHPVM_DIR/versions/8.5.8"
out=$(_phpvm_older_patch_hint 8.5.8 2>&1)
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1.13.1
1.13.2
2 changes: 1 addition & 1 deletion windows/install.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$PHPVM_BIN = "$PHPVM_DIR\bin"

Expand Down
2 changes: 1 addition & 1 deletion windows/phpvm.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
2 changes: 1 addition & 1 deletion windows/src/00-header.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"

# -- Constants -----------------------------------------------------------------
$PHPVM_VERSION = "1.13.1"
$PHPVM_VERSION = "1.13.2"
$PHPVM_DIR = if ($env:PHPVM_DIR) { $env:PHPVM_DIR } else { "$env:USERPROFILE\.phpvm" }
$VERSIONS_DIR = "$PHPVM_DIR\versions"
$CURRENT_LINK = "$PHPVM_DIR\current"
Expand Down
Loading