From 10ba98c4f5ec4efe6272516de47f0ce128ef2902 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Oct 2022 18:41:34 +0000 Subject: Revert "update composer libs" This reverts commit 108a3efe0b6d37a7ed394a84c69b924ca727f17a. --- vendor/bin/generate_vcards | 5 +---- vendor/bin/naturalselection | 2 +- vendor/bin/sabredav | 2 +- vendor/bin/vobject | 5 +---- 4 files changed, 4 insertions(+), 10 deletions(-) (limited to 'vendor/bin') diff --git a/vendor/bin/generate_vcards b/vendor/bin/generate_vcards index b484cc11e..a6bdfa274 100755 --- a/vendor/bin/generate_vcards +++ b/vendor/bin/generate_vcards @@ -108,10 +108,7 @@ if (PHP_VERSION_ID < 80000) { } } - if ( - (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) - || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) - ) { + if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) { include("phpvfscomposer://" . __DIR__ . '/..'.'/sabre/vobject/bin/generate_vcards'); exit(0); } diff --git a/vendor/bin/naturalselection b/vendor/bin/naturalselection index d13c00bb3..586050de8 100755 --- a/vendor/bin/naturalselection +++ b/vendor/bin/naturalselection @@ -23,7 +23,7 @@ if [ -d /proc/cygdrive ]; then esac fi -export COMPOSER_RUNTIME_BIN_DIR="$(cd "${self%[/\\]*}" > /dev/null; pwd)" +export COMPOSER_BIN_DIR=$(cd "${self%[/\\]*}" > /dev/null; pwd) # If bash is sourcing this file, we have to source the target as well bashSource="$BASH_SOURCE" diff --git a/vendor/bin/sabredav b/vendor/bin/sabredav index 6e915f637..73bfa6039 100755 --- a/vendor/bin/sabredav +++ b/vendor/bin/sabredav @@ -23,7 +23,7 @@ if [ -d /proc/cygdrive ]; then esac fi -export COMPOSER_RUNTIME_BIN_DIR="$(cd "${self%[/\\]*}" > /dev/null; pwd)" +export COMPOSER_BIN_DIR=$(cd "${self%[/\\]*}" > /dev/null; pwd) # If bash is sourcing this file, we have to source the target as well bashSource="$BASH_SOURCE" diff --git a/vendor/bin/vobject b/vendor/bin/vobject index 0a78d4965..0097f5a5c 100755 --- a/vendor/bin/vobject +++ b/vendor/bin/vobject @@ -108,10 +108,7 @@ if (PHP_VERSION_ID < 80000) { } } - if ( - (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true)) - || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) - ) { + if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) { include("phpvfscomposer://" . __DIR__ . '/..'.'/sabre/vobject/bin/vobject'); exit(0); } -- cgit v1.2.3