From b866bcf2ab06e9972c1ef250a4eb381b28ebd075 Mon Sep 17 00:00:00 2001 From: Jellyfrog Date: Thu, 29 Oct 2020 15:11:32 +0100 Subject: [PATCH] Revert "Check PHP dependencies in daily.sh (#12260)" (#12271) This reverts commit d82d2f1f19d3091bc1151ade3da9de076acccead. --- daily.sh | 16 +--------------- scripts/composer_wrapper.php | 3 +-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/daily.sh b/daily.sh index ae055dbe41..305facbd21 100755 --- a/daily.sh +++ b/daily.sh @@ -72,7 +72,7 @@ status_run() { else printf " \033[0;31mFAIL\033[0m\n"; if [[ "${arg_option}" == "update" ]]; then - php "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}" > /dev/null 2>&1 + php "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}" fi if [[ ! -z "${tmp}" ]]; then # print output in case of failure @@ -126,9 +126,6 @@ set_notifiable_result() { # Exit-Code: 0 >= min ver, 1 < min ver ####################################### check_dependencies() { - # Check first, no point in continuing otherwise. - php_dependencies - local branch=$(git rev-parse --abbrev-ref HEAD) scripts/check_requirements.py > /dev/null 2>&1 || pip3 install -r requirements.txt > /dev/null 2>&1 @@ -181,17 +178,6 @@ check_dependencies() { return 1; } -####################################### -# The check-platform-reqs command checks that your PHP and extensions versions match the platform requirements of the installed packages -# -# Returns: -# Exits on error -####################################### -php_dependencies() { - status_run 'Checking PHP dependencies' "${COMPOSER} check-platform-reqs --no-dev --no-cache" 'update' || exit 1 - return 0 -} - ####################################### # Compare two numeric versions # Arguments: diff --git a/scripts/composer_wrapper.php b/scripts/composer_wrapper.php index e5156b7eb0..b5d6e8ae1c 100755 --- a/scripts/composer_wrapper.php +++ b/scripts/composer_wrapper.php @@ -93,8 +93,7 @@ if (! $exec) { } if ($exec) { - passthru("$exec " . implode(' ', array_splice($argv, 1)) . "$extra_args 2>&1", $exit_code); - exit($exit_code); + passthru("$exec " . implode(' ', array_splice($argv, 1)) . "$extra_args 2>&1"); } else { echo "Composer not available, please manually install composer.\n"; }