Skip to content

fix(php-update): remove redundant duplicate tracking and narrow over-broad sed regexes #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PDowney merged 3 commits into from
May 2, 2026
Merged

fix(php-update): remove redundant duplicate tracking and narrow over-broad sed regexes #229

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fca27a4
Initial plan
Copilot May 2, 2026
7dd230c
PHP-Update: remove redundant SEEN_OLD_PHP_VERS and narrow over-broad …
Copilot May 2, 2026
e201340
Update CHANGELOG with recent PHP updates and fixes
PDowney May 2, 2026
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
17 changes: 8 additions & 9 deletions scripts/update/php-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,9 @@ fi

# Auto-detect currently installed PHP-FPM version
OLD_PHP_VERS=()
declare -A SEEN_OLD_PHP_VERS=()
for ver in "${SUPPORTED_PHP_VERSIONS[@]}"; do
if [[ "${ver}" != "${NEW_PHP_VER}" ]] && dpkg -l | grep -q "php${ver}-fpm"; then
if [[ -z "${SEEN_OLD_PHP_VERS["${ver}"]+x}" ]]; then
OLD_PHP_VERS+=("${ver}")
SEEN_OLD_PHP_VERS["${ver}"]=1
fi
OLD_PHP_VERS+=("${ver}")
fi
done

Expand Down Expand Up @@ -136,15 +132,18 @@ echo "Updating Nginx configuration for PHP ${NEW_PHP_VER}..."
# Update php-fpm.conf
if [[ -f "/etc/nginx/globals/php-fpm.conf" ]]; then
for OLD_VER in "${MIGRATION_SOURCE_PHP_VERS[@]}"; do
sed -E -i "s|php${OLD_VER}(-fpm)?|php${NEW_PHP_VER}\1|g" "/etc/nginx/globals/php-fpm.conf"
sed -E -i \
-e "s|(unix:/run/php/)php${OLD_VER}-fpm(\.sock)|\1php${NEW_PHP_VER}-fpm\2|g" \
-e "s|(fastcgi_pass[[:space:]]+[^;]*php)${OLD_VER}(-fpm)|\1${NEW_PHP_VER}\2|g" \
Comment on lines +135 to +137
"/etc/nginx/globals/php-fpm.conf"
done
fi

# Update all nginx site configurations
for config_file in /etc/nginx/sites-available/*; do
if [[ -f "$config_file" ]]; then
for OLD_VER in "${MIGRATION_SOURCE_PHP_VERS[@]}"; do
sed -E -i "s|php${OLD_VER}(-fpm)?|php${NEW_PHP_VER}\1|g" "$config_file"
sed -E -i "/^[[:space:]]*fastcgi_pass[[:space:]]+/ s|php${OLD_VER}(-fpm)?|php${NEW_PHP_VER}\1|g" "$config_file"
done
fi
done
Expand All @@ -153,15 +152,15 @@ done
if [[ -f "/var/www/admin/tools/phpsysinfo/phpsysinfo.ini" ]]; then
echo "Updating phpSysInfo configuration..."
for OLD_VER in "${MIGRATION_SOURCE_PHP_VERS[@]}"; do
sed -E -i "s|php${OLD_VER}(-fpm)?|php${NEW_PHP_VER}\1|g" "/var/www/admin/tools/phpsysinfo/phpsysinfo.ini"
sed -E -i "s|^([[:space:]]*[[:alnum:]_.-]+[[:space:]]*=[[:space:]]*.*)php${OLD_VER}(-fpm)?|\1php${NEW_PHP_VER}\2|g" "/var/www/admin/tools/phpsysinfo/phpsysinfo.ini"
done
fi

# Update admin control panel API configuration
if [[ -f "/var/www/admin/control-panel/api.php" ]]; then
echo "Updating admin control panel API configuration..."
for OLD_VER in "${MIGRATION_SOURCE_PHP_VERS[@]}"; do
sed -E -i "s|php${OLD_VER}(-fpm)?|php${NEW_PHP_VER}\1|g" "/var/www/admin/control-panel/api.php"
sed -E -i "/(php-fpm|fastcgi_pass|sock(et)?|service)/ s|php${OLD_VER}(-fpm)?|php${NEW_PHP_VER}\1|g" "/var/www/admin/control-panel/api.php"
done
fi

Expand Down
Loading