Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite lib/pecl #341

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Rewrite lib/pecl #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
012070d
chore(php-buildpack): update pecl functions
Frzk Jul 10, 2023
8cccf6e
fix(pecl): fix php::pecl::extract_extension
Frzk Jul 10, 2023
513624f
fix(pecl): fix some echo calls
Frzk Jul 10, 2023
39e845d
fix(pecl): fix some erroneous code
Frzk Jul 10, 2023
b151605
fix(pecl): fix enable_pecl_extension function
Frzk Jul 10, 2023
3b49c6a
fix(pecl): fix error handling when an extension doesn't exist
Frzk Jul 10, 2023
fb6b1cf
fix(pecl): better error messages
Frzk Jul 10, 2023
925734a
fix(pecl): better success message
Frzk Jul 10, 2023
52a749f
fix(pecl): shellcheck compliance
Frzk Jul 10, 2023
356b7a7
chore(pecl): remove useless files and calls
Frzk Jul 11, 2023
5ded27c
chore(pecl): rename function
Frzk Jul 11, 2023
16eb982
chore(pecl): remove import of 'lib/scout'
Frzk Jul 11, 2023
4527a82
chore(pecl): rename function
Frzk Jul 11, 2023
3f43de3
chore(pecl): remove useless code
Frzk Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions bin/compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ source $basedir/common.sh
source $basedir/../lib/package
source $basedir/../lib/composer
source $basedir/../lib/datadog
source $basedir/../lib/scout
source $basedir/../lib/newrelic
source $basedir/../lib/apt
source $basedir/../lib/pecl
Expand Down Expand Up @@ -312,10 +311,6 @@ if [ -f "$BUILD_DIR/composer.json" ] && package_datadog_enabled; then
install_datadog "${DATADOG_TRACER_VERSION}" "${DATADOG_APPSEC_VERSION}"
fi

if [ -f "$BUILD_DIR/composer.json" ] && package_scout_enabled; then
install_scout "${SCOUT_APM_VERSION}"
fi

if [ -f "$BUILD_DIR/composer.json" ] && package_newrelic_enabled; then
status "New Relic usage detected, installing Agent and PHP extension"
LOG_FILES+=( "/app/vendor/newrelic/daemon.log" "/app/vendor/newrelic/agent.log" )
Expand Down
2 changes: 1 addition & 1 deletion lib/composer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function install_composer_deps() {
echo "Installing PHP extension: ${ext}" | indent
fetch_package "${PHP_BASE_URL}" "${extension_package_path}" "/app/vendor/php"
else
install_pecl_extension "${ext}" "${ext_version}" "${CACHE_DIR}"
php::pecl::install_extension "${ext}" "${ext_version}" "${CACHE_DIR}"
fi
done
fi
Expand Down
Loading