Merge pull request heroku#244 from heroku/develop

v125

CHANGELOG.md

@@ -1,5 +1,19 @@
 # heroku-buildpack-php CHANGELOG
 
+## v125 (2017-10-04)
+
+### ADD
+
+- PHP/7.0.24 [David Zuelke]
+- PHP/7.1.10 [David Zuelke]
+- ext-redis/3.1.4 [David Zuelke]
+- ext-mongodb/1.3.0 [David Zuelke]
+- ext-blackfire/1.18.0 [David Zuelke]
+
+### CHG
+
+- Composer/1.5.2 [David Zuelke]
+
 ## v124 (2017-09-07)
 
 ### FIX

bin/compile

@@ -97,12 +97,12 @@ fi
 mkdir -p $build_dir/.heroku/php-min
 ln -s $build_dir/.heroku/php-min /app/.heroku/php-min
 
-curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.23.tar.gz" || error "Failed to download minimal PHP for bootstrapping.
+curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.24.tar.gz" || error "Failed to download minimal PHP for bootstrapping.
 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 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.5.1.tar.gz" || error "Failed to download Composer. Please try again, or contact support if this problem persists."
+curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.5.2.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
 

support/build/composer-1.5.1 → support/build/composer-1.5.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-min-7.0.23
+# Build Deps: php-min-7.0.24
 
 source $(dirname $0)/composer

support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20131226/amqp

support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/apcu

support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23, libraries/libcassandra-2.7.0
+# Build Deps: php-7.0.24, libraries/libcassandra-2.7.0
 
 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra

support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/ev

support/build/extensions/no-debug-non-zts-20151012/event-2.3.0

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/event

support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/imagick

support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23, libraries/libmemcached-1.0.18
+# Build Deps: php-7.0.24, libraries/libmemcached-1.0.18
 
 source $(dirname $0)/../no-debug-non-zts-20121212/memcached

support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 → support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb

support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/oauth

support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon

support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23, extensions/no-debug-non-zts-20151012/raphf-2.0.0
+# Build Deps: php-7.0.24, extensions/no-debug-non-zts-20151012/raphf-2.0.0
 
 source $(dirname $0)/../no-debug-non-zts-20121212/pq

support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/raphf

support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23, libraries/librdkafka-0.11.0
+# Build Deps: php-7.0.24, libraries/librdkafka-0.11.0
 
 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka

support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 → support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.0.24
 
 source $(dirname $0)/../no-debug-non-zts-20121212/redis

support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20131226/amqp

support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20151012/apcu

support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9, libraries/libcassandra-2.7.0
+# Build Deps: php-7.1.10, libraries/libcassandra-2.7.0
 
 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra

support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/ev

support/build/extensions/no-debug-non-zts-20160303/event-2.3.0

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/event

support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/imagick

support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9, libraries/libmemcached-1.0.18
+# Build Deps: php-7.1.10, libraries/libmemcached-1.0.18
 
 source $(dirname $0)/../no-debug-non-zts-20121212/memcached

support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 → support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb

support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/oauth

support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon

support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9, extensions/no-debug-non-zts-20160303/raphf-2.0.0
+# Build Deps: php-7.1.10, extensions/no-debug-non-zts-20160303/raphf-2.0.0
 
 source $(dirname $0)/../no-debug-non-zts-20121212/pq

support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/raphf

support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.1.9, libraries/librdkafka-0.11.0
+# Build Deps: php-7.1.10, libraries/librdkafka-0.11.0
 
 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka

support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 → support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 # Build Path: /app/.heroku/php/
-# Build Deps: php-7.0.23
+# Build Deps: php-7.1.10
 
 source $(dirname $0)/../no-debug-non-zts-20121212/redis

support/build/php

@@ -56,10 +56,12 @@ if [[ "$missing" ]]; then
     apt-get install -q -y $missing
 fi
 
-# look for GMP libs in /usr/lib/x86_64-linux-gnu and not /usr/lib
-sed -i 's/$GMP_DIR\/$PHP_LIBDIR/$GMP_DIR\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure
-# symlink in gmp.h
-ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
+if dpkg --compare-versions "$dep_version" "ge" 7.0.0 && dpkg --compare-versions "$dep_version" "lt" 7.0.16 || dpkg --compare-versions "$dep_version" "ge" 7.1.0 && dpkg --compare-versions "$dep_version" "lt" 7.1.2; then
+    # look for GMP libs in /usr/lib/x86_64-linux-gnu and not /usr/lib
+    sed -i 's/$GMP_DIR\/$PHP_LIBDIR/$GMP_DIR\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure
+    # symlink in gmp.h
+    ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
+fi
 
 # look for LDAP and SASL libs in /usr/lib/x86_64-linux-gnu and not /usr/lib
 sed -i 's/LDAP_LIBDIR=$i\/$PHP_LIBDIR/LDAP_LIBDIR=$i\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure