actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-26 21:33:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from shivammathur/develop

Browse Source 
Hotfix
This commit is contained in:
Shivam Mathur 2020-10-12 13:26:36 +05:30
commit a0f02c17c0
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
5 changed files with 683 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1157
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@ -31,18 +31,18 @@
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^26.0.14", "@types/jest": "^26.0.14",
"@types/node": "^14.11.2", "@types/node": "^14.11.8",
"@typescript-eslint/eslint-plugin": "^4.3.0", "@typescript-eslint/eslint-plugin": "^4.4.0",
"@typescript-eslint/parser": "^4.3.0", "@typescript-eslint/parser": "^4.4.0",
"@zeit/ncc": "^0.22.3", "@zeit/ncc": "^0.22.3",
"eslint": "^7.10.0", "eslint": "^7.11.0",
"eslint-config-prettier": "^6.12.0", "eslint-config-prettier": "^6.12.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.0.2", "eslint-plugin-jest": "^24.1.0",
"eslint-plugin-prettier": "^3.1.4", "eslint-plugin-prettier": "^3.1.4",
"husky": "^4.3.0", "husky": "^4.3.0",
"jest": "^26.4.2", "jest": "^26.5.3",
"jest-circus": "^26.4.2", "jest-circus": "^26.5.3",
"prettier": "^2.1.2", "prettier": "^2.1.2",
"ts-jest": "^26.4.1", "ts-jest": "^26.4.1",
"typescript": "^4.0.3" "typescript": "^4.0.3"

4
src/scripts/darwin.sh
View File

@ -67,7 +67,7 @@ check_extension() {
fi fi
} }
# Fuction to get the PECL version. # Function to get the PECL version.
get_pecl_version() { get_pecl_version() {
extension=$1 extension=$1
stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")" stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
@ -224,7 +224,7 @@ add_composertool() {
prefix=$3 prefix=$3
( (
composer global require "$prefix$release" >/dev/null 2>&1 && composer global require "$prefix$release" >/dev/null 2>&1 &&
json=$(grep "$prefix$tool" /Users/$USER/.composer/composer.json) && json=$(grep "$prefix$tool" /Users/"$USER"/.composer/composer.json) &&
tool_version=$(get_tool_version 'echo' "$json") && tool_version=$(get_tool_version 'echo' "$json") &&
add_log "$tick" "$tool" "Added $tool $tool_version" add_log "$tick" "$tool" "Added $tool $tool_version"
) || add_log "$cross" "$tool" "Could not setup $tool" ) || add_log "$cross" "$tool" "Could not setup $tool"

4
src/scripts/ext/phalcon.sh
View File

@ -3,7 +3,11 @@ add_phalcon_helper() {
status='Installed and enabled' status='Installed and enabled'
if [ "$os_name" = "Linux" ]; then if [ "$os_name" = "Linux" ]; then
update_lists update_lists
if [ "$extension" = "phalcon4" ]; then
${apt_install:?} "php${version:?}-psr" "php${version:?}-$extension"
else
${apt_install:?} "php${version:?}-$extension" ${apt_install:?} "php${version:?}-$extension"
fi
else else
phalcon_ini_file=${ini_file:?} phalcon_ini_file=${ini_file:?}
sed -i '' '/extension.*psr/d' "${ini_file:?}" sed -i '' '/extension.*psr/d' "${ini_file:?}"

8
src/scripts/linux.sh
View File

@ -42,7 +42,7 @@ cleanup_lists() {
sudo mkdir /etc/apt/sources.list.d sudo mkdir /etc/apt/sources.list.d
sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/ sudo mv /etc/apt/sources.list.d.save/*ondrej*.list /etc/apt/sources.list.d/
sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true sudo mv /etc/apt/sources.list.d.save/*dotdeb*.list /etc/apt/sources.list.d/ 2>/dev/null || true
trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/" exit trap "sudo mv /etc/apt/sources.list.d.save/*.list /etc/apt/sources.list.d/ 2>/dev/null" exit
fi fi
} }
@ -89,7 +89,7 @@ configure_pecl() {
fi fi
} }
# Fuction to get the PECL version of an extension. # Function to get the PECL version of an extension.
get_pecl_version() { get_pecl_version() {
extension=$1 extension=$1
stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")" stability="$(echo "$2" | grep -m 1 -Eio "(alpha|beta|rc|snapshot)")"
@ -153,7 +153,7 @@ enable_extension() {
fi fi
} }
# Funcion to add PDO extension. # Function to add PDO extension.
add_pdo_extension() { add_pdo_extension() {
pdo_ext="pdo_$1" pdo_ext="pdo_$1"
if check_extension "$pdo_ext"; then if check_extension "$pdo_ext"; then
@ -322,7 +322,7 @@ add_composertool() {
prefix=$3 prefix=$3
( (
composer global require "$prefix$release" >/dev/null 2>&1 && composer global require "$prefix$release" >/dev/null 2>&1 &&
json=$(grep "$prefix$tool" /home/$USER/.composer/composer.json) && json=$(grep "$prefix$tool" /home/"$USER"/.composer/composer.json) &&
tool_version=$(get_tool_version 'echo' "$json") && tool_version=$(get_tool_version 'echo' "$json") &&
add_log "$tick" "$tool" "Added $tool $tool_version" add_log "$tick" "$tool" "Added $tool $tool_version"
) || add_log "$cross" "$tool" "Could not setup $tool" ) || add_log "$cross" "$tool" "Could not setup $tool"