Merge pull request heroku#207 from heroku/develop

v119
DSaxon · Jan 21, 2017 · 26ebb69 · 26ebb69
2 parents 2ff69ae + 23b0ad4
commit 26ebb69
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # heroku-buildpack-php CHANGELOG
 
+## v119 (2017-01-21)
+
+### FIX
+
+- Revert: ext-redis/3.1.0 [David Zuelke]
+- Revert: Composer/1.3.1 [David Zuelke]
+
 ## v118 (2017-01-20)
 
 ### ADD

diff --git a/bin/compile b/bin/compile
@@ -102,7 +102,7 @@ Please try again, or contact support if this problem persists."
 tar xzf $build_dir/.heroku/php-min.tar.gz -C $build_dir/.heroku/php-min
 rm $build_dir/.heroku/php-min.tar.gz
 
-curl_retry_on_18 --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.3.1.tar.gz" || error "Failed to download Composer. Please try again, or contact support if this problem persists."
+curl_retry_on_18 --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.2.4.tar.gz" || error "Failed to download Composer. Please try again, or contact support if this problem persists."
 tar xzf $build_dir/.heroku/composer.tar.gz -C $build_dir/.heroku/php
 rm $build_dir/.heroku/composer.tar.gz
 
@@ -250,7 +250,7 @@ unset COMPOSER_GITHUB_OAUTH_TOKEN
 
 # install dependencies unless composer.json is completely empty (in which case it'd talk to packagist.org which may be slow and is unnecessary)
 export_env_dir "$env_dir" '^[A-Z_][A-Z0-9_]*$' '^(HOME|PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH|LD_LIBRARY_PATH|STACK|REQUEST_ID|IFS|HEROKU_PHP_INSTALL_DEV)$'
-cat "$COMPOSER" | python -c 'import sys,json; sys.exit(not json.load(sys.stdin));' && composer install ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --prefer-dist --optimize-autoloader --no-interaction --no-progress 2>&1 | indent
+cat "$COMPOSER" | python -c 'import sys,json; sys.exit(not json.load(sys.stdin));' && composer install ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --prefer-dist --optimize-autoloader --no-interaction 2>&1 | indent
 
 composer show --installed heroku/heroku-buildpack-php &> /dev/null && error "Your '$COMPOSER' requires 'heroku/heroku-buildpack-php'.
 This package may only be used as a dependency in 'require-dev'!"

diff --git a/support/build/composer-1.3.1 → support/build/composer-1.2.4 b/support/build/composer-1.3.1 → support/build/composer-1.2.4
diff --git a/...ons/no-debug-non-zts-20121212/redis-3.1.0 → ...ons/no-debug-non-zts-20121212/redis-2.2.7 b/...ons/no-debug-non-zts-20121212/redis-3.1.0 → ...ons/no-debug-non-zts-20121212/redis-2.2.7
diff --git a/...ons/no-debug-non-zts-20131226/redis-3.1.0 → ...ons/no-debug-non-zts-20131226/redis-2.2.7 b/...ons/no-debug-non-zts-20131226/redis-3.1.0 → ...ons/no-debug-non-zts-20131226/redis-2.2.7
@@ -2,4 +2,5 @@
 # Build Path: /app/.heroku/php/
 # Build Deps: php-5.6.30
 
+
 source $(dirname $0)/../no-debug-non-zts-20121212/redis
diff --git a/...ons/no-debug-non-zts-20151012/redis-3.1.0 → ...ons/no-debug-non-zts-20151012/redis-3.0.0 b/...ons/no-debug-non-zts-20151012/redis-3.1.0 → ...ons/no-debug-non-zts-20151012/redis-3.0.0
diff --git a/...ons/no-debug-non-zts-20160303/redis-3.1.0 → ...ons/no-debug-non-zts-20160303/redis-3.0.0 b/...ons/no-debug-non-zts-20160303/redis-3.1.0 → ...ons/no-debug-non-zts-20160303/redis-3.0.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,5 @@
		# Build Path: /app/.heroku/php/
		# Build Deps: php-5.6.30


		source $(dirname $0)/../no-debug-non-zts-20121212/redis