mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-03-01 17:59:11 +00:00
style(fish): reformat phpenv files with fish_indent
This commit is contained in:
@@ -2,21 +2,21 @@
|
|||||||
# Place in ~/.config/fish/completions/phpenv.fish
|
# Place in ~/.config/fish/completions/phpenv.fish
|
||||||
|
|
||||||
# Complete main commands
|
# Complete main commands
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "install" -d "Install a PHP version"
|
complete -c phpenv -f -n __fish_use_subcommand -a install -d "Install a PHP version"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "uninstall" -d "Uninstall a PHP version"
|
complete -c phpenv -f -n __fish_use_subcommand -a uninstall -d "Uninstall a PHP version"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "use" -d "Use PHP version for current shell"
|
complete -c phpenv -f -n __fish_use_subcommand -a use -d "Use PHP version for current shell"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "local" -d "Set PHP version for current project"
|
complete -c phpenv -f -n __fish_use_subcommand -a local -d "Set PHP version for current project"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "global" -d "Set global PHP version"
|
complete -c phpenv -f -n __fish_use_subcommand -a global -d "Set global PHP version"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "list" -d "List installed PHP versions"
|
complete -c phpenv -f -n __fish_use_subcommand -a list -d "List installed PHP versions"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "ls" -d "List installed PHP versions"
|
complete -c phpenv -f -n __fish_use_subcommand -a ls -d "List installed PHP versions"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "current" -d "Show current PHP version"
|
complete -c phpenv -f -n __fish_use_subcommand -a current -d "Show current PHP version"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "which" -d "Show path to PHP binary"
|
complete -c phpenv -f -n __fish_use_subcommand -a which -d "Show path to PHP binary"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "versions" -d "Show all available versions"
|
complete -c phpenv -f -n __fish_use_subcommand -a versions -d "Show all available versions"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "doctor" -d "Check phpenv installation"
|
complete -c phpenv -f -n __fish_use_subcommand -a doctor -d "Check phpenv installation"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "config" -d "Manage configuration"
|
complete -c phpenv -f -n __fish_use_subcommand -a config -d "Manage configuration"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "extensions" -d "Manage PHP extensions"
|
complete -c phpenv -f -n __fish_use_subcommand -a extensions -d "Manage PHP extensions"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "ext" -d "Manage PHP extensions"
|
complete -c phpenv -f -n __fish_use_subcommand -a ext -d "Manage PHP extensions"
|
||||||
complete -c phpenv -f -n "__fish_use_subcommand" -a "help" -d "Show help"
|
complete -c phpenv -f -n __fish_use_subcommand -a help -d "Show help"
|
||||||
|
|
||||||
# Helper functions for completions
|
# Helper functions for completions
|
||||||
function __phpenv_complete_installed_versions
|
function __phpenv_complete_installed_versions
|
||||||
@@ -26,13 +26,13 @@ end
|
|||||||
function __phpenv_complete_available_versions
|
function __phpenv_complete_available_versions
|
||||||
# Try to get dynamic versions first
|
# Try to get dynamic versions first
|
||||||
if command -q curl -a command -q jq; and functions -q __phpenv_parse_version_field
|
if command -q curl -a command -q jq; and functions -q __phpenv_parse_version_field
|
||||||
echo "latest"
|
echo latest
|
||||||
echo "nightly"
|
echo nightly
|
||||||
echo "5.x"
|
echo "5.x"
|
||||||
echo "7.x"
|
echo "7.x"
|
||||||
echo "8.x"
|
echo "8.x"
|
||||||
__phpenv_parse_version_field "latest" "8.4"
|
__phpenv_parse_version_field latest "8.4"
|
||||||
__phpenv_parse_version_field "nightly" "8.5"
|
__phpenv_parse_version_field nightly "8.5"
|
||||||
__phpenv_parse_version_field "5.x" "5.6"
|
__phpenv_parse_version_field "5.x" "5.6"
|
||||||
__phpenv_parse_version_field "7.x" "7.4"
|
__phpenv_parse_version_field "7.x" "7.4"
|
||||||
__phpenv_parse_version_field "8.x" "8.4"
|
__phpenv_parse_version_field "8.x" "8.4"
|
||||||
@@ -64,18 +64,18 @@ complete -c phpenv -f -n "__fish_seen_subcommand_from uninstall use local global
|
|||||||
-a "(__phpenv_complete_installed_versions)" -d "Installed PHP version"
|
-a "(__phpenv_complete_installed_versions)" -d "Installed PHP version"
|
||||||
|
|
||||||
# Add system option for use command
|
# Add system option for use command
|
||||||
complete -c phpenv -f -n "__fish_seen_subcommand_from use" -a "system" -d "Use system PHP"
|
complete -c phpenv -f -n "__fish_seen_subcommand_from use" -a system -d "Use system PHP"
|
||||||
|
|
||||||
# Complete binaries for which command
|
# Complete binaries for which command
|
||||||
complete -c phpenv -f -n "__fish_seen_subcommand_from which" -a "(__phpenv_complete_binaries)" -d "PHP binary"
|
complete -c phpenv -f -n "__fish_seen_subcommand_from which" -a "(__phpenv_complete_binaries)" -d "PHP binary"
|
||||||
|
|
||||||
# Complete config subcommands
|
# Complete config subcommands
|
||||||
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
|
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
|
||||||
-a "get" -d "Get configuration value"
|
-a get -d "Get configuration value"
|
||||||
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
|
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
|
||||||
-a "set" -d "Set configuration value"
|
-a set -d "Set configuration value"
|
||||||
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
|
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from get set list" \
|
||||||
-a "list" -d "List all configuration"
|
-a list -d "List all configuration"
|
||||||
|
|
||||||
# Complete config keys
|
# Complete config keys
|
||||||
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and __fish_seen_subcommand_from get set" \
|
complete -c phpenv -f -n "__fish_seen_subcommand_from config; and __fish_seen_subcommand_from get set" \
|
||||||
@@ -91,27 +91,27 @@ complete -c phpenv -f \
|
|||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
-n "__fish_seen_subcommand_from extensions ext" \
|
-n "__fish_seen_subcommand_from extensions ext" \
|
||||||
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
||||||
-a "install" -d "Install PHP extension"
|
-a install -d "Install PHP extension"
|
||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
-n "__fish_seen_subcommand_from extensions ext" \
|
-n "__fish_seen_subcommand_from extensions ext" \
|
||||||
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
||||||
-a "uninstall" -d "Uninstall PHP extension"
|
-a uninstall -d "Uninstall PHP extension"
|
||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
-n "__fish_seen_subcommand_from extensions ext" \
|
-n "__fish_seen_subcommand_from extensions ext" \
|
||||||
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
||||||
-a "remove" -d "Remove PHP extension"
|
-a remove -d "Remove PHP extension"
|
||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
-n "__fish_seen_subcommand_from extensions ext" \
|
-n "__fish_seen_subcommand_from extensions ext" \
|
||||||
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
||||||
-a "list" -d "List installed extensions"
|
-a list -d "List installed extensions"
|
||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
-n "__fish_seen_subcommand_from extensions ext" \
|
-n "__fish_seen_subcommand_from extensions ext" \
|
||||||
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
||||||
-a "ls" -d "List installed extensions"
|
-a ls -d "List installed extensions"
|
||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
-n "__fish_seen_subcommand_from extensions ext" \
|
-n "__fish_seen_subcommand_from extensions ext" \
|
||||||
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
-n "not __fish_seen_subcommand_from install uninstall remove list ls available" \
|
||||||
-a "available" -d "Show available extensions"
|
-a available -d "Show available extensions"
|
||||||
|
|
||||||
# Complete extension names
|
# Complete extension names
|
||||||
complete -c phpenv -f \
|
complete -c phpenv -f \
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ if not set -q PHPENV_AUTO_SWITCH
|
|||||||
end
|
end
|
||||||
|
|
||||||
if not set -q PHPENV_DEFAULT_EXTENSIONS
|
if not set -q PHPENV_DEFAULT_EXTENSIONS
|
||||||
set -g PHPENV_DEFAULT_EXTENSIONS "opcache"
|
set -g PHPENV_DEFAULT_EXTENSIONS opcache
|
||||||
end
|
end
|
||||||
|
|
||||||
# Initialize PATH on shell startup if global version is set (less aggressive)
|
# Initialize PATH on shell startup if global version is set (less aggressive)
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ end
|
|||||||
|
|
||||||
function __phpenv_find_version_file -a phpenv_filename
|
function __phpenv_find_version_file -a phpenv_filename
|
||||||
set -l phpenv_dir (pwd)
|
set -l phpenv_dir (pwd)
|
||||||
while test "$phpenv_dir" != "/"
|
while test "$phpenv_dir" != /
|
||||||
if test -f "$phpenv_dir/$phpenv_filename"
|
if test -f "$phpenv_dir/$phpenv_filename"
|
||||||
echo "$phpenv_dir/$phpenv_filename"
|
echo "$phpenv_dir/$phpenv_filename"
|
||||||
return
|
return
|
||||||
@@ -130,13 +130,13 @@ function __phpenv_parse_composer_version
|
|||||||
end
|
end
|
||||||
|
|
||||||
set -l phpenv_platform_php (jq -r '.config.platform.php // empty' composer.json 2>/dev/null)
|
set -l phpenv_platform_php (jq -r '.config.platform.php // empty' composer.json 2>/dev/null)
|
||||||
if test $status -eq 0 -a -n "$phpenv_platform_php" -a "$phpenv_platform_php" != "null"
|
if test $status -eq 0 -a -n "$phpenv_platform_php" -a "$phpenv_platform_php" != null
|
||||||
echo $phpenv_platform_php
|
echo $phpenv_platform_php
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
set -l phpenv_require_php (jq -r '.require.php // empty' composer.json 2>/dev/null)
|
set -l phpenv_require_php (jq -r '.require.php // empty' composer.json 2>/dev/null)
|
||||||
if test $status -eq 0 -a -n "$phpenv_require_php" -a "$phpenv_require_php" != "null"
|
if test $status -eq 0 -a -n "$phpenv_require_php" -a "$phpenv_require_php" != null
|
||||||
__phpenv_parse_semver_constraint $phpenv_require_php
|
__phpenv_parse_semver_constraint $phpenv_require_php
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@@ -196,7 +196,7 @@ set -g __phpenv_version_cache_time 0
|
|||||||
|
|
||||||
function __phpenv_get_version_info
|
function __phpenv_get_version_info
|
||||||
set -l current_time (date +%s)
|
set -l current_time (date +%s)
|
||||||
set -l cache_duration 300 # 5 minutes
|
set -l cache_duration 300 # 5 minutes
|
||||||
|
|
||||||
# Return cached version if still valid
|
# Return cached version if still valid
|
||||||
if test -n "$__phpenv_version_cache"
|
if test -n "$__phpenv_version_cache"
|
||||||
@@ -236,12 +236,12 @@ end
|
|||||||
# Check if Ondřej PPA is configured on the system
|
# Check if Ondřej PPA is configured on the system
|
||||||
function __phpenv_has_ondrej_ppa
|
function __phpenv_has_ondrej_ppa
|
||||||
if test -d /etc/apt/sources.list.d
|
if test -d /etc/apt/sources.list.d
|
||||||
if grep -rq "ondrej/php" /etc/apt/sources.list.d/ 2>/dev/null
|
if grep -rq ondrej/php /etc/apt/sources.list.d/ 2>/dev/null
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if test -f /etc/apt/sources.list
|
if test -f /etc/apt/sources.list
|
||||||
if grep -q "ondrej/php" /etc/apt/sources.list 2>/dev/null
|
if grep -q ondrej/php /etc/apt/sources.list 2>/dev/null
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -262,34 +262,34 @@ function __phpenv_get_provider
|
|||||||
end
|
end
|
||||||
|
|
||||||
# macOS always uses Homebrew
|
# macOS always uses Homebrew
|
||||||
if test (uname -s) = "Darwin"
|
if test (uname -s) = Darwin
|
||||||
echo "homebrew"
|
echo homebrew
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux: check for apt with Ondřej PPA first
|
# Linux: check for apt with Ondřej PPA first
|
||||||
if test (uname -s) = "Linux"
|
if test (uname -s) = Linux
|
||||||
if command -q apt-get; and __phpenv_has_ondrej_ppa
|
if command -q apt-get; and __phpenv_has_ondrej_ppa
|
||||||
echo "apt"
|
echo apt
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
# Fall back to Homebrew (Linuxbrew) if available
|
# Fall back to Homebrew (Linuxbrew) if available
|
||||||
if command -q brew
|
if command -q brew
|
||||||
echo "homebrew"
|
echo homebrew
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
# If apt is available but no PPA yet, still use apt provider
|
# If apt is available but no PPA yet, still use apt provider
|
||||||
# (it will prompt to add the PPA when needed)
|
# (it will prompt to add the PPA when needed)
|
||||||
if command -q apt-get
|
if command -q apt-get
|
||||||
echo "apt"
|
echo apt
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Default fallback
|
# Default fallback
|
||||||
echo "homebrew"
|
echo homebrew
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -319,7 +319,7 @@ function __phpenv_provider_homebrew_ensure_source
|
|||||||
end
|
end
|
||||||
|
|
||||||
# Check and add required taps only if missing
|
# Check and add required taps only if missing
|
||||||
set -l required_taps "shivammathur/php" "shivammathur/extensions"
|
set -l required_taps shivammathur/php shivammathur/extensions
|
||||||
for tap in $required_taps
|
for tap in $required_taps
|
||||||
if not brew tap | grep -qx $tap 2>/dev/null
|
if not brew tap | grep -qx $tap 2>/dev/null
|
||||||
if not brew tap $tap 2>/dev/null
|
if not brew tap $tap 2>/dev/null
|
||||||
@@ -343,7 +343,7 @@ function __phpenv_provider_homebrew_list_installed
|
|||||||
continue
|
continue
|
||||||
end
|
end
|
||||||
|
|
||||||
if test "$phpenv_basename" = "php"
|
if test "$phpenv_basename" = php
|
||||||
set -l phpenv_latest (__phpenv_parse_version_field "latest" "8.4")
|
set -l phpenv_latest (__phpenv_parse_version_field "latest" "8.4")
|
||||||
set -a phpenv_versions $phpenv_latest
|
set -a phpenv_versions $phpenv_latest
|
||||||
else if echo $phpenv_basename | grep -qE '^php@[0-9]+\.[0-9]+$'
|
else if echo $phpenv_basename | grep -qE '^php@[0-9]+\.[0-9]+$'
|
||||||
@@ -375,7 +375,7 @@ function __phpenv_provider_homebrew_list_available
|
|||||||
continue
|
continue
|
||||||
end
|
end
|
||||||
|
|
||||||
if test "$phpenv_clean_name" = "php"
|
if test "$phpenv_clean_name" = php
|
||||||
set -a phpenv_versions "$phpenv_latest_version (latest)"
|
set -a phpenv_versions "$phpenv_latest_version (latest)"
|
||||||
else if echo $phpenv_clean_name | grep -qE '^php@[0-9]+\.[0-9]+$'
|
else if echo $phpenv_clean_name | grep -qE '^php@[0-9]+\.[0-9]+$'
|
||||||
set -l phpenv_version (echo $phpenv_clean_name | sed 's/php@//')
|
set -l phpenv_version (echo $phpenv_clean_name | sed 's/php@//')
|
||||||
@@ -502,7 +502,7 @@ function __phpenv_provider_homebrew_ext_list -a phpenv_version
|
|||||||
for phpenv_ext_dir in $phpenv_cellar_path/*@$phpenv_version
|
for phpenv_ext_dir in $phpenv_cellar_path/*@$phpenv_version
|
||||||
if test -d $phpenv_ext_dir
|
if test -d $phpenv_ext_dir
|
||||||
set -l phpenv_ext_name (basename $phpenv_ext_dir | sed "s/@$phpenv_version//")
|
set -l phpenv_ext_name (basename $phpenv_ext_dir | sed "s/@$phpenv_version//")
|
||||||
if test "$phpenv_ext_name" != "php"
|
if test "$phpenv_ext_name" != php
|
||||||
echo $phpenv_ext_name
|
echo $phpenv_ext_name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -574,7 +574,7 @@ function __phpenv_provider_apt_ensure_source
|
|||||||
echo ""
|
echo ""
|
||||||
read -P "Add ppa:ondrej/php? [y/N] " -l confirm
|
read -P "Add ppa:ondrej/php? [y/N] " -l confirm
|
||||||
|
|
||||||
if test "$confirm" = "y" -o "$confirm" = "Y"
|
if test "$confirm" = y -o "$confirm" = Y
|
||||||
echo "Adding ppa:ondrej/php..."
|
echo "Adding ppa:ondrej/php..."
|
||||||
if command -q add-apt-repository
|
if command -q add-apt-repository
|
||||||
if sudo add-apt-repository -y ppa:ondrej/php
|
if sudo add-apt-repository -y ppa:ondrej/php
|
||||||
@@ -603,8 +603,7 @@ function __phpenv_provider_apt_list_installed
|
|||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
dpkg -l 'php[0-9]*-cli' 2>/dev/null | grep '^ii' | \
|
dpkg -l 'php[0-9]*-cli' 2>/dev/null | grep '^ii' | sed -E 's/^ii\s+php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
|
||||||
sed -E 's/^ii\s+php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_provider_apt_list_available
|
function __phpenv_provider_apt_list_available
|
||||||
@@ -613,8 +612,7 @@ function __phpenv_provider_apt_list_available
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
apt-cache search '^php[0-9]+\.[0-9]+-cli$' 2>/dev/null | \
|
apt-cache search '^php[0-9]+\.[0-9]+-cli$' 2>/dev/null | sed -E 's/^php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
|
||||||
sed -E 's/^php([0-9]+\.[0-9]+)-cli.*/\1/' | sort -V | uniq
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_provider_apt_get_php_path -a phpenv_version
|
function __phpenv_provider_apt_get_php_path -a phpenv_version
|
||||||
@@ -644,7 +642,7 @@ function __phpenv_provider_apt_get_php_path -a phpenv_version
|
|||||||
set -l temp_link "$target.$fish_pid"
|
set -l temp_link "$target.$fish_pid"
|
||||||
ln -s "$source" "$temp_link" 2>/dev/null
|
ln -s "$source" "$temp_link" 2>/dev/null
|
||||||
and mv -f "$temp_link" "$target" 2>/dev/null
|
and mv -f "$temp_link" "$target" 2>/dev/null
|
||||||
else if test "$binary" = "phar"; and test -x "/usr/bin/phar$phpenv_version"
|
else if test "$binary" = phar; and test -x "/usr/bin/phar$phpenv_version"
|
||||||
set -l temp_link "$target.$fish_pid"
|
set -l temp_link "$target.$fish_pid"
|
||||||
ln -s "/usr/bin/phar$phpenv_version" "$temp_link" 2>/dev/null
|
ln -s "/usr/bin/phar$phpenv_version" "$temp_link" 2>/dev/null
|
||||||
and mv -f "$temp_link" "$target" 2>/dev/null
|
and mv -f "$temp_link" "$target" 2>/dev/null
|
||||||
@@ -819,8 +817,7 @@ function __phpenv_provider_apt_ext_list -a phpenv_version
|
|||||||
# Filter out core packages (cli, common, etc.)
|
# Filter out core packages (cli, common, etc.)
|
||||||
set -l core_packages cli common opcache fpm cgi phpdbg
|
set -l core_packages cli common opcache fpm cgi phpdbg
|
||||||
|
|
||||||
dpkg -l "php$phpenv_version-*" 2>/dev/null | grep '^ii' | awk '{print $2}' | \
|
dpkg -l "php$phpenv_version-*" 2>/dev/null | grep '^ii' | awk '{print $2}' | sed "s/php$phpenv_version-//" | while read ext
|
||||||
sed "s/php$phpenv_version-//" | while read ext
|
|
||||||
# Skip core packages
|
# Skip core packages
|
||||||
set -l is_core 0
|
set -l is_core 0
|
||||||
for core in $core_packages
|
for core in $core_packages
|
||||||
@@ -837,9 +834,7 @@ end
|
|||||||
|
|
||||||
function __phpenv_provider_apt_ext_available -a phpenv_version
|
function __phpenv_provider_apt_ext_available -a phpenv_version
|
||||||
# List available extensions from apt cache
|
# List available extensions from apt cache
|
||||||
apt-cache search "^php$phpenv_version-" 2>/dev/null | \
|
apt-cache search "^php$phpenv_version-" 2>/dev/null | sed "s/php$phpenv_version-//" | awk '{print $1}' | grep -v -E '^(cli|common|fpm|cgi|phpdbg|dev)$' | sort | uniq
|
||||||
sed "s/php$phpenv_version-//" | awk '{print $1}' | \
|
|
||||||
grep -v -E '^(cli|common|fpm|cgi|phpdbg|dev)$' | sort | uniq
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_provider_apt_get_path_pattern
|
function __phpenv_provider_apt_get_path_pattern
|
||||||
@@ -979,9 +974,9 @@ end
|
|||||||
function __phpenv_resolve_version_alias -a phpenv_version
|
function __phpenv_resolve_version_alias -a phpenv_version
|
||||||
switch $phpenv_version
|
switch $phpenv_version
|
||||||
case latest
|
case latest
|
||||||
__phpenv_parse_version_field "latest" "8.4"
|
__phpenv_parse_version_field latest "8.4"
|
||||||
case nightly
|
case nightly
|
||||||
__phpenv_parse_version_field "nightly" "8.5"
|
__phpenv_parse_version_field nightly "8.5"
|
||||||
case '8.x'
|
case '8.x'
|
||||||
__phpenv_parse_version_field "8.x" "8.4"
|
__phpenv_parse_version_field "8.x" "8.4"
|
||||||
case '7.x'
|
case '7.x'
|
||||||
@@ -997,7 +992,7 @@ function __phpenv_get_formula_name -a phpenv_version
|
|||||||
set -l phpenv_latest_version (__phpenv_parse_version_field "latest" "8.4")
|
set -l phpenv_latest_version (__phpenv_parse_version_field "latest" "8.4")
|
||||||
|
|
||||||
if test "$phpenv_version" = "$phpenv_latest_version"
|
if test "$phpenv_version" = "$phpenv_latest_version"
|
||||||
echo "shivammathur/php/php"
|
echo shivammathur/php/php
|
||||||
else
|
else
|
||||||
echo "shivammathur/php/php@$phpenv_version"
|
echo "shivammathur/php/php@$phpenv_version"
|
||||||
end
|
end
|
||||||
@@ -1140,7 +1135,7 @@ function __phpenv_use
|
|||||||
set -l phpenv_version $argv[1]
|
set -l phpenv_version $argv[1]
|
||||||
|
|
||||||
# Handle special case: restore system PHP
|
# Handle special case: restore system PHP
|
||||||
if test "$phpenv_version" = "system"
|
if test "$phpenv_version" = system
|
||||||
__phpenv_restore_system_path
|
__phpenv_restore_system_path
|
||||||
echo "Restored system PHP"
|
echo "Restored system PHP"
|
||||||
return 0
|
return 0
|
||||||
@@ -1157,7 +1152,7 @@ function __phpenv_use
|
|||||||
end
|
end
|
||||||
|
|
||||||
if not __phpenv_is_version_installed $phpenv_version
|
if not __phpenv_is_version_installed $phpenv_version
|
||||||
if test "$(__phpenv_config_get auto-install)" = "true"
|
if test "$(__phpenv_config_get auto-install)" = true
|
||||||
__phpenv_install $phpenv_version
|
__phpenv_install $phpenv_version
|
||||||
else
|
else
|
||||||
echo "PHP $phpenv_version is not installed. Install with: phpenv install $phpenv_version"
|
echo "PHP $phpenv_version is not installed. Install with: phpenv install $phpenv_version"
|
||||||
@@ -1179,7 +1174,7 @@ function __phpenv_local -a phpenv_version
|
|||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
echo $phpenv_version > .php-version
|
echo $phpenv_version >.php-version
|
||||||
echo "Set local PHP version to $phpenv_version"
|
echo "Set local PHP version to $phpenv_version"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1272,7 +1267,7 @@ function __phpenv_get_tap_versions
|
|||||||
continue
|
continue
|
||||||
end
|
end
|
||||||
|
|
||||||
if test "$phpenv_clean_name" = "php"
|
if test "$phpenv_clean_name" = php
|
||||||
set -a phpenv_versions "$phpenv_latest_version (latest)"
|
set -a phpenv_versions "$phpenv_latest_version (latest)"
|
||||||
else if echo $phpenv_clean_name | grep -qE '^php@[0-9]+\.[0-9]+$'
|
else if echo $phpenv_clean_name | grep -qE '^php@[0-9]+\.[0-9]+$'
|
||||||
set -l phpenv_version (echo $phpenv_clean_name | sed 's/php@//')
|
set -l phpenv_version (echo $phpenv_clean_name | sed 's/php@//')
|
||||||
@@ -1310,7 +1305,7 @@ function __phpenv_doctor
|
|||||||
|
|
||||||
# Show provider information
|
# Show provider information
|
||||||
set -l provider (__phpenv_get_provider)
|
set -l provider (__phpenv_get_provider)
|
||||||
set -l provider_source "auto-detected"
|
set -l provider_source auto-detected
|
||||||
if set -q PHPENV_PROVIDER; and test -n "$PHPENV_PROVIDER"
|
if set -q PHPENV_PROVIDER; and test -n "$PHPENV_PROVIDER"
|
||||||
set provider_source "PHPENV_PROVIDER override"
|
set provider_source "PHPENV_PROVIDER override"
|
||||||
end
|
end
|
||||||
@@ -1429,7 +1424,7 @@ function __phpenv_config_get -a phpenv_key
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if test "$argv[2]" = "--verbose"
|
if test "$argv[2]" = --verbose
|
||||||
if test -n "$phpenv_value"
|
if test -n "$phpenv_value"
|
||||||
echo "$phpenv_key = $phpenv_value (from $phpenv_source)"
|
echo "$phpenv_key = $phpenv_value (from $phpenv_source)"
|
||||||
else
|
else
|
||||||
@@ -1581,19 +1576,18 @@ function __phpenv_get_tap_formulas -a tap_name
|
|||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
brew tap-info $tap_name --json 2>/dev/null | \
|
brew tap-info $tap_name --json 2>/dev/null | jq -r '.[]|(.formula_names[]?)' 2>/dev/null
|
||||||
jq -r '.[]|(.formula_names[]?)' 2>/dev/null
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_get_available_extensions
|
function __phpenv_get_available_extensions
|
||||||
__phpenv_get_tap_formulas "shivammathur/extensions"
|
__phpenv_get_tap_formulas shivammathur/extensions
|
||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_extension_available -a phpenv_extension phpenv_version
|
function __phpenv_extension_available -a phpenv_extension phpenv_version
|
||||||
set -l phpenv_available_extensions (__phpenv_get_available_extensions)
|
set -l phpenv_available_extensions (__phpenv_get_available_extensions)
|
||||||
|
|
||||||
if test -z "$phpenv_available_extensions"
|
if test -z "$phpenv_available_extensions"
|
||||||
return 0 # Assume available if can't check
|
return 0 # Assume available if can't check
|
||||||
end
|
end
|
||||||
|
|
||||||
for phpenv_ext_formula in $phpenv_available_extensions
|
for phpenv_ext_formula in $phpenv_available_extensions
|
||||||
@@ -1695,7 +1689,7 @@ function __phpenv_auto_switch --on-variable PWD
|
|||||||
end
|
end
|
||||||
|
|
||||||
set -l phpenv_auto_switch (__phpenv_config_get auto-switch)
|
set -l phpenv_auto_switch (__phpenv_config_get auto-switch)
|
||||||
if test "$phpenv_auto_switch" = "false"
|
if test "$phpenv_auto_switch" = false
|
||||||
return 0
|
return 0
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1718,7 +1712,7 @@ function __phpenv_auto_switch --on-variable PWD
|
|||||||
set -g PHPENV_LAST_SWITCH_TIME $phpenv_current_time
|
set -g PHPENV_LAST_SWITCH_TIME $phpenv_current_time
|
||||||
else
|
else
|
||||||
set -l phpenv_auto_install (__phpenv_config_get auto-install)
|
set -l phpenv_auto_install (__phpenv_config_get auto-install)
|
||||||
if test "$phpenv_auto_install" = "true"
|
if test "$phpenv_auto_install" = true
|
||||||
echo "Auto-installing PHP $phpenv_new_version..."
|
echo "Auto-installing PHP $phpenv_new_version..."
|
||||||
if phpenv install "$phpenv_new_version"
|
if phpenv install "$phpenv_new_version"
|
||||||
set -g PHPENV_LAST_SWITCH_TIME $phpenv_current_time
|
set -g PHPENV_LAST_SWITCH_TIME $phpenv_current_time
|
||||||
@@ -1771,7 +1765,7 @@ function __phpenv_help
|
|||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_validate_boolean -a phpenv_value
|
function __phpenv_validate_boolean -a phpenv_value
|
||||||
test "$phpenv_value" = "true" -o "$phpenv_value" = "false"
|
test "$phpenv_value" = true -o "$phpenv_value" = false
|
||||||
end
|
end
|
||||||
|
|
||||||
function __phpenv_validate_version -a phpenv_version
|
function __phpenv_validate_version -a phpenv_version
|
||||||
|
|||||||
Reference in New Issue
Block a user