Skip to content

Commit 2cc968b

Browse files
committed
testing [skip ci]
1 parent 248e3ca commit 2cc968b

41 files changed

Lines changed: 170 additions & 170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

__tests__/utils.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ describe('Utils tests', () => {
181181
});
182182

183183
it('checking suppressOutput', async () => {
184-
expect(await utils.suppressOutput('win32')).toEqual(' >$null 2>&1');
185-
expect(await utils.suppressOutput('linux')).toEqual(' >/dev/null 2>&1');
186-
expect(await utils.suppressOutput('darwin')).toEqual(' >/dev/null 2>&1');
184+
expect(await utils.suppressOutput('win32')).toEqual(' ');
185+
expect(await utils.suppressOutput('linux')).toEqual(' ');
186+
expect(await utils.suppressOutput('darwin')).toEqual(' ');
187187
expect(await utils.suppressOutput('openbsd')).toContain(
188188
'Platform openbsd is not supported'
189189
);

dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export async function addINIValuesUnix(
1717
return (
1818
'echo "' +
1919
ini_values.join('\n') +
20-
'" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null 2>&1' +
20+
'" | sudo tee -a "${pecl_file:-${ini_file[@]}}" ' +
2121
script
2222
);
2323
}

src/scripts/darwin.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ handle_dependency_extensions() {
1313
suffix="$(get_php_formula_suffix)"
1414
if [[ -n "$suffix" ]]; then
1515
brew_opts=(-sf)
16-
patch_abstract_file >/dev/null 2>&1
16+
patch_abstract_file
1717
for dependency_extension in "${dependency_extensions[@]}"; do
18-
brew install "${brew_opts[@]}" "$ext_tap/$dependency_extension@$version" >/dev/null 2>&1 && copy_brew_extensions "$dependency_extension"
18+
brew install "${brew_opts[@]}" "$ext_tap/$dependency_extension@$version" && copy_brew_extensions "$dependency_extension"
1919
done
2020
fi
2121
}
@@ -31,7 +31,7 @@ disable_extension_helper() {
3131
sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}"
3232
sudo rm -rf "$scan_dir"/*"$extension"* /tmp/php"$version"_extensions
3333
mkdir -p /tmp/extdisabled/"$version"
34-
echo '' | sudo tee /tmp/extdisabled/"$version"/"$extension" >/dev/null 2>&1
34+
echo '' | sudo tee /tmp/extdisabled/"$version"/"$extension"
3535
}
3636

3737
# Function to get extension name from brew formula.
@@ -81,9 +81,9 @@ add_brew_extension() {
8181
add_brew_tap "$php_tap"
8282
add_brew_tap "$ext_tap"
8383
formula="$(get_renamed_formula "$formula")"
84-
update_dependencies >/dev/null 2>&1
85-
handle_dependency_extensions "$formula" "$extension" >/dev/null 2>&1
86-
(brew install "${brew_opts[@]}" "$ext_tap/$formula@$version" >/dev/null 2>&1 && copy_brew_extensions "$formula") || pecl_install "$extension" >/dev/null 2>&1
84+
update_dependencies
85+
handle_dependency_extensions "$formula" "$extension"
86+
(brew install "${brew_opts[@]}" "$ext_tap/$formula@$version" && copy_brew_extensions "$formula") || pecl_install "$extension"
8787
add_extension_log "$extension" "Installed and enabled"
8888
fi
8989
}
@@ -92,7 +92,7 @@ add_brew_extension() {
9292
patch_abstract_file() {
9393
abstract_path="$tap_dir"/"$ext_tap"/Abstract/abstract-php-extension.rb
9494
if [[ -e "$abstract_path" && ! -e /tmp/abstract_patch ]]; then
95-
echo '' | sudo tee /tmp/abstract_patch >/dev/null 2>&1
95+
echo '' | sudo tee /tmp/abstract_patch
9696
sudo sed -i '' -e "s|php@#{\(.*\)}|php@#{\1}$suffix|g" -e "s|php_version /|\"#{php_version}$suffix\" /|g" "$abstract_path"
9797
fi
9898
}
@@ -102,9 +102,9 @@ add_extension_helper() {
102102
local extension=$1
103103
prefix=$2
104104
if [[ "$version" =~ ${old_versions:?} ]] && [ "$extension" = "imagick" ]; then
105-
run_script "php5-darwin" "${version/./}" "$extension" >/dev/null 2>&1
105+
run_script "php5-darwin" "${version/./}" "$extension"
106106
else
107-
pecl_install "$extension" >/dev/null 2>&1 &&
107+
pecl_install "$extension" &&
108108
if [[ "$version" =~ ${old_versions:?} ]]; then echo "$prefix=$ext_dir/$extension.so" >>"$ini_file"; fi
109109
fi
110110
add_extension_log "$extension" "Installed and enabled"
@@ -118,8 +118,8 @@ add_devtools() {
118118

119119
# Function to handle request to add PECL.
120120
add_pecl() {
121-
enable_extension xml extension >/dev/null 2>&1
122-
configure_pecl >/dev/null 2>&1
121+
enable_extension xml extension
122+
configure_pecl
123123
pear_version=$(get_tool_version "pecl" "version")
124124
add_log "${tick:?}" "PECL" "Found PECL $pear_version"
125125
}
@@ -151,7 +151,7 @@ update_dependencies() {
151151
git_retry -C "$repo" fetch origin main && git -C "$repo" reset --hard origin/main
152152
fi
153153
done
154-
echo '' | sudo tee /tmp/update_dependencies >/dev/null 2>&1
154+
echo '' | sudo tee /tmp/update_dependencies
155155
fi
156156
}
157157

@@ -186,7 +186,7 @@ add_php() {
186186
brew unlink "$php_keg"
187187
fi
188188
else
189-
brew install -f --overwrite "$php_formula"
189+
brew install -f --overwrite "$php_formula" || brew upgrade -f --overwrite "$php_formula"
190190
fi
191191
sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
192192
brew link --force --overwrite "$php_keg"
@@ -216,7 +216,7 @@ add_php_config() {
216216
if [[ "$ini" = "production" || "$ini" = "development" ]]; then
217217
sudo cp "$ini_dir"/php.ini-"$ini" "$ini_dir"/php.ini
218218
elif [ "$ini" = "none" ]; then
219-
echo '' | sudo tee "${ini_file[@]}" >/dev/null 2>&1
219+
echo '' | sudo tee "${ini_file[@]}"
220220
fi
221221
}
222222

@@ -231,7 +231,7 @@ get_scan_dir() {
231231

232232
# Function to handle self-hosted runner setup.
233233
self_hosted_helper() {
234-
sudo mkdir -p /opt/hostedtoolcache >/dev/null 2>&1 || true
234+
sudo mkdir -p /opt/hostedtoolcache || true
235235
}
236236

237237
# Function to Setup PHP.
@@ -243,15 +243,15 @@ setup_php() {
243243
existing_version=$(get_brewed_php)
244244
status="Found"
245245
if [[ "$version" =~ ${old_versions:?} ]]; then
246-
run_script "php5-darwin" "${version/./}" >/dev/null 2>&1
246+
run_script "php5-darwin" "${version/./}"
247247
status="Installed"
248248
elif [ "${existing_version:0:3}" != "$version" ]; then
249-
add_php "install" "$existing_version" >/dev/null 2>&1
249+
add_php "install" "$existing_version"
250250
status="Installed"
251251
elif [[ "${existing_version:0:3}" = "$version" && "${update:?}" = "true" ]]; then
252252
brew_php_version="$(brew info --json "php@$version" 2>/dev/null | jq -r '.[].versions.stable')"
253253
if [ "$brew_php_version" != "$existing_version" ]; then
254-
add_php "upgrade" "$existing_version" >/dev/null 2>&1
254+
add_php "upgrade" "$existing_version"
255255
status="Upgraded"
256256
fi
257257
fi

src/scripts/extensions/add_extensions.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ enable_extension() {
5050
[ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete
5151
enable_extension_dependencies "$1" "$2"
5252
enable_cache_extension_dependencies "$1" "$2"
53-
if ! [[ "${version:?}" =~ ${old_versions:?} ]] && command -v phpenmod >/dev/null 2>&1; then
53+
if ! [[ "${version:?}" =~ ${old_versions:?} ]] && command -v phpenmod ; then
5454
sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?\"?$/d" "$pecl_file"
5555
mod="${ini_dir:?}"/../mods-available/"$1".ini
5656
if ! [ -e "$mod" ]; then
@@ -59,7 +59,7 @@ enable_extension() {
5959
[ -n "$mod_priority_line" ] && priority=$(echo "$mod_priority_line" | cut -d'=' -f 2)
6060
(echo "; priority=$priority"; echo "$2=${ext_dir:?}/$1.so") | sudo tee "$mod" >/dev/null
6161
fi
62-
sudo phpenmod -v "$version" "$1" >/dev/null 2>&1
62+
sudo phpenmod -v "$version" "$1"
6363
else
6464
echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null
6565
fi
@@ -71,15 +71,15 @@ enable_extensions() {
7171
local extensions=("$@")
7272
to_wait=()
7373
for ext in "${extensions[@]}"; do
74-
enable_extension "$ext" extension >/dev/null 2>&1 &
74+
enable_extension "$ext" extension &
7575
to_wait+=($!)
7676
done
7777
wait "${to_wait[@]}"
7878
}
7979

8080
# Function to get a map of extensions and their dependent shared extensions.
8181
get_extension_map() {
82-
php -d'error_reporting=0' "${src:?}"/scripts/extensions/extension_map.php /tmp/map"$version".orig >/dev/null 2>&1
82+
php -d'error_reporting=0' "${src:?}"/scripts/extensions/extension_map.php /tmp/map"$version".orig
8383
}
8484

8585
# Function to enable extension dependencies which are also extensions.
@@ -125,7 +125,7 @@ disable_extension() {
125125
disable_all_shared() {
126126
get_extension_map
127127
sudo sed -i.orig -E -e "/^(zend_)?extension\s*=/d" "${ini_file[@]}" "$pecl_file" 2>/dev/null || true
128-
sudo find "${ini_dir:-$scan_dir}"/.. -name "*.ini" -not -path "*php.ini" -not -path "*phar.ini" -not -path "*pecl.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true
128+
sudo find "${ini_dir:-$scan_dir}"/.. -name "*.ini" -not -path "*php.ini" -not -path "*phar.ini" -not -path "*pecl.ini" -not -path "*mods-available*" -delete || true
129129
mkdir -p /tmp/extdisabled/"$version"
130130
sudo rm -f /tmp/php"$version"_extensions
131131
sudo find "$ext_dir" -name '*.so' -print0 | xargs -0 -n 1 basename -s .so | xargs -I{} touch /tmp/extdisabled/"$version"/{}
@@ -139,7 +139,7 @@ configure_pecl() {
139139
for script in pear pecl; do
140140
sudo "$script" channel-update "$script".php.net
141141
done
142-
echo '' | sudo tee /tmp/pecl_config >/dev/null 2>&1
142+
echo '' | sudo tee /tmp/pecl_config
143143
fi
144144
}
145145

@@ -177,8 +177,8 @@ get_pecl_version() {
177177
pecl_install() {
178178
local extension=$1
179179
local prefix=${2:-extension}
180-
add_pecl >/dev/null 2>&1
181-
disable_extension_helper "${extension%-*}" >/dev/null 2>&1
180+
add_pecl
181+
disable_extension_helper "${extension%-*}"
182182
# Compare version with 8.3 so it runs only on 8.4 and above
183183
# Install using the source interface as it allows for patching.
184184
if [[ $(printf "%s\n%s" "${version:?}" "8.3" | sort -V | head -n1) != "$version" ]]; then
@@ -191,11 +191,11 @@ pecl_install() {
191191
prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS) MAKEFLAGS='-j $cpu_count'"
192192
suffix_opts="$(parse_args "$extension" CONFIGURE_OPTS) $(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"
193193
IFS=' ' read -r -a libraries <<<"$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
194-
(( ${#libraries[@]} )) && add_libs "${libraries[@]}" >/dev/null 2>&1
194+
(( ${#libraries[@]} )) && add_libs "${libraries[@]}"
195195
if [ "$version" = "5.3" ]; then
196-
yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f "$extension" >/dev/null 2>&1
196+
yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f "$extension"
197197
else
198-
yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension" >/dev/null 2>&1
198+
yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension"
199199
fi
200200
local exit_code=$?
201201
sudo pecl info "$extension" | grep -iq 'zend extension' && prefix=zend_extension
@@ -218,7 +218,7 @@ add_pecl_extension() {
218218
add_log "${tick:?}" "$extension" "Enabled"
219219
else
220220
[ -n "$pecl_version" ] && pecl_version="-$pecl_version"
221-
pecl_install "$extension$pecl_version" || ( [ "${fail_fast:?}" = "false" ] && add_extension "$extension" "$(get_extension_prefix "$extension")" >/dev/null 2>&1)
221+
pecl_install "$extension$pecl_version" || ( [ "${fail_fast:?}" = "false" ] && add_extension "$extension" "$(get_extension_prefix "$extension")" )
222222
extension_version="$(php -r "echo phpversion('$extension');")"
223223
[ -n "$extension_version" ] && extension_version="-$extension_version"
224224
add_extension_log "$extension$extension_version" "Installed and enabled"

src/scripts/extensions/blackfire.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ add_blackfire() {
1919
extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
2020
fi
2121
fi
22-
get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_"$arch_name"-php-"$no_dot_version".so >/dev/null 2>&1
22+
get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_"$arch_name"-php-"$no_dot_version".so
2323
fi
2424
if [ -e "${ext_dir:?}/blackfire.so" ]; then
25-
disable_extension xdebug >/dev/null 2>&1
26-
disable_extension pcov >/dev/null 2>&1
25+
disable_extension xdebug
26+
disable_extension pcov
2727
enable_extension blackfire extension
2828
add_extension_log blackfire "$status"
2929
else

src/scripts/extensions/couchbase.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ add_couchbase() {
5959
ext=$(get_couchbase_version)
6060
fi
6161
if [[ "$ext" =~ couchbase-[2-3].+ ]]; then
62-
add_couchbase_clibs "$ext" >/dev/null 2>&1
62+
add_couchbase_clibs "$ext"
6363
else
64-
add_couchbase_cxxlibs >/dev/null 2>&1
64+
add_couchbase_cxxlibs
6565
fi
6666
enable_extension "couchbase" "extension"
6767
if check_extension "couchbase"; then
@@ -72,9 +72,9 @@ add_couchbase() {
7272
n_proc="$(nproc)"
7373
export COUCHBASE_SUFFIX_OPTS="CMAKE_BUILD_TYPE=Release"
7474
export CMAKE_BUILD_PARALLEL_LEVEL="$n_proc"
75-
add_extension_from_source couchbase https://pecl.php.net couchbase couchbase "${ext##*-}" extension pecl >/dev/null 2>&1
75+
add_extension_from_source couchbase https://pecl.php.net couchbase couchbase "${ext##*-}" extension pecl
7676
else
77-
pecl_install "${ext}" >/dev/null 2>&1
77+
pecl_install "${ext}"
7878
fi
7979
add_extension_log "couchbase" "Installed and enabled"
8080
fi

src/scripts/extensions/cubrid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ add_cubrid_helper() {
4242
add_cubrid() {
4343
ext=$1
4444
status='Enabled'
45-
add_cubrid_helper "$ext" >/dev/null 2>&1
45+
add_cubrid_helper "$ext"
4646
add_extension_log "$ext" "$status"
4747
check_extension "$ext" && add_license_log
4848
}

src/scripts/extensions/event.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ add_event() {
3939
add_log "${tick:?}" "event" "Enabled"
4040
else
4141
if ! [[ "${version:?}" =~ ${old_versions:?} ]] && [ "$os" = "Darwin" ]; then
42-
add_brew_extension event extension >/dev/null 2>&1
42+
add_brew_extension event extension
4343
else
44-
add_event_helper "$ext" >/dev/null 2>&1
44+
add_event_helper "$ext"
4545
fi
4646
add_extension_log "event" "Installed and enabled"
4747
fi

src/scripts/extensions/firebird.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ add_firebird_helper() {
2424

2525
add_firebird() {
2626
if [ "$(uname -s )" = "Darwin" ]; then
27-
add_firebird_client_darwin >/dev/null 2>&1
27+
add_firebird_client_darwin
2828
fi
2929
enable_extension pdo_firebird extension
3030
status="Enabled"
3131
if ! check_extension pdo_firebird; then
3232
status="Installed and enabled"
3333
if [ "$(uname -s)" = "Linux" ]; then
3434
if [[ "${version:?}" =~ 5.3|${nightly_versions:?} ]]; then
35-
add_firebird_helper /usr >/dev/null 2>&1
35+
add_firebird_helper /usr
3636
else
37-
add_pdo_extension firebird >/dev/null 2>&1
37+
add_pdo_extension firebird
3838
fi
3939
else
40-
add_firebird_helper /opt/firebird >/dev/null 2>&1
40+
add_firebird_helper /opt/firebird
4141
fi
4242
fi
4343
add_extension_log pdo_firebird "$status"

0 commit comments

Comments
 (0)