From eb888b0659cf1929df09f209dd854bb749193183 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 Mar 2017 15:36:58 +0200 Subject: [PATCH 001/553] fix v121 release date and info --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68744f25a..5aa43b305 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # heroku-buildpack-php CHANGELOG -## v121 (2017-02-28) +## v121 (2017-03-28) ### ADD - ext-blackfire/1.15.0 [David Zuelke] - PHP/7.0.17 [David Zuelke] -- PHP/7.1.2 [David Zuelke] +- PHP/7.1.3 [David Zuelke] - ext-cassandra/1.3.0 [David Zuelke] - ext-mongodb/1.2.8 [David Zuelke] - ext-amqp/1.9.0 (for heroku-16 only) [David Zuelke] From 74828999b65c6efffb0f05a26d2a053b8381bcff Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 6 Apr 2017 23:49:39 +0200 Subject: [PATCH 002/553] ext-phalcon/3.1.2 --- CHANGELOG.md | 6 ++++++ .../{phalcon-3.1.1 => phalcon-3.1.2} | 0 .../{phalcon-3.1.1 => phalcon-3.1.2} | 0 .../{phalcon-3.1.1 => phalcon-3.1.2} | 0 .../extensions/no-debug-non-zts-20160303/phalcon-3.1.2 | 5 +++++ 5 files changed, 11 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.1.1 => phalcon-3.1.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.1.1 => phalcon-3.1.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.1.1 => phalcon-3.1.2} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aa43b305..e30060501 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v122 (2017-04-??) + +### ADD + +- ext-phalcon/3.1.2 [David Zuelke] + ## v121 (2017-03-28) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.1.1 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.1.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.1.1 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.1.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.1.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.1.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.1.1 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.1.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.1 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 new file mode 100755 index 000000000..e6d43429e --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.1.3 + +source $(dirname $0)/../no-debug-non-zts-20121212/phalcon From 11287a66dd9bd744bd34336bad658342f282f5e8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Apr 2017 21:24:01 +0200 Subject: [PATCH 003/553] Do not auto-enable ext-newrelic and ext-blackfire in Heroku CI runs --- CHANGELOG.md | 4 ++++ bin/compile | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e30060501..d63b8da33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - ext-phalcon/3.1.2 [David Zuelke] +### CHG + +- Do not auto-enable ext-newrelic and ext-blackfire in Heroku CI runs [David Zuelke] + ## v121 (2017-03-28) ### ADD diff --git a/bin/compile b/bin/compile index 17a12620d..4ed967ede 100755 --- a/bin/compile +++ b/bin/compile @@ -290,12 +290,15 @@ fi COMPOSER_bak="$COMPOSER" export COMPOSER=composer.json -status "Checking for additional extensions to install..." -# special treatment for Blackfire; we enable it if we detect a server id and a server token for it -install_blackfire_ext -# special treatment for New Relic; we enable it if we detect a license key for it -install_newrelic_ext -install_newrelic_userini +# unless we're running a CI build... +if [[ "${HEROKU_PHP_INSTALL_DEV+CI}" != "CI" ]]; then + status "Checking for additional extensions to install..." + # special treatment for Blackfire; we enable it if we detect a server id and a server token for it + install_blackfire_ext + # special treatment for New Relic; we enable it if we detect a license key for it + install_newrelic_ext + install_newrelic_userini +fi # done with platform installs; restore COMPOSER from previous value export COMPOSER="$COMPOSER_bak" From 66ecde503dd64e9aa14303b66f32d60825342fd3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Apr 2017 17:40:42 +0200 Subject: [PATCH 004/553] PHP/7.0.18 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 | 2 +- support/build/{php-7.0.17 => php-7.0.18} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.0.17 => php-7.0.18} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d63b8da33..2fdbb5473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-phalcon/3.1.2 [David Zuelke] +- PHP/7.0.18 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 index ea16dd08d..4df9a9a54 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index 70c16f9d8..47370308e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.17 +# Build Deps: php-7.0.18 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 index 7b897c6eb..30f5559e8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17, libraries/libcassandra-2.6.0 +# Build Deps: php-7.0.18, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 9ca5caaf3..070a4867b 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index d14af9bf9..6797b8c5d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index f63aa31af..9861546ca 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 index 900e3fc76..d6f08a6d8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.18, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 index 21ef14c0b..6aa5efa76 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 3fd804484..0d16a7c94 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 index a07c83c5f..88d0b8d36 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 index af8dd0d1f..22ccf9fc2 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.18, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index e3600e291..3a758e87b 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 index 308b00de3..7fbaefa5e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17, libraries/librdkafka-0.9.4 +# Build Deps: php-7.0.18, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 index 56067c287..0f4b0d624 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.17 +# Build Deps: php-7.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.17 b/support/build/php-7.0.18 similarity index 100% rename from support/build/php-7.0.17 rename to support/build/php-7.0.18 From 3f91ef11e7369bf82be2195c5058a2fe28c69d52 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Apr 2017 17:42:05 +0200 Subject: [PATCH 005/553] PHP/7.1.4 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 | 2 +- support/build/{php-7.1.3 => php-7.1.4} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.3 => php-7.1.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fdbb5473..1972983fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-phalcon/3.1.2 [David Zuelke] - PHP/7.0.18 [David Zuelke] +- PHP/7.1.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 index e19731d02..c19a0b4bc 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index 0d8bd5865..12a07c04a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 index f79dd8939..f9eff1fc8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3, libraries/libcassandra-2.6.0 +# Build Deps: php-7.1.4, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 755033757..26721d1b3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 8b92f1a0d..b8c9ab2c0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 15361b8c5..5791805b0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 index e87f97219..71d199067 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.4, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 index 60694a8f9..6affd9e2e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index cf77245f4..11e40227f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 index e6d43429e..abb43dc18 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 index a1c982c8a..bf317638f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.4, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 729da67fd..d8a3463d2 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 index 43c582752..c7948e38a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3, libraries/librdkafka-0.9.4 +# Build Deps: php-7.1.4, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 index a75b8ce30..5da4b446e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.3 +# Build Deps: php-7.1.4 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.3 b/support/build/php-7.1.4 similarity index 100% rename from support/build/php-7.1.3 rename to support/build/php-7.1.4 From 022336a0749f95d060532e625c470da255120619 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Apr 2017 01:11:44 +0200 Subject: [PATCH 006/553] ext-newrelic/7.2.0.191 --- CHANGELOG.md | 1 + .../{newrelic-7.1.0.187 => newrelic-7.2.0.191} | 0 .../{newrelic-7.1.0.187 => newrelic-7.2.0.191} | 0 .../{newrelic-7.1.0.187 => newrelic-7.2.0.191} | 0 .../{newrelic-7.1.0.187 => newrelic-7.2.0.191} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-7.1.0.187 => newrelic-7.2.0.191} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-7.1.0.187 => newrelic-7.2.0.191} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-7.1.0.187 => newrelic-7.2.0.191} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-7.1.0.187 => newrelic-7.2.0.191} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1972983fb..743125f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-phalcon/3.1.2 [David Zuelke] - PHP/7.0.18 [David Zuelke] - PHP/7.1.4 [David Zuelke] +- ext-newrelic/7.2.0.191 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.1.0.187 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.2.0.191 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-7.1.0.187 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-7.2.0.191 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.1.0.187 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.2.0.191 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-7.1.0.187 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-7.2.0.191 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.1.0.187 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.2.0.191 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-7.1.0.187 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-7.2.0.191 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.1.0.187 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.2.0.191 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-7.1.0.187 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-7.2.0.191 From f513c687b015dbd97e40d316b17dddf3b4a1032b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Apr 2017 11:08:35 +0200 Subject: [PATCH 007/553] write empty .profile.d/WEB_CONCURRENCY.sh this is to overwrite the defaults logic from a prior buildpack in a multi buildpack scenario prevents e.g. the Node.js buildpack setting defaults on boot that then influence the PHP application concurrency all buildpacks write that same file to allow this behavior also reverts commit dcf52bed8f79d7bb5b16e7ad45b1a762ad881ebd ("ignore WEB_CONCURRENCY with leading zero") --- bin/compile | 3 +++ bin/heroku-hhvm-apache2 | 3 +-- bin/heroku-hhvm-nginx | 3 +-- bin/heroku-php-apache2 | 3 +-- bin/heroku-php-nginx | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bin/compile b/bin/compile index 4ed967ede..fb2fd0995 100755 --- a/bin/compile +++ b/bin/compile @@ -286,6 +286,9 @@ if [[ ! -f "Procfile" ]]; then notice_inline "No Procfile, using 'web: heroku-$engine-apache2'." fi +# write empty WEB_CONCURRENCY.sh to overwrite the defaults logic from a prior buildpack, e.g. Node (all buildpacks use the same filename to allow this) +> $build_dir/.profile.d/WEB_CONCURRENCY.sh + # reset COMPOSER for the platform install step COMPOSER_bak="$COMPOSER" export COMPOSER=composer.json diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2 index 48a72bd10..e8dae1e60 100755 --- a/bin/heroku-hhvm-apache2 +++ b/bin/heroku-hhvm-apache2 @@ -241,8 +241,7 @@ if [[ -n ${httpd_config:-} || ( ${httpd_config:="$HEROKU_APP_DIR/$COMPOSER_VENDO fi httpd_config=$(php_passthrough "$httpd_config") -# if WEB_CONCURRENCY starts with a 0, then that's a default value which comes from another buildpack (e.g. Node), so we ignore it -if [[ -z ${WEB_CONCURRENCY:-} || "${WEB_CONCURRENCY}" == 0* ]]; then +if [[ -z ${WEB_CONCURRENCY:-} ]]; then maxprocs=$(ulimit -u) ram="512M" if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index 8d10342ce..be9a4d38f 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -241,8 +241,7 @@ if [[ -n ${nginx_config:-} || ( ${nginx_config:="$HEROKU_APP_DIR/$COMPOSER_VENDO fi nginx_config=$(php_passthrough "$nginx_config") -# if WEB_CONCURRENCY starts with a 0, then that's a default value which comes from another buildpack (e.g. Node), so we ignore it -if [[ -z ${WEB_CONCURRENCY:-} || "${WEB_CONCURRENCY}" == 0* ]]; then +if [[ -z ${WEB_CONCURRENCY:-} ]]; then maxprocs=$(ulimit -u) ram="512M" if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index 91160c2bf..c3d8de89b 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -253,8 +253,7 @@ if [[ -n ${httpd_config:-} || ( ${httpd_config:="$HEROKU_APP_DIR/$COMPOSER_VENDO fi httpd_config=$(php_passthrough "$httpd_config") -# if WEB_CONCURRENCY starts with a 0, then that's a default value which comes from another buildpack (e.g. Node), so we ignore it -if [[ -z ${WEB_CONCURRENCY:-} || "${WEB_CONCURRENCY}" == 0* ]]; then +if [[ -z ${WEB_CONCURRENCY:-} ]]; then maxprocs=$(ulimit -u) ram="512M" if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index 34aba3b29..2a432153c 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -254,8 +254,7 @@ if [[ -n ${nginx_config:-} || ( ${nginx_config:="$HEROKU_APP_DIR/$COMPOSER_VENDO fi nginx_config=$(php_passthrough "$nginx_config") -# if WEB_CONCURRENCY starts with a 0, then that's a default value which comes from another buildpack (e.g. Node), so we ignore it -if [[ -z ${WEB_CONCURRENCY:-} || "${WEB_CONCURRENCY}" == 0* ]]; then +if [[ -z ${WEB_CONCURRENCY:-} ]]; then maxprocs=$(ulimit -u) ram="512M" if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then From 855a530abbec88e0fa6da7cd866428a91bc4f5dd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 Mar 2017 15:36:49 +0200 Subject: [PATCH 008/553] ext-blackfire/1.16.2 --- CHANGELOG.md | 1 + .../{blackfire-1.15.0 => blackfire-1.16.2} | 0 .../{blackfire-1.15.0 => blackfire-1.16.2} | 0 .../{blackfire-1.15.0 => blackfire-1.16.2} | 0 .../{blackfire-1.15.0 => blackfire-1.16.2} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.15.0 => blackfire-1.16.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.15.0 => blackfire-1.16.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.15.0 => blackfire-1.16.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.15.0 => blackfire-1.16.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 743125f49..6eeeea29c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.18 [David Zuelke] - PHP/7.1.4 [David Zuelke] - ext-newrelic/7.2.0.191 [David Zuelke] +- ext-blackfire/1.16.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.15.0 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.16.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.15.0 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.16.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.15.0 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.16.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.15.0 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.16.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.15.0 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.16.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.15.0 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.16.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.15.0 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.16.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.15.0 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.16.2 From 4f0e3f48e852ad15f1ac07244a8cb4e65a6076ad Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 9 May 2017 19:17:26 +0200 Subject: [PATCH 009/553] ext-mongodb/1.2.9 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.2.8 => mongodb-1.2.9} | 0 .../no-debug-non-zts-20131226/{mongodb-1.2.8 => mongodb-1.2.9} | 0 .../no-debug-non-zts-20151012/{mongodb-1.2.8 => mongodb-1.2.9} | 0 .../no-debug-non-zts-20160303/{mongodb-1.2.8 => mongodb-1.2.9} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.2.8 => mongodb-1.2.9} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.2.8 => mongodb-1.2.9} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.2.8 => mongodb-1.2.9} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.2.8 => mongodb-1.2.9} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eeeea29c..4bc9be7cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.4 [David Zuelke] - ext-newrelic/7.2.0.191 [David Zuelke] - ext-blackfire/1.16.2 [David Zuelke] +- ext-mongodb/1.2.9 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.8 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.8 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.9 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.8 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.8 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.8 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.8 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 From 8530127f69320c0e2116a27c1b1f0fbe79e788c3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 17 May 2017 15:37:16 +0200 Subject: [PATCH 010/553] PHP/7.0.20 --- CHANGELOG.md | 2 +- bin/compile | 2 +- support/build/composer-1.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 | 2 +- support/build/{php-7.0.18 => php-7.0.20} | 0 support/build/{php-min-7.0.17 => php-min-7.0.20} | 0 19 files changed, 17 insertions(+), 17 deletions(-) rename support/build/{php-7.0.18 => php-7.0.20} (100%) rename support/build/{php-min-7.0.17 => php-min-7.0.20} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bc9be7cc..8a661803a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ ### ADD - ext-phalcon/3.1.2 [David Zuelke] -- PHP/7.0.18 [David Zuelke] - PHP/7.1.4 [David Zuelke] - ext-newrelic/7.2.0.191 [David Zuelke] - ext-blackfire/1.16.2 [David Zuelke] - ext-mongodb/1.2.9 [David Zuelke] +- PHP/7.0.20 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index fb2fd0995..9bf83dfb2 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.17.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.20.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 diff --git a/support/build/composer-1.4.1 b/support/build/composer-1.4.1 index fc0ef0d51..14bce2dd0 100755 --- a/support/build/composer-1.4.1 +++ b/support/build/composer-1.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.17 +# Build Deps: php-min-7.0.20 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 index 4df9a9a54..ea9fa3c43 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index 47370308e..3f83fed69 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.18 +# Build Deps: php-7.0.20 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 index 30f5559e8..b23807b7e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18, libraries/libcassandra-2.6.0 +# Build Deps: php-7.0.20, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 070a4867b..b20002fb1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 6797b8c5d..0efbe603a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 9861546ca..c20d212c6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 index d6f08a6d8..deb22affe 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.20, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 index 6aa5efa76..c97aa5093 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 0d16a7c94..a502722e5 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 index 88d0b8d36..c5ab2f278 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 index 22ccf9fc2..a60ce4cce 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.20, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 3a758e87b..fbef94133 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 index 7fbaefa5e..faf673f0a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18, libraries/librdkafka-0.9.4 +# Build Deps: php-7.0.20, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 index 0f4b0d624..53bbb26ae 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.18 +# Build Deps: php-7.0.20 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.18 b/support/build/php-7.0.20 similarity index 100% rename from support/build/php-7.0.18 rename to support/build/php-7.0.20 diff --git a/support/build/php-min-7.0.17 b/support/build/php-min-7.0.20 similarity index 100% rename from support/build/php-min-7.0.17 rename to support/build/php-min-7.0.20 From fdbfcd0b46b7c9bb26acdd5d12166b33e6cdfc71 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 29 May 2017 17:50:59 +0200 Subject: [PATCH 011/553] PHP/7.1.6 --- CHANGELOG.md | 2 +- support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 | 2 +- support/build/{php-7.1.4 => php-7.1.6} | 0 16 files changed, 15 insertions(+), 15 deletions(-) rename support/build/{php-7.1.4 => php-7.1.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a661803a..bd4518f9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ ### ADD - ext-phalcon/3.1.2 [David Zuelke] -- PHP/7.1.4 [David Zuelke] - ext-newrelic/7.2.0.191 [David Zuelke] - ext-blackfire/1.16.2 [David Zuelke] - ext-mongodb/1.2.9 [David Zuelke] - PHP/7.0.20 [David Zuelke] +- PHP/7.1.6 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 index c19a0b4bc..3918ed9bd 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index 12a07c04a..f4cf37b7f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 index f9eff1fc8..8d3181096 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4, libraries/libcassandra-2.6.0 +# Build Deps: php-7.1.6, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 26721d1b3..db891e6bb 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index b8c9ab2c0..fddd46730 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 5791805b0..05955906c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 index 71d199067..4cf9ca1e0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.6, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 index 6affd9e2e..3369f09ee 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 11e40227f..6326ac4e0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 index abb43dc18..7176d23b3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 index bf317638f..22af8eef4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.6, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index d8a3463d2..a3b3c5721 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 index c7948e38a..27951f597 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4, libraries/librdkafka-0.9.4 +# Build Deps: php-7.1.6, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 index 5da4b446e..67af5a401 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.4 +# Build Deps: php-7.1.6 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.4 b/support/build/php-7.1.6 similarity index 100% rename from support/build/php-7.1.4 rename to support/build/php-7.1.6 From 7f4aacbf7d6fe918c26c6fe90de0d7319a395de9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 23 May 2017 10:10:41 +0200 Subject: [PATCH 012/553] ext-blackfire/1.17.1 --- CHANGELOG.md | 2 +- .../{blackfire-1.16.2 => blackfire-1.17.1} | 0 .../{blackfire-1.16.2 => blackfire-1.17.1} | 0 .../{blackfire-1.16.2 => blackfire-1.17.1} | 0 .../{blackfire-1.16.2 => blackfire-1.17.1} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.16.2 => blackfire-1.17.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.16.2 => blackfire-1.17.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.16.2 => blackfire-1.17.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.16.2 => blackfire-1.17.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd4518f9e..2d61fd5d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,10 @@ - ext-phalcon/3.1.2 [David Zuelke] - ext-newrelic/7.2.0.191 [David Zuelke] -- ext-blackfire/1.16.2 [David Zuelke] - ext-mongodb/1.2.9 [David Zuelke] - PHP/7.0.20 [David Zuelke] - PHP/7.1.6 [David Zuelke] +- ext-blackfire/1.17.1 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.16.2 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.16.2 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.16.2 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.16.2 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.16.2 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.16.2 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.16.2 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.16.2 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.1 From b0a44a6a4712638b718f267d7edb4fa496b5f2cf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 9 Jun 2017 14:44:34 +0200 Subject: [PATCH 013/553] Composer/1.4.2 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{composer-1.4.1 => composer-1.4.2} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{composer-1.4.1 => composer-1.4.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d61fd5d5..0e10b21a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ### CHG - Do not auto-enable ext-newrelic and ext-blackfire in Heroku CI runs [David Zuelke] +- Composer/1.4.2 [David Zuelke] ## v121 (2017-03-28) diff --git a/bin/compile b/bin/compile index 9bf83dfb2..7669641e4 100755 --- 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 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.4.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.4.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 diff --git a/support/build/composer-1.4.1 b/support/build/composer-1.4.2 similarity index 100% rename from support/build/composer-1.4.1 rename to support/build/composer-1.4.2 From 9a9e5e169f97a748ca027759360f1fb9782852a9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:38:09 +0200 Subject: [PATCH 014/553] ext-amqp/1.9.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20131226/{amqp-1.9.0 => amqp-1.9.1} | 0 .../no-debug-non-zts-20151012/{amqp-1.9.0 => amqp-1.9.1} | 0 .../no-debug-non-zts-20160303/{amqp-1.9.0 => amqp-1.9.1} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20131226/{amqp-1.9.0 => amqp-1.9.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{amqp-1.9.0 => amqp-1.9.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{amqp-1.9.0 => amqp-1.9.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e10b21a9..7db6f66c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - PHP/7.0.20 [David Zuelke] - PHP/7.1.6 [David Zuelke] - ext-blackfire/1.17.1 [David Zuelke] +- ext-amqp/1.9.1 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.0 rename to support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.0 rename to support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.0 rename to support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 From b19a16e5ecc1904f7d1fb2644e9e816224a8d41f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:39:35 +0200 Subject: [PATCH 015/553] ext-blackfire/1.17.3 --- CHANGELOG.md | 2 +- .../{blackfire-1.17.1 => blackfire-1.17.3} | 0 .../{blackfire-1.17.1 => blackfire-1.17.3} | 0 .../{blackfire-1.17.1 => blackfire-1.17.3} | 0 .../{blackfire-1.17.1 => blackfire-1.17.3} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.17.1 => blackfire-1.17.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.17.1 => blackfire-1.17.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.17.1 => blackfire-1.17.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.17.1 => blackfire-1.17.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7db6f66c8..e4daf65d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,8 @@ - ext-mongodb/1.2.9 [David Zuelke] - PHP/7.0.20 [David Zuelke] - PHP/7.1.6 [David Zuelke] -- ext-blackfire/1.17.1 [David Zuelke] - ext-amqp/1.9.1 [David Zuelke] +- ext-blackfire/1.17.3 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.1 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.1 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.1 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.1 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.1 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.1 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.1 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.1 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.3 From 31efeaaa385e7c32d37cacdfba3ba3a3399b82fe Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:41:50 +0200 Subject: [PATCH 016/553] ext-newrelic/7.4.0.198 --- CHANGELOG.md | 2 +- .../{newrelic-7.2.0.191 => newrelic-7.4.0.198} | 0 .../{newrelic-7.2.0.191 => newrelic-7.4.0.198} | 0 .../{newrelic-7.2.0.191 => newrelic-7.4.0.198} | 0 .../{newrelic-7.2.0.191 => newrelic-7.4.0.198} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-7.2.0.191 => newrelic-7.4.0.198} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-7.2.0.191 => newrelic-7.4.0.198} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-7.2.0.191 => newrelic-7.4.0.198} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-7.2.0.191 => newrelic-7.4.0.198} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4daf65d0..66f4155ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,12 @@ ### ADD - ext-phalcon/3.1.2 [David Zuelke] -- ext-newrelic/7.2.0.191 [David Zuelke] - ext-mongodb/1.2.9 [David Zuelke] - PHP/7.0.20 [David Zuelke] - PHP/7.1.6 [David Zuelke] - ext-amqp/1.9.1 [David Zuelke] - ext-blackfire/1.17.3 [David Zuelke] +- ext-newrelic/7.4.0.198 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.2.0.191 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.4.0.198 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-7.2.0.191 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-7.4.0.198 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.2.0.191 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.4.0.198 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-7.2.0.191 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-7.4.0.198 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.2.0.191 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.4.0.198 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-7.2.0.191 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-7.4.0.198 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.2.0.191 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.4.0.198 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-7.2.0.191 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-7.4.0.198 From 8c9969f7e9b8cd89b8d5444852461ef263eb3fcf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:43:48 +0200 Subject: [PATCH 017/553] ext-phalcon/3.2.1 --- CHANGELOG.md | 2 +- .../no-debug-non-zts-20121212/{phalcon-3.1.2 => phalcon-3.2.1} | 0 .../no-debug-non-zts-20131226/{phalcon-3.1.2 => phalcon-3.2.1} | 0 .../no-debug-non-zts-20151012/{phalcon-3.1.2 => phalcon-3.2.1} | 0 .../no-debug-non-zts-20160303/{phalcon-3.1.2 => phalcon-3.2.1} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.1.2 => phalcon-3.2.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.1.2 => phalcon-3.2.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.1.2 => phalcon-3.2.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.1.2 => phalcon-3.2.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66f4155ca..a4e9e922f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,13 @@ ### ADD -- ext-phalcon/3.1.2 [David Zuelke] - ext-mongodb/1.2.9 [David Zuelke] - PHP/7.0.20 [David Zuelke] - PHP/7.1.6 [David Zuelke] - ext-amqp/1.9.1 [David Zuelke] - ext-blackfire/1.17.3 [David Zuelke] - ext-newrelic/7.4.0.198 [David Zuelke] +- ext-phalcon/3.2.1 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.1.2 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.1.2 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.1.2 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.1.2 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 From 2fd61923273ce60950ebc39dde637fb477c8762e Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:45:27 +0200 Subject: [PATCH 018/553] ext-pq/2.1.2 --- CHANGELOG.md | 1 + .../extensions/no-debug-non-zts-20151012/{pq-2.1.1 => pq-2.1.2} | 0 .../extensions/no-debug-non-zts-20160303/{pq-2.1.1 => pq-2.1.2} | 0 3 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{pq-2.1.1 => pq-2.1.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{pq-2.1.1 => pq-2.1.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e9e922f..86c221cbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - ext-blackfire/1.17.3 [David Zuelke] - ext-newrelic/7.4.0.198 [David Zuelke] - ext-phalcon/3.2.1 [David Zuelke] +- ext-pq/2.1.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/pq-2.1.1 rename to support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/pq-2.1.1 rename to support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 From 5fdce6ae47beb435b878e6c5d1b04384caad3c4b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:46:44 +0200 Subject: [PATCH 019/553] ext-redis/3.1.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{redis-3.1.2 => redis-3.1.3} | 0 .../no-debug-non-zts-20131226/{redis-3.1.2 => redis-3.1.3} | 0 .../no-debug-non-zts-20151012/{redis-3.1.2 => redis-3.1.3} | 0 .../no-debug-non-zts-20160303/{redis-3.1.2 => redis-3.1.3} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-3.1.2 => redis-3.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-3.1.2 => redis-3.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-3.1.2 => redis-3.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-3.1.2 => redis-3.1.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86c221cbd..17e5635be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - ext-newrelic/7.4.0.198 [David Zuelke] - ext-phalcon/3.2.1 [David Zuelke] - ext-pq/2.1.2 [David Zuelke] +- ext-redis/3.1.3 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-3.1.2 rename to support/build/extensions/no-debug-non-zts-20121212/redis-3.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-3.1.2 rename to support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-3.1.2 rename to support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-3.1.2 rename to support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 From 6035c8bc29e1f817e8274d1658d718c1a31d6705 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 10:50:12 +0200 Subject: [PATCH 020/553] ext-rdkafka/3.0.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{rdkafka-3.0.1 => rdkafka-3.0.3} | 0 .../no-debug-non-zts-20131226/{rdkafka-3.0.1 => rdkafka-3.0.3} | 0 .../no-debug-non-zts-20151012/{rdkafka-3.0.1 => rdkafka-3.0.3} | 0 .../no-debug-non-zts-20160303/{rdkafka-3.0.1 => rdkafka-3.0.3} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{rdkafka-3.0.1 => rdkafka-3.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{rdkafka-3.0.1 => rdkafka-3.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{rdkafka-3.0.1 => rdkafka-3.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{rdkafka-3.0.1 => rdkafka-3.0.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17e5635be..068da3a27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - ext-phalcon/3.2.1 [David Zuelke] - ext-pq/2.1.2 [David Zuelke] - ext-redis/3.1.3 [David Zuelke] +- ext-rdkafka/3.0.3 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.1 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.1 rename to support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.1 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.1 rename to support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.1 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.1 rename to support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.1 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.1 rename to support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 From 44ed2000e39af3283c9a4491b4166070bbe032b4 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 11:03:09 +0200 Subject: [PATCH 021/553] Do not error if buildpack package is installed during Heroku CI runs For CI, we install dev packages, and users may have the buildpack as a dev dependency --- CHANGELOG.md | 1 + bin/compile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 068da3a27..4b9f38f9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Do not auto-enable ext-newrelic and ext-blackfire in Heroku CI runs [David Zuelke] - Composer/1.4.2 [David Zuelke] +- Do not error if buildpack package is installed during Heroku CI runs [David Zuelke] ## v121 (2017-03-28) diff --git a/bin/compile b/bin/compile index 7669641e4..2c4a53f9f 100755 --- a/bin/compile +++ b/bin/compile @@ -252,8 +252,11 @@ unset COMPOSER_GITHUB_OAUTH_TOKEN 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 2>&1 | indent -composer show --installed heroku/heroku-buildpack-php &> /dev/null && error "Your '$COMPOSER' requires 'heroku/heroku-buildpack-php'. +# only perform the check for buildpack package if we're not running in Heroku CI +if [[ -z "${HEROKU_PHP_INSTALL_DEV+are-we-running-in-ci}" ]]; then + 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'!" +fi if cat "$COMPOSER" | python -c 'import sys,json; sys.exit("compile" not in json.load(sys.stdin).get("scripts", {}));'; then status "Running 'composer compile'..." From a789ee88e073553bfa95461abbcdc85e9a29db3a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 11:06:49 +0200 Subject: [PATCH 022/553] PHP/7.0.22 --- CHANGELOG.md | 2 +- bin/compile | 2 +- support/build/composer-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 | 2 +- support/build/{php-7.0.20 => php-7.0.22} | 0 support/build/{php-min-7.0.20 => php-min-7.0.22} | 0 19 files changed, 17 insertions(+), 17 deletions(-) rename support/build/{php-7.0.20 => php-7.0.22} (100%) rename support/build/{php-min-7.0.20 => php-min-7.0.22} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b9f38f9f..ba268944e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ ### ADD - ext-mongodb/1.2.9 [David Zuelke] -- PHP/7.0.20 [David Zuelke] - PHP/7.1.6 [David Zuelke] - ext-amqp/1.9.1 [David Zuelke] - ext-blackfire/1.17.3 [David Zuelke] @@ -14,6 +13,7 @@ - ext-pq/2.1.2 [David Zuelke] - ext-redis/3.1.3 [David Zuelke] - ext-rdkafka/3.0.3 [David Zuelke] +- PHP/7.0.22 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index 2c4a53f9f..950ace247 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.20.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.22.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 diff --git a/support/build/composer-1.4.2 b/support/build/composer-1.4.2 index 14bce2dd0..56568c6e1 100755 --- a/support/build/composer-1.4.2 +++ b/support/build/composer-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.20 +# Build Deps: php-min-7.0.22 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 index ea9fa3c43..eabd211f3 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index 3f83fed69..b999ba063 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 index b23807b7e..f5164da28 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.20, libraries/libcassandra-2.6.0 +# Build Deps: php-7.0.22, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index b20002fb1..54f0b5278 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 0efbe603a..c5b53e55c 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index c20d212c6..9ca410d58 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 index deb22affe..c67ee8bad 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.20, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.22, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 index c97aa5093..56027d64b 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index a502722e5..5eaf1de51 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 index c5ab2f278..1ab83fcc1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 index a60ce4cce..51d896174 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 +++ b/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.20, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.22, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index fbef94133..ad92fd09a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 index faf673f0a..9c0e646da 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.20, libraries/librdkafka-0.9.4 +# Build Deps: php-7.0.22, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 index 53bbb26ae..63d92df0d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.20 +# Build Deps: php-7.0.22 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.20 b/support/build/php-7.0.22 similarity index 100% rename from support/build/php-7.0.20 rename to support/build/php-7.0.22 diff --git a/support/build/php-min-7.0.20 b/support/build/php-min-7.0.22 similarity index 100% rename from support/build/php-min-7.0.20 rename to support/build/php-min-7.0.22 From d874f603ee93b89b9e06b3bbdac65ac7d78342b3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 11:07:30 +0200 Subject: [PATCH 023/553] PHP/7.1.8 --- CHANGELOG.md | 2 +- support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 | 2 +- support/build/{php-7.1.6 => php-7.1.8} | 0 16 files changed, 15 insertions(+), 15 deletions(-) rename support/build/{php-7.1.6 => php-7.1.8} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba268944e..805c6bdfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ ### ADD - ext-mongodb/1.2.9 [David Zuelke] -- PHP/7.1.6 [David Zuelke] - ext-amqp/1.9.1 [David Zuelke] - ext-blackfire/1.17.3 [David Zuelke] - ext-newrelic/7.4.0.198 [David Zuelke] @@ -14,6 +13,7 @@ - ext-redis/3.1.3 [David Zuelke] - ext-rdkafka/3.0.3 [David Zuelke] - PHP/7.0.22 [David Zuelke] +- PHP/7.1.8 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 index 3918ed9bd..02059f023 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index f4cf37b7f..efe8a0cba 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 index 8d3181096..ff41ce426 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.6, libraries/libcassandra-2.6.0 +# Build Deps: php-7.1.8, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index db891e6bb..82ad5d530 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index fddd46730..1b1c0aa2f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 05955906c..8c63c9689 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 index 4cf9ca1e0..184cd258a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.6, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.8, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 index 3369f09ee..da96dd4fc 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 6326ac4e0..a6665d343 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 index 7176d23b3..51ad78b23 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 index 22af8eef4..0e388b080 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 +++ b/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.6, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.8, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index a3b3c5721..8b9ebcac4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 index 27951f597..9f18fe30e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.6, libraries/librdkafka-0.9.4 +# Build Deps: php-7.1.8, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 index 67af5a401..d02ed72a3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.6 +# Build Deps: php-7.1.8 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.6 b/support/build/php-7.1.8 similarity index 100% rename from support/build/php-7.1.6 rename to support/build/php-7.1.8 From 200ade705f882cd6c590aaae12559b3130c39d7b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 11:08:15 +0200 Subject: [PATCH 024/553] PHP/5.6.31 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 3 +-- .../extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 3 +-- support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 3 +-- .../build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 3 +-- .../extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 | 3 +-- .../build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 | 3 +-- support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 3 +-- .../build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 3 +-- .../build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 | 3 +-- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 3 +-- .../extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 | 3 +-- support/build/{php-5.6.30 => php-5.6.31} | 0 18 files changed, 17 insertions(+), 27 deletions(-) rename support/build/{php-5.6.30 => php-5.6.31} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 805c6bdfa..53c14802e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - ext-rdkafka/3.0.3 [David Zuelke] - PHP/7.0.22 [David Zuelke] - PHP/7.1.8 [David Zuelke] +- PHP/5.6.31 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 index 9e3989ece..e9857701e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 +# Build Deps: php-5.6.31 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index e3fac52ac..2f087ec21 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 index 3747f09b2..5b5d63d64 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30, libraries/libcassandra-2.6.0 +# Build Deps: php-5.6.31, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 3653cdb86..6d1fd96a9 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index ee81f434e..3e1b26a97 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index a8a1d7f29..36a655ac4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 index fe23aa58d..362b2bf3c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.31, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 index 9428b643f..e363b0792 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 index 59b93dcdd..b18223ea1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 86fa52e3f..e7d9a01de 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index f48e52ae9..5d3c9808a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 index f48e52ae9..5d3c9808a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 0dabfb286..894b40b05 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.31, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index eaf3933cc..f3f39452d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 index 2d82ce255..96a946168 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30, libraries/librdkafka-0.9.4 +# Build Deps: php-5.6.31, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 index 500aa0e61..f2ab2e227 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.30 - +# Build Deps: php-5.6.31 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.30 b/support/build/php-5.6.31 similarity index 100% rename from support/build/php-5.6.30 rename to support/build/php-5.6.31 From 2688b2478e0f3494671f11dec70be69725fdb221 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 3 Aug 2017 17:08:54 +0200 Subject: [PATCH 025/553] v122 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53c14802e..48e5be90d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v122 (2017-04-??) +## v122 (2017-08-03) ### ADD From bed0b902aaa76859c63bedcba805064660198499 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Sep 2017 18:34:53 +0200 Subject: [PATCH 026/553] support for heroku-sys-library package type in platform installer --- CHANGELOG.md | 6 ++++++ support/build/_util/include/manifest.py | 3 +++ support/installer/composer.json | 2 +- support/installer/src/ComposerInstaller.php | 3 ++- support/installer/src/ComposerInstallerPlugin.php | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48e5be90d..55767cebd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v123 (2017-09-??) + +### CHG + +- Support "heroku-sys-library" package type in platform installer [David Zuelke] + ## v122 (2017-08-03) ### ADD diff --git a/support/build/_util/include/manifest.py b/support/build/_util/include/manifest.py index c2a177080..dc3543904 100644 --- a/support/build/_util/include/manifest.py +++ b/support/build/_util/include/manifest.py @@ -3,7 +3,10 @@ require = json.loads(sys.argv[5]) if len(sys.argv) > 5 else {} stack=re.match("^([^-]+)(?:-([0-9]+))?$", os.getenv("STACK", "cedar-14")) require["heroku-sys/"+stack.group(1)] = "^{}.0.0".format(stack.group(2) or "1") + require["heroku/installer-plugin"] = "^1.2.0" +if sys.argv[1] == 'heroku-sys-library': + require["heroku/installer-plugin"] = "^1.3.0" manifest = { "type": sys.argv[1], diff --git a/support/installer/composer.json b/support/installer/composer.json index 6dbe08989..646713608 100644 --- a/support/installer/composer.json +++ b/support/installer/composer.json @@ -1,7 +1,7 @@ { "type": "composer-plugin", "name": "heroku/installer-plugin", - "version": "1.2.1", + "version": "1.3.0", "autoload": { "psr-4": { "Heroku\\Buildpack\\PHP\\": "src/" diff --git a/support/installer/src/ComposerInstaller.php b/support/installer/src/ComposerInstaller.php index 2facf84c4..e668abf13 100644 --- a/support/installer/src/ComposerInstaller.php +++ b/support/installer/src/ComposerInstaller.php @@ -18,9 +18,10 @@ public function getInstallPath(PackageInterface $package) public function supports($packageType) { return in_array($packageType, [ + 'heroku-sys-hhvm', + 'heroku-sys-library', 'heroku-sys-php', 'heroku-sys-php-extension', - 'heroku-sys-hhvm', 'heroku-sys-webserver', ]); } diff --git a/support/installer/src/ComposerInstallerPlugin.php b/support/installer/src/ComposerInstallerPlugin.php index bdde82ec1..c94faeba7 100644 --- a/support/installer/src/ComposerInstallerPlugin.php +++ b/support/installer/src/ComposerInstallerPlugin.php @@ -57,7 +57,7 @@ public static function getSubscribedEvents() public function onPostPackageInstall(PackageEvent $event) { - if(!in_array($event->getOperation()->getPackage()->getType(), ['heroku-sys-php', 'heroku-sys-hhvm', 'heroku-sys-php-extension', 'heroku-sys-hhvm-extension', 'heroku-sys-webserver'])) return; + if(!in_array($event->getOperation()->getPackage()->getType(), ['heroku-sys-php', 'heroku-sys-hhvm', 'heroku-sys-php-extension', 'heroku-sys-hhvm-extension', 'heroku-sys-webserver', 'heroku-sys-library'])) return; $this->initAllPlatformRequirements($event->getOperations()); From 1f6e0c24cde6aea55901306b3cdac507b894d996 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Sep 2017 18:40:17 +0200 Subject: [PATCH 027/553] support 'provide' in platform manifests --- CHANGELOG.md | 1 + support/build/_util/include/manifest.py | 3 ++- support/build/apache | 5 +++-- support/build/extensions/no-debug-non-zts-20121212/blackfire | 5 +++-- support/build/extensions/no-debug-non-zts-20121212/cassandra | 4 +--- .../extensions/no-debug-non-zts-20121212/cassandra-bare | 5 +++-- support/build/extensions/no-debug-non-zts-20121212/memcached | 5 +++-- .../extensions/no-debug-non-zts-20121212/memcached-bare | 5 +++-- support/build/extensions/no-debug-non-zts-20121212/newrelic | 5 +++-- support/build/extensions/no-debug-non-zts-20121212/phalcon | 4 +--- support/build/extensions/no-debug-non-zts-20121212/rdkafka | 4 +--- .../build/extensions/no-debug-non-zts-20121212/rdkafka-bare | 4 +--- support/build/extensions/no-debug-non-zts-20151012/apcu | 5 +++-- support/build/extensions/pecl | 5 +++-- support/build/hhvm | 5 +++-- support/build/nginx | 5 +++-- support/build/php | 5 +++-- 17 files changed, 40 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55767cebd..16e75389e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### CHG - Support "heroku-sys-library" package type in platform installer [David Zuelke] +- Add new argument for "provide" platform package manifest entry to `manifest.py` [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/_util/include/manifest.py b/support/build/_util/include/manifest.py index dc3543904..c44922583 100644 --- a/support/build/_util/include/manifest.py +++ b/support/build/_util/include/manifest.py @@ -19,7 +19,8 @@ "require": require, "conflict": json.loads(sys.argv[6]) if len(sys.argv) > 6 else {}, "replace": json.loads(sys.argv[7]) if len(sys.argv) > 7 else {}, - "extra": json.loads(sys.argv[8]) if len(sys.argv) > 8 else {}, + "provide": json.loads(sys.argv[8]) if len(sys.argv) > 8 else {}, + "extra": json.loads(sys.argv[9]) if len(sys.argv) > 9 else {}, "time": datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") } diff --git a/support/build/apache b/support/build/apache index 251036e1d..ee1c0fa89 100755 --- a/support/build/apache +++ b/support/build/apache @@ -51,8 +51,9 @@ rm -rf ${OUT_PREFIX}/man ${OUT_PREFIX}/share/apache2/manual MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.apache2.sh\",\"profile\":\"bin/profile.apache2.sh\"}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.apache2.sh\",\"profile\":\"bin/profile.apache2.sh\"}"}" mkdir -p ${OUT_PREFIX}/etc/apache2 cp $(dirname $BASH_SOURCE)/_conf/apache2/httpd.conf ${OUT_PREFIX}/etc/apache2/httpd.conf @@ -67,6 +68,6 @@ cat > ${OUT_PREFIX}/bin/profile.apache2.sh <<'EOF' export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" EOF -python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-webserver" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-webserver" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire b/support/build/extensions/no-debug-non-zts-20121212/blackfire index 53ddcbf8c..bbb3e6acc 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/blackfire +++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire @@ -114,10 +114,11 @@ EOF MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/blackfire.ini-dist\",\"profile\":\"bin/profile.blackfire.sh\"}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/blackfire.ini-dist\",\"profile\":\"bin/profile.blackfire.sh\"}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra b/support/build/extensions/no-debug-non-zts-20121212/cassandra index 62e45d069..c549a11c7 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra @@ -37,9 +37,7 @@ echo "-----> Merging dependencies..." MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare b/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare index d7da45f7b..6e8b0e837 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare @@ -47,9 +47,10 @@ popd MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-package" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-package" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached b/support/build/extensions/no-debug-non-zts-20121212/memcached index 630b42b72..ce14272df 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached @@ -43,9 +43,10 @@ EOF MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/memcached.ini-dist\"}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/memcached.ini-dist\"}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare index 56034f85a..85f048a5b 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare @@ -76,9 +76,10 @@ popd MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 2038d0219..caf012516 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -104,9 +104,10 @@ EOF MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/newrelic.ini-dist\",\"profile\":\"bin/profile.newrelic.sh\"}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/newrelic.ini-dist\",\"profile\":\"bin/profile.newrelic.sh\"}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon b/support/build/extensions/no-debug-non-zts-20121212/phalcon index 417493d62..c46847344 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon @@ -55,9 +55,7 @@ popd MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka b/support/build/extensions/no-debug-non-zts-20121212/rdkafka index 62e45d069..c549a11c7 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka @@ -37,9 +37,7 @@ echo "-----> Merging dependencies..." MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare index 64320f3cb..3b0ff88e2 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare @@ -39,9 +39,7 @@ popd MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-package" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-package" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu b/support/build/extensions/no-debug-non-zts-20151012/apcu index 87d8ace72..3bec956a8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu @@ -70,9 +70,10 @@ EOF MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/apcu-apc.ini-dist\"}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{\"heroku-sys/ext-apc\":\"self.version\"}"}" # despite version 1.0.3 or whatever, apcu_bc identifies itself using the apcu version number +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/apcu-apc.ini-dist\"}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/pecl b/support/build/extensions/pecl index e1365a226..30f3d6dfe 100755 --- a/support/build/extensions/pecl +++ b/support/build/extensions/pecl @@ -38,9 +38,10 @@ popd MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" -python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/hhvm b/support/build/hhvm index 55e067514..bd74455d4 100755 --- a/support/build/hhvm +++ b/support/build/hhvm @@ -74,8 +74,9 @@ curl -sS https://getcomposer.org/installer | hhvm --php MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/php\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.hhvm.sh\",\"profile\":\"bin/profile.hhvm.sh\"}"}" MANIFEST_REPLACE=$(hhvm --php composer.phar show --platform | grep -E '^(ext-\S+|php-64bit\b|php\b)' | tr -s " " | cut -d " " -f1,2 | sed -e "s/ $dep_version\$/ self.version/" -e 's/^/heroku-sys\//' | python -c 'import sys, json; json.dump(dict(item.split() for item in sys.stdin), sys.stdout)') +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.hhvm.sh\",\"profile\":\"bin/profile.hhvm.sh\"}"}" # remove temporary composer download rm composer.phar @@ -95,6 +96,6 @@ composer() { hhvm $(which composer) "$@"; } export -f composer EOF -python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-hhvm" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-hhvm" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/nginx b/support/build/nginx index 0e152c327..35051d7e4 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -49,8 +49,9 @@ mkdir -p ${VAR}/run/nginx MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.nginx.sh\",\"profile\":\"bin/profile.nginx.sh\"}"}" MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.nginx.sh\",\"profile\":\"bin/profile.nginx.sh\"}"}" mkdir -p ${OUT_PREFIX}/etc/nginx cp $(dirname $BASH_SOURCE)/_conf/nginx/nginx.conf ${OUT_PREFIX}/etc/nginx/nginx.conf @@ -65,6 +66,6 @@ cat > ${OUT_PREFIX}/bin/profile.nginx.sh <<'EOF' export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" EOF -python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-webserver" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-webserver" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/php b/support/build/php index 5cbd4ea1b..2205fa3d4 100755 --- a/support/build/php +++ b/support/build/php @@ -175,8 +175,9 @@ extra=$(echo "${shared[@]}" | python -c 'import sys, json; json.dump({"shared": MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{}"}" MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"$extra"}" MANIFEST_REPLACE=$(php composer.phar show --platform | grep -E '^(ext-\S+|php-64bit\b|hhvm\b)' | tr -s " " | cut -d " " -f1,2 | sed -e "s/ $dep_version\$/ self.version/" -e 's/^/heroku-sys\//' | python -c 'import sys, json; json.dump(dict(item.split() for item in sys.stdin), sys.stdout)') +MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"$extra"}" # remove temporary ini file that enables all extensions, and the composer download rm ${OUT_PREFIX}/etc/php/php.ini composer.phar @@ -194,6 +195,6 @@ cat > ${OUT_PREFIX}/bin/profile.php.sh <<'EOF' export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" EOF -python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-php" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_EXTRA" > $dep_manifest +python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-php" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" From 95c3632a78c552e2f13b85bbb138e9c994d7543a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Sep 2017 19:25:35 +0200 Subject: [PATCH 028/553] soname_version helper --- support/build/_util/include/manifest.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/support/build/_util/include/manifest.sh b/support/build/_util/include/manifest.sh index a7f1ddc42..b2d56c604 100755 --- a/support/build/_util/include/manifest.sh +++ b/support/build/_util/include/manifest.sh @@ -11,3 +11,9 @@ print_or_export_manifest_cmd() { generate_manifest_cmd() { echo "s3cmd --ssl${AWS_ACCESS_KEY_ID+" --access_key=\$AWS_ACCESS_KEY_ID"}${AWS_SECRET_ACCESS_KEY+" --secret_key=\$AWS_SECRET_ACCESS_KEY"} --acl-public -m application/json put $(pwd)/${1} s3://${S3_BUCKET}/${S3_PREFIX}${1}" } + +soname_version() { + soname=$(objdump -p $1 | grep SONAME | awk '{ printf $2; }') + file=$(basename $1) + echo "${soname#${file}.}" +} \ No newline at end of file From 9b2b11204b91edef34b811653a51841cf838271d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Sep 2017 19:33:34 +0200 Subject: [PATCH 029/553] Move libcassandra to its own package, installed as a dependency by platform installer --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/cassandra | 47 ++++++---------- .../no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../no-debug-non-zts-20121212/cassandra-bare | 56 ------------------- .../cassandra-bare-1.2.2 | 5 -- .../no-debug-non-zts-20131226/cassandra-1.3.0 | 4 +- .../cassandra-bare-1.3.0 | 5 -- .../no-debug-non-zts-20151012/cassandra-1.3.0 | 4 +- .../cassandra-bare-1.3.0 | 5 -- .../no-debug-non-zts-20160303/cassandra-1.3.0 | 4 +- .../cassandra-bare-1.3.0 | 5 -- support/build/libraries/libcassandra | 9 ++- 12 files changed, 28 insertions(+), 119 deletions(-) delete mode 100755 support/build/extensions/no-debug-non-zts-20121212/cassandra-bare delete mode 100755 support/build/extensions/no-debug-non-zts-20121212/cassandra-bare-1.2.2 delete mode 100755 support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 delete mode 100755 support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 delete mode 100755 support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 16e75389e..da929128e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Support "heroku-sys-library" package type in platform installer [David Zuelke] - Add new argument for "provide" platform package manifest entry to `manifest.py` [David Zuelke] +- Move libcassandra to its own package, installed as a dependency by platform installer [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra b/support/build/extensions/no-debug-non-zts-20121212/cassandra index c549a11c7..3cf530401 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra @@ -1,43 +1,28 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# fail hard -set -o pipefail -# fail harder -set -eu +# we need libgmp-dev +needed=( libgmp-dev ) +missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) +if [[ "$missing" ]]; then + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing +fi -source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh +dep_name=$(basename $BASH_SOURCE) OUT_PREFIX=$1 +export PATH=${OUT_PREFIX}/bin:${PATH} -ZEND_MODULE_API_VERSION=$(basename $(dirname $0)) -ZEND_MODULE_API_VERSION=${ZEND_MODULE_API_VERSION#no-debug-non-zts-} - +# we need to declare the required version of libcassandra dep_formula=${0#$WORKSPACE_DIR/} -dep_name=$(basename $BASH_SOURCE) dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=ext-${dep_name}-${dep_version} -case ${ZEND_MODULE_API_VERSION} in - 20121212) - series=5.5 - ;; - 20131226) - series=5.6 - ;; - 20151012) - series=7.0 - ;; - 20160303) - series=7.1 +series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest +case "$dep_version" in + *) + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/libcassandra\":\"^2.6.0\",\"heroku-sys/libcassandra-abi\":\"^2\"}"}" ;; esac -dep_manifest=${dep_package}_php-$series.composer.json - -echo "-----> Merging dependencies..." - -MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" -MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest +CONFIGURE_EXTRA="--with-cassandra=${OUT_PREFIX}" -print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" +source $(dirname $BASH_SOURCE)/../pecl diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index 00dd34a2a..3d4d17251 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20121212/cassandra-bare-1.2.2, libraries/libcassandra-2.6.0 +# Build Deps: php-5.5.38, libraries/libcassandra-2.6.0 source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare b/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare deleted file mode 100755 index 6e8b0e837..000000000 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash - -# fail hard -set -o pipefail -# fail harder -set -eu - -source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh - -OUT_PREFIX=$1 - -export PATH=${OUT_PREFIX}/bin:${PATH} - -dep_formula=${0#$WORKSPACE_DIR/} -dep_name=$(basename $BASH_SOURCE) -dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=pkg-ext-${dep_name}-${dep_version} -dep_dirname=cassandra-${dep_version} -dep_archive_name=${dep_dirname}.tgz -dep_url=https://pecl.php.net/get/${dep_archive_name} -series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest -dep_manifest=${dep_package}_php-$series.composer.json - -echo "-----> Building ${dep_package} (from PECL)..." - -# we need libgmp-dev -needed=( libgmp-dev ) -missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) -if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing -fi - -curl -L ${dep_url} | tar xz - -pushd ${dep_dirname} -phpize -./configure \ - --prefix=${OUT_PREFIX} \ - --with-cassandra=${OUT_PREFIX} -make -s -j 9 -# php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension -rm -rf ${OUT_PREFIX}/* -make install -s -strip --strip-unneeded ${OUT_PREFIX}/lib/php/extensions/*/*.so -popd - -MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" -MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" - -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-package" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest - -print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare-1.2.2 deleted file mode 100755 index 49648fbbd..000000000 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-bare-1.2.2 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.6.0 - -source $(dirname $0)/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 index fede5b772..0b539c71b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0, libraries/libcassandra-2.6.0 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-5.6.31, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 deleted file mode 100755 index 5b5d63d64..000000000 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-bare-1.3.0 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/libcassandra-2.6.0 - -source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 index be063f15b..e8332d470 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0, libraries/libcassandra-2.6.0 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-7.0.22, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 deleted file mode 100755 index f5164da28..000000000 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-bare-1.3.0 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22, libraries/libcassandra-2.6.0 - -source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 index ad0952c46..37e16681a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0, libraries/libcassandra-2.6.0 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-7.1.8, libraries/libcassandra-2.6.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 deleted file mode 100755 index ff41ce426..000000000 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-bare-1.3.0 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8, libraries/libcassandra-2.6.0 - -source $(dirname $0)/../no-debug-non-zts-20121212/cassandra-bare diff --git a/support/build/libraries/libcassandra b/support/build/libraries/libcassandra index 93744edc4..7f6b993b5 100755 --- a/support/build/libraries/libcassandra +++ b/support/build/libraries/libcassandra @@ -13,7 +13,7 @@ OUT_PREFIX=$1 dep_formula=${0#$WORKSPACE_DIR/} dep_name=$(basename $BASH_SOURCE) dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=pkg-${dep_name}-${dep_version} +dep_package=${dep_name}-${dep_version} dep_dirname=cpp-driver-${dep_version} dep_archive_name=${dep_version}.tar.gz dep_url=https://github.com/datastax/cpp-driver/archive/${dep_version}.tar.gz @@ -38,6 +38,11 @@ rm ${OUT_PREFIX}/lib/libcassandra_static.a strip --strip-unneeded ${OUT_PREFIX}/lib/libcassandra*.so* popd -python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" > $dep_manifest +ABI_VERSION=$(soname_version ${OUT_PREFIX}/lib/libcassandra.so) +echo +echo "ABI version is: ${ABI_VERSION}" +echo + +python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-library" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "{}" "{}" "{}" "{\"heroku-sys/libcassandra-abi\":\"${ABI_VERSION}\"}" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" From 3d99725ce3c0f34ba1f0cb30f17e660375dfc489 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Sep 2017 19:38:08 +0200 Subject: [PATCH 030/553] Move libmemcached to its own package, installed as a dependency by platform installer (if the platform doesn't already provide it) --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/memcached | 96 +++++++++++-------- .../no-debug-non-zts-20121212/memcached-2.2.0 | 4 +- .../no-debug-non-zts-20121212/memcached-bare | 85 ---------------- .../memcached-bare-2.2.0 | 5 - .../no-debug-non-zts-20131226/memcached-2.2.0 | 4 +- .../memcached-bare-2.2.0 | 5 - .../no-debug-non-zts-20151012/memcached-3.0.3 | 4 +- .../memcached-bare-3.0.3 | 5 - .../no-debug-non-zts-20160303/memcached-3.0.3 | 4 +- .../memcached-bare-3.0.3 | 5 - support/build/libraries/libmemcached | 14 ++- 12 files changed, 73 insertions(+), 159 deletions(-) delete mode 100755 support/build/extensions/no-debug-non-zts-20121212/memcached-bare delete mode 100755 support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0 delete mode 100755 support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 delete mode 100755 support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 delete mode 100755 support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index da929128e..d08d17585 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Support "heroku-sys-library" package type in platform installer [David Zuelke] - Add new argument for "provide" platform package manifest entry to `manifest.py` [David Zuelke] - Move libcassandra to its own package, installed as a dependency by platform installer [David Zuelke] +- Move libmemcached to its own package, installed as a dependency by platform installer (if the platform doesn't already provide it) [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached b/support/build/extensions/no-debug-non-zts-20121212/memcached index ce14272df..3cc57272b 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached @@ -1,52 +1,68 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# fail hard -set -o pipefail -# fail harder -set -eu - -source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh +dep_name=$(basename $BASH_SOURCE) OUT_PREFIX=$1 +export PATH=${OUT_PREFIX}/bin:${PATH} -ZEND_MODULE_API_VERSION=$(basename $(dirname $0)) -ZEND_MODULE_API_VERSION=${ZEND_MODULE_API_VERSION#no-debug-non-zts-} +# can't build without this +needed=( libsasl2-2 ) +missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) +if [[ "$missing" ]]; then + echo "Error! Missing libraries: $missing" + exit 1 +fi -dep_formula=${0#$WORKSPACE_DIR/} -dep_name=$(basename $BASH_SOURCE) -dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=ext-${dep_name}-${dep_version} -case ${ZEND_MODULE_API_VERSION} in - 20121212) - series=5.5 - ;; - 20131226) - series=5.6 - ;; - 20151012) - series=7.0 - ;; - 20160303) - series=7.1 - ;; -esac -dep_manifest=${dep_package}_php-$series.composer.json - -echo "-----> Merging dependencies..." +# let's see if libmemcached is there, if not then we have to use the vendored one +needed=( libmemcached11 ) +missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) +if [[ "$missing" ]]; then + echo "Using vendored libmemcached..." + # use vendored libmcrypt + CONFIGURE_EXTRA="--with-libmemcached-dir=${OUT_PREFIX}" + + # we need to declare the required version of libmemcached + dep_formula=${0#$WORKSPACE_DIR/} + dep_version=${dep_formula##*"/${dep_name}-"} + series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest + case "$dep_version" in + *) + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/libmemcached\":\"^1.0.18\",\"heroku-sys/libmemcached-abi\":\"^11\"}"}" + ;; + esac + +else + echo "Using system libmemcached..." + # use system libmemcached + CONFIGURE_EXTRA= + # but do we need headers? + needed=( libmemcached-dev ) + missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) + if [[ "$missing" ]]; then + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing + fi +fi + +# we need libsasl2-dev for ext-memcached +needed=( libsasl2-dev ) +missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) +if [[ "$missing" ]]; then + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing +fi + +MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/memcached.ini-dist\"}"}" + +source $(dirname $BASH_SOURCE)/../pecl mkdir -p ${OUT_PREFIX}/etc/php/conf.d cat > ${OUT_PREFIX}/etc/php/conf.d/memcached.ini-dist <<'EOF' extension = memcached.so +EOF +if [[ $dep_version == 2.* ]]; then + # this setting is gone in v3; SASL gets initialized on demand + cat >> ${OUT_PREFIX}/etc/php/conf.d/memcached.ini-dist <<'EOF' memcached.use_sasl = 1 EOF - -MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" -MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/memcached.ini-dist\"}"}" - -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest - -print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" +fi diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 index 4aa0601bb..153ff32f5 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0, libraries/libmemcached-1.0.18 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-5.5.38, libraries/libmemcached-1.0.18 source $(dirname $0)/memcached diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare deleted file mode 100755 index 85f048a5b..000000000 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ - -# fail hard -set -o pipefail -# fail harder -set -eu - -source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh - -OUT_PREFIX=$1 - -export PATH=${OUT_PREFIX}/bin:${PATH} - -dep_formula=${0#$WORKSPACE_DIR/} -dep_name=$(basename $BASH_SOURCE) -dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=pkg-ext-${dep_name}-${dep_version} -dep_dirname=memcached-${dep_version} -dep_archive_name=${dep_dirname}.tgz -dep_url=https://pecl.php.net/get/${dep_archive_name} -series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest -dep_manifest=${dep_package}_php-$series.composer.json - -echo "-----> Building ${dep_package}..." - -# can't build without this -needed=( libsasl2-2 ) -missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) -if [[ "$missing" ]]; then - echo "Error! Missing libraries: $missing" - exit 1 -fi - -# let's see if libmemcached is there, if not then we have to use the vendored one -needed=( libmemcached11 ) -missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) -if [[ "$missing" ]]; then - echo "Using vendored libmemcached..." - # use vendored libmcrypt - with_libmemcached_dir="--with-libmemcached-dir=${OUT_PREFIX}" -else - echo "Using system libmemcached..." - # use system libmemcached - with_libmemcached_dir= - # but do we need headers? - needed=( libmemcached-dev ) - missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) - if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing - fi -fi - -# we need libsasl2-dev for ext-memcached -needed=( libsasl2-dev ) -missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) -if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing -fi - -curl -L ${dep_url} | tar xz - -pushd ${dep_dirname} -phpize -./configure \ - --prefix=${OUT_PREFIX} \ - ${with_libmemcached_dir} -make -s -j 9 -# php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension -rm -rf ${OUT_PREFIX}/* -make install -s -strip --strip-unneeded ${OUT_PREFIX}/lib/php/extensions/*/*.so -popd - -MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" -MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" -MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" -MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{}"}" - -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest - -print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0 b/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0 deleted file mode 100755 index 48de65845..000000000 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached-bare-2.2.0 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libmemcached-1.0.18 - -source $(dirname $0)/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 4a5d7532e..0e4d2870a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0, libraries/libmemcached-1.0.18 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-5.6.31, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 deleted file mode 100755 index 362b2bf3c..000000000 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-bare-2.2.0 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/libmemcached-1.0.18 - -source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 index 28bf3fc78..7919cea98 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3, libraries/libmemcached-1.0.18 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-7.0.22, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 deleted file mode 100755 index c67ee8bad..000000000 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-bare-3.0.3 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22, libraries/libmemcached-1.0.18 - -source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 index e63d4966c..f39225eca 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 @@ -1,7 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3, libraries/libmemcached-1.0.18 - -# That's it - we're combining the dep build and the extension build here +# Build Deps: php-7.1.8, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 deleted file mode 100755 index 184cd258a..000000000 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-bare-3.0.3 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8, libraries/libmemcached-1.0.18 - -source $(dirname $0)/../no-debug-non-zts-20121212/memcached-bare diff --git a/support/build/libraries/libmemcached b/support/build/libraries/libmemcached index 6d161b2cc..90622c3c8 100755 --- a/support/build/libraries/libmemcached +++ b/support/build/libraries/libmemcached @@ -13,7 +13,7 @@ OUT_PREFIX=$1 dep_formula=${0#$WORKSPACE_DIR/} dep_name=$(basename $BASH_SOURCE) dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=pkg-${dep_name}-${dep_version} +dep_package=${dep_name}-${dep_version} dep_dirname=${dep_name}-${dep_version} dep_archive_name=${dep_dirname}.tar.gz dep_url=https://launchpad.net/libmemcached/1.0/${dep_version}/+download/${dep_archive_name} @@ -48,10 +48,20 @@ if [[ "$missing" ]]; then popd rm -rf ${OUT_PREFIX}/share/man + + ABI_VERSION=$(soname_version ${OUT_PREFIX}/lib/libmemcached.so) + type="heroku-sys-library" else echo "-----> System ${dep_name} available, creating empty package..." + ABI_VERSION=$(soname_version /usr/lib/x86_64-linux-gnu/libmemcached.so) + # we don't want this dummy package to end up in the Composer repository + type="heroku-sys-package" fi -python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" > $dep_manifest +echo +echo "ABI version is: ${ABI_VERSION}" +echo + +python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "$type" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "{}" "{}" "{}" "{\"heroku-sys/libmemcached-abi\":\"${ABI_VERSION}\"}" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" From 4ddf3d88629063924c8318f931baa2ac7430dc64 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Sep 2017 19:39:43 +0200 Subject: [PATCH 031/553] Move librdkafka to its own package, installed as a dependency by platform installer --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/rdkafka | 41 ++++------------- .../no-debug-non-zts-20121212/rdkafka-3.0.3 | 2 +- .../no-debug-non-zts-20121212/rdkafka-bare | 45 ------------------- .../rdkafka-bare-3.0.1 | 5 --- .../no-debug-non-zts-20131226/rdkafka-3.0.3 | 2 +- .../rdkafka-bare-3.0.1 | 5 --- .../no-debug-non-zts-20151012/rdkafka-3.0.3 | 2 +- .../rdkafka-bare-3.0.1 | 5 --- .../no-debug-non-zts-20160303/rdkafka-3.0.3 | 2 +- .../rdkafka-bare-3.0.1 | 5 --- support/build/libraries/librdkafka | 9 +++- 12 files changed, 21 insertions(+), 103 deletions(-) delete mode 100755 support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare delete mode 100755 support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare-3.0.1 delete mode 100755 support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 delete mode 100755 support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 delete mode 100755 support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index d08d17585..1d3ae434d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Add new argument for "provide" platform package manifest entry to `manifest.py` [David Zuelke] - Move libcassandra to its own package, installed as a dependency by platform installer [David Zuelke] - Move libmemcached to its own package, installed as a dependency by platform installer (if the platform doesn't already provide it) [David Zuelke] +- Move librdkafka to its own package, installed as a dependency by platform installer [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka b/support/build/extensions/no-debug-non-zts-20121212/rdkafka index c549a11c7..d6bd52869 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka @@ -1,43 +1,20 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# fail hard -set -o pipefail -# fail harder -set -eu - -source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh +dep_name=$(basename $BASH_SOURCE) OUT_PREFIX=$1 +export PATH=${OUT_PREFIX}/bin:${PATH} -ZEND_MODULE_API_VERSION=$(basename $(dirname $0)) -ZEND_MODULE_API_VERSION=${ZEND_MODULE_API_VERSION#no-debug-non-zts-} - +# we need to declare the required version of librdkafka dep_formula=${0#$WORKSPACE_DIR/} -dep_name=$(basename $BASH_SOURCE) dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=ext-${dep_name}-${dep_version} -case ${ZEND_MODULE_API_VERSION} in - 20121212) - series=5.5 - ;; - 20131226) - series=5.6 - ;; - 20151012) - series=7.0 - ;; - 20160303) - series=7.1 +series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest +case "$dep_version" in + *) + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/librdkafka\":\"~0.9\",\"heroku-sys/librdkafka-abi\":\"^1\"}"}" ;; esac -dep_manifest=${dep_package}_php-$series.composer.json - -echo "-----> Merging dependencies..." - -MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" -MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-extension" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest +CONFIGURE_EXTRA="--with-rdkafka=${OUT_PREFIX}" -print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" +source $(dirname $BASH_SOURCE)/../pecl diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 index c68131314..445d69a07 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20121212/rdkafka-bare-3.0.1, libraries/librdkafka-0.9.4 +# Build Deps: php-5.5.38, libraries/librdkafka-0.9.4 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare deleted file mode 100755 index 3b0ff88e2..000000000 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -# fail hard -set -o pipefail -# fail harder -set -eu - -source $(dirname $BASH_SOURCE)/../../_util/include/manifest.sh - -OUT_PREFIX=$1 - -export PATH=${OUT_PREFIX}/bin:${PATH} - -dep_formula=${0#$WORKSPACE_DIR/} -dep_name=$(basename $BASH_SOURCE) -dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=pkg-ext-${dep_name}-${dep_version} -dep_dirname=rdkafka-${dep_version} -dep_archive_name=${dep_dirname}.tgz -dep_url=https://pecl.php.net/get/${dep_archive_name} -series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest -dep_manifest=${dep_package}_php-$series.composer.json - -echo "-----> Building ${dep_package} (from PECL)..." - -curl -L ${dep_url} | tar xz - -pushd ${dep_dirname} -phpize -./configure \ - --prefix=${OUT_PREFIX} \ - --with-rdkafka=${OUT_PREFIX} -make -s -j 9 -# php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension -rm -rf ${OUT_PREFIX}/* -make install -s -strip --strip-unneeded ${OUT_PREFIX}/lib/php/extensions/*/*.so -popd - -MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\"}"}" -MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{\"heroku-sys/hhvm\":\"*\"}"}" - -python $(dirname $BASH_SOURCE)/../../_util/include/manifest.py "heroku-sys-php-package" "heroku-sys/ext-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" > $dep_manifest - -print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare-3.0.1 deleted file mode 100755 index 0cfa52d61..000000000 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-bare-3.0.1 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.9.4 - -source $(dirname $0)/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 index 39f1090e5..21ee5fd62 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1, libraries/librdkafka-0.9.4 +# Build Deps: php-5.6.31, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 deleted file mode 100755 index 96a946168..000000000 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-bare-3.0.1 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/librdkafka-0.9.4 - -source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 index a03deb4e3..cb3182a9a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1, libraries/librdkafka-0.9.4 +# Build Deps: php-7.0.22, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 deleted file mode 100755 index 9c0e646da..000000000 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22, libraries/librdkafka-0.9.4 - -source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 index a03deb4e3..c9a54f1aa 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: extensions/no-debug-non-zts-20151012/rdkafka-bare-3.0.1, libraries/librdkafka-0.9.4 +# Build Deps: php-7.1.8, libraries/librdkafka-0.9.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 deleted file mode 100755 index 9f18fe30e..000000000 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-bare-3.0.1 +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8, libraries/librdkafka-0.9.4 - -source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka-bare diff --git a/support/build/libraries/librdkafka b/support/build/libraries/librdkafka index 007eaf592..26af40eeb 100755 --- a/support/build/libraries/librdkafka +++ b/support/build/libraries/librdkafka @@ -12,7 +12,7 @@ OUT_PREFIX=$1 dep_formula=${0#$WORKSPACE_DIR/} dep_name=$(basename $BASH_SOURCE) dep_version=${dep_formula##*"/${dep_name}-"} -dep_package=pkg-${dep_name}-${dep_version} +dep_package=${dep_name}-${dep_version} dep_dirname=librdkafka-${dep_version} dep_archive_name=v${dep_version}.tar.gz dep_url=https://github.com/edenhill/librdkafka/archive/${dep_archive_name} @@ -37,6 +37,11 @@ rm ${OUT_PREFIX}/lib/*.a find ${OUT_PREFIX} -type f \( -executable -o -name '*.a' \) -exec sh -c "file -i '{}' | grep -Eq 'application/x-(archive|executable|sharedlib); charset=binary'" \; -print | xargs strip --strip-unneeded popd -python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" > $dep_manifest +ABI_VERSION=$(soname_version ${OUT_PREFIX}/lib/librdkafka.so) +echo +echo "ABI version is: ${ABI_VERSION}" +echo + +python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-library" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "{}" "{}" "{}" "{\"heroku-sys/librdkafka-abi\":\"${ABI_VERSION}\"}" > $dep_manifest print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" From ac190156429142574d0c54cf0822cf32b0055313 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:33:00 +0200 Subject: [PATCH 032/553] ext-mongo/1.6.16 --- CHANGELOG.md | 4 ++++ .../no-debug-non-zts-20121212/{mongo-1.6.14 => mongo-1.6.16} | 0 .../no-debug-non-zts-20131226/{mongo-1.6.14 => mongo-1.6.16} | 0 3 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongo-1.6.14 => mongo-1.6.16} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongo-1.6.14 => mongo-1.6.16} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d3ae434d..c3adba3c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v123 (2017-09-??) +### ADD + +- ext-mongo/1.6.16 [David Zuelke] + ### CHG - Support "heroku-sys-library" package type in platform installer [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.14 b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.14 rename to support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.14 rename to support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 From 1408feed78b79b473545a6785935b81549e4c54a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:34:45 +0200 Subject: [PATCH 033/553] ext-newrelic/7.5.0.199 --- CHANGELOG.md | 1 + .../{newrelic-7.4.0.198 => newrelic-7.5.0.199} | 0 .../{newrelic-7.4.0.198 => newrelic-7.5.0.199} | 0 .../{newrelic-7.4.0.198 => newrelic-7.5.0.199} | 0 .../{newrelic-7.4.0.198 => newrelic-7.5.0.199} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-7.4.0.198 => newrelic-7.5.0.199} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-7.4.0.198 => newrelic-7.5.0.199} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-7.4.0.198 => newrelic-7.5.0.199} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-7.4.0.198 => newrelic-7.5.0.199} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3adba3c0..43ecdbe1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-mongo/1.6.16 [David Zuelke] +- ext-newrelic/7.5.0.199 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.4.0.198 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.5.0.199 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-7.4.0.198 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-7.5.0.199 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.4.0.198 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.5.0.199 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-7.4.0.198 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-7.5.0.199 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.4.0.198 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.5.0.199 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-7.4.0.198 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-7.5.0.199 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.4.0.198 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.5.0.199 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-7.4.0.198 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-7.5.0.199 From 67b672be6a1c0c0911010edb6b2fbd27450afb2c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 03:04:46 +0200 Subject: [PATCH 034/553] libcassandra/2.7.0 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 | 2 +- .../build/libraries/{libcassandra-2.6.0 => libcassandra-2.7.0} | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename support/build/libraries/{libcassandra-2.6.0 => libcassandra-2.7.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43ecdbe1e..936d0f117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Move libcassandra to its own package, installed as a dependency by platform installer [David Zuelke] - Move libmemcached to its own package, installed as a dependency by platform installer (if the platform doesn't already provide it) [David Zuelke] - Move librdkafka to its own package, installed as a dependency by platform installer [David Zuelke] +- libcassandra/2.7.0 [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index 3d4d17251..e71314784 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.6.0 +# Build Deps: php-5.5.38, libraries/libcassandra-2.7.0 source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 index 0b539c71b..af5f6fdf3 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/libcassandra-2.6.0 +# Build Deps: php-5.6.31, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 index e8332d470..0122bc2f8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22, libraries/libcassandra-2.6.0 +# Build Deps: php-7.0.22, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 index 37e16681a..ff654c802 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8, libraries/libcassandra-2.6.0 +# Build Deps: php-7.1.8, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/libraries/libcassandra-2.6.0 b/support/build/libraries/libcassandra-2.7.0 similarity index 100% rename from support/build/libraries/libcassandra-2.6.0 rename to support/build/libraries/libcassandra-2.7.0 From 69c15fb521bf58c34ccb3dd41bb7a32bfe03e9a3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:36:26 +0200 Subject: [PATCH 035/553] ext-cassandra/1.3.2 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20121212/cassandra | 2 +- .../{cassandra-1.3.0 => cassandra-1.3.2} | 0 .../{cassandra-1.3.0 => cassandra-1.3.2} | 0 .../{cassandra-1.3.0 => cassandra-1.3.2} | 0 5 files changed, 2 insertions(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20131226/{cassandra-1.3.0 => cassandra-1.3.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{cassandra-1.3.0 => cassandra-1.3.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{cassandra-1.3.0 => cassandra-1.3.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 936d0f117..ee25a1aac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-mongo/1.6.16 [David Zuelke] - ext-newrelic/7.5.0.199 [David Zuelke] +- ext-cassandra/1.3.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra b/support/build/extensions/no-debug-non-zts-20121212/cassandra index 3cf530401..c6bf2bcd9 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra @@ -19,7 +19,7 @@ dep_version=${dep_formula##*"/${dep_name}-"} series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest case "$dep_version" in *) - MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/libcassandra\":\"^2.6.0\",\"heroku-sys/libcassandra-abi\":\"^2\"}"}" + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/libcassandra\":\"^2.7.0\",\"heroku-sys/libcassandra-abi\":\"^2\"}"}" ;; esac diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.0 rename to support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.0 rename to support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.0 rename to support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 From ef62caa79d88a772869b547a1c179d5e0843557e Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 03:03:07 +0200 Subject: [PATCH 036/553] librdkafka/0.11.0 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 | 2 +- support/build/libraries/{librdkafka-0.9.4 => librdkafka-0.11.0} | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename support/build/libraries/{librdkafka-0.9.4 => librdkafka-0.11.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee25a1aac..5fb0e8de2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Move libmemcached to its own package, installed as a dependency by platform installer (if the platform doesn't already provide it) [David Zuelke] - Move librdkafka to its own package, installed as a dependency by platform installer [David Zuelke] - libcassandra/2.7.0 [David Zuelke] +- librdkafka/0.11.0 [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 index 445d69a07..76deed533 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.9.4 +# Build Deps: php-5.5.38, libraries/librdkafka-0.11.0 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 index 21ee5fd62..69edd5529 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/librdkafka-0.9.4 +# Build Deps: php-5.6.31, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 index cb3182a9a..138de72bf 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22, libraries/librdkafka-0.9.4 +# Build Deps: php-7.0.22, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 index c9a54f1aa..3ff5ed0c9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8, libraries/librdkafka-0.9.4 +# Build Deps: php-7.1.8, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.9.4 b/support/build/libraries/librdkafka-0.11.0 similarity index 100% rename from support/build/libraries/librdkafka-0.9.4 rename to support/build/libraries/librdkafka-0.11.0 From 918495e23d3d49b107db50c99b5b2e9f09d73810 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:37:04 +0200 Subject: [PATCH 037/553] ext-rdkafka/3.0.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{rdkafka-3.0.3 => rdkafka-3.0.4} | 0 .../no-debug-non-zts-20131226/{rdkafka-3.0.3 => rdkafka-3.0.4} | 0 .../no-debug-non-zts-20151012/{rdkafka-3.0.3 => rdkafka-3.0.4} | 0 .../no-debug-non-zts-20160303/{rdkafka-3.0.3 => rdkafka-3.0.4} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{rdkafka-3.0.3 => rdkafka-3.0.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{rdkafka-3.0.3 => rdkafka-3.0.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{rdkafka-3.0.3 => rdkafka-3.0.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{rdkafka-3.0.3 => rdkafka-3.0.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fb0e8de2..c5d082c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-mongo/1.6.16 [David Zuelke] - ext-newrelic/7.5.0.199 [David Zuelke] - ext-cassandra/1.3.2 [David Zuelke] +- ext-rdkafka/3.0.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.3 rename to support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.3 rename to support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.3 rename to support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.3 rename to support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 From c544dc69c6d7a1757c321ad5e8fcc5badd4bd4ad Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:39:30 +0200 Subject: [PATCH 038/553] ext-phalcon/3.2.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.2.1 => phalcon-3.2.2} | 0 .../no-debug-non-zts-20131226/{phalcon-3.2.1 => phalcon-3.2.2} | 0 .../no-debug-non-zts-20151012/{phalcon-3.2.1 => phalcon-3.2.2} | 0 .../no-debug-non-zts-20160303/{phalcon-3.2.1 => phalcon-3.2.2} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.2.1 => phalcon-3.2.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.2.1 => phalcon-3.2.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.2.1 => phalcon-3.2.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.2.1 => phalcon-3.2.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5d082c4d..f3168c750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - ext-newrelic/7.5.0.199 [David Zuelke] - ext-cassandra/1.3.2 [David Zuelke] - ext-rdkafka/3.0.4 [David Zuelke] +- ext-phalcon/3.2.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.1 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.1 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.1 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.1 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 From 18a37700453fcd6b8228172af55d04dbdca0fae6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:41:57 +0200 Subject: [PATCH 039/553] Composer/1.5.1 --- CHANGELOG.md | 1 + support/build/{composer-1.4.2 => composer-1.5.1} | 0 2 files changed, 1 insertion(+) rename support/build/{composer-1.4.2 => composer-1.5.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3168c750..7da9e4993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Move librdkafka to its own package, installed as a dependency by platform installer [David Zuelke] - libcassandra/2.7.0 [David Zuelke] - librdkafka/0.11.0 [David Zuelke] +- Composer/1.5.1 [David Zuelke] ## v122 (2017-08-03) diff --git a/support/build/composer-1.4.2 b/support/build/composer-1.5.1 similarity index 100% rename from support/build/composer-1.4.2 rename to support/build/composer-1.5.1 From ef241f9e741fe8ab36b26ae25623a5047e418efa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:42:40 +0200 Subject: [PATCH 040/553] PHP/7.1.9 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 | 2 +- support/build/{php-7.1.8 => php-7.1.9} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.8 => php-7.1.9} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da9e4993..5aefcb7bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - ext-cassandra/1.3.2 [David Zuelke] - ext-rdkafka/3.0.4 [David Zuelke] - ext-phalcon/3.2.2 [David Zuelke] +- PHP/7.1.9 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 index 02059f023..5d0c51493 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index efe8a0cba..3b5f968e2 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index ff654c802..cf276b63e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.8, libraries/libcassandra-2.7.0 +# Build Deps: php-7.1.9, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 82ad5d530..fbf07a877 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 1b1c0aa2f..0d48dac08 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 8c63c9689..9cfe7d0ff 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 index f39225eca..ad4959ab8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 +++ b/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.8, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.9, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 index da96dd4fc..936a6da1a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index a6665d343..a13d1aa0b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 index 51ad78b23..c530bb349 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 index 0e388b080..765ff57eb 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 +++ b/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.8, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.9, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 8b9ebcac4..5a9d6a232 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 index 3ff5ed0c9..6a4b2f90b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 +++ b/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.8, libraries/librdkafka-0.11.0 +# Build Deps: php-7.1.9, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 index d02ed72a3..9c5395e8b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.8 +# Build Deps: php-7.1.9 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.8 b/support/build/php-7.1.9 similarity index 100% rename from support/build/php-7.1.8 rename to support/build/php-7.1.9 From 6b55095f863eb5a200759813dd5307f9e5af6f88 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 01:43:38 +0200 Subject: [PATCH 041/553] PHP/7.0.23 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.5.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 | 2 +- support/build/{php-7.0.22 => php-7.0.23} | 0 support/build/{php-min-7.0.22 => php-min-7.0.23} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.22 => php-7.0.23} (100%) rename support/build/{php-min-7.0.22 => php-min-7.0.23} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aefcb7bb..3b0660c70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - ext-rdkafka/3.0.4 [David Zuelke] - ext-phalcon/3.2.2 [David Zuelke] - PHP/7.1.9 [David Zuelke] +- PHP/7.0.23 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index 950ace247..efd6101b2 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.22.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.23.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 diff --git a/support/build/composer-1.5.1 b/support/build/composer-1.5.1 index 56568c6e1..17eb37261 100755 --- a/support/build/composer-1.5.1 +++ b/support/build/composer-1.5.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.22 +# Build Deps: php-min-7.0.23 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 index eabd211f3..057782610 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index b999ba063..fa734a847 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 0122bc2f8..e25eb6e84 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.22, libraries/libcassandra-2.7.0 +# Build Deps: php-7.0.23, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 54f0b5278..b8c654605 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index c5b53e55c..cf4ca8943 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 9ca410d58..eb4ca66d9 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 index 7919cea98..337847777 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 +++ b/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.22, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.23, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 index 56027d64b..699eb166a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 5eaf1de51..47d6bc164 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 index 1ab83fcc1..4d1d8f6c6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 index 51d896174..73584f7b6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 +++ b/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.22, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.23, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index ad92fd09a..2240f42a5 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 index 138de72bf..b27adf5cc 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 +++ b/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.22, libraries/librdkafka-0.11.0 +# Build Deps: php-7.0.23, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 index 63d92df0d..ca5118a05 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.22 +# Build Deps: php-7.0.23 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.22 b/support/build/php-7.0.23 similarity index 100% rename from support/build/php-7.0.22 rename to support/build/php-7.0.23 diff --git a/support/build/php-min-7.0.22 b/support/build/php-min-7.0.23 similarity index 100% rename from support/build/php-min-7.0.22 rename to support/build/php-min-7.0.23 From c75eb53bdb3c970c30c891de546d5956e5db98bd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 17:11:14 +0200 Subject: [PATCH 042/553] fix sync.sh debug-printing additional arguments --- support/build/_util/sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/build/_util/sync.sh b/support/build/_util/sync.sh index c26ac5d3c..fad745b21 100755 --- a/support/build/_util/sync.sh +++ b/support/build/_util/sync.sh @@ -57,7 +57,7 @@ if [[ $# -gt 2 ]]; then else dst_region="s3" fi -echo "$@" + src_bucket=${1:-$S3_BUCKET}; shift || true src_prefix=${1:-$S3_PREFIX}; shift || true if [[ $# == "1" ]]; then From 97baa23dd13c5a85fd9ddc1af1c75763969f8b6c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 23:28:40 +0200 Subject: [PATCH 043/553] ext-mongodb/1.2.10 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.2.9 => mongodb-1.2.10} | 0 .../no-debug-non-zts-20131226/{mongodb-1.2.9 => mongodb-1.2.10} | 0 .../no-debug-non-zts-20151012/{mongodb-1.2.9 => mongodb-1.2.10} | 0 .../no-debug-non-zts-20160303/{mongodb-1.2.9 => mongodb-1.2.10} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.2.9 => mongodb-1.2.10} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.2.9 => mongodb-1.2.10} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.2.9 => mongodb-1.2.10} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.2.9 => mongodb-1.2.10} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b0660c70..98345d11c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - ext-phalcon/3.2.2 [David Zuelke] - PHP/7.1.9 [David Zuelke] - PHP/7.0.23 [David Zuelke] +- ext-mongodb/1.2.10 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.9 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.10 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.9 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.10 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.9 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.9 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 From 8236b826667e51dcc25e8713ed7ec3e276cb19ae Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Sep 2017 23:29:15 +0200 Subject: [PATCH 044/553] v123 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98345d11c..86661abcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v123 (2017-09-??) +## v123 (2017-09-07) ### ADD From dbc6c0b4ff18b43236e64982af6d6f19905a4c52 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Sep 2017 01:02:20 +0200 Subject: [PATCH 045/553] Use Composer/1.5.1 --- CHANGELOG.md | 6 ++++++ bin/compile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86661abcd..0f23222fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v124 (2017-09-07) + +### FIX + +- Use Composer/1.5.1 [David Zuelke] + ## v123 (2017-09-07) ### ADD diff --git a/bin/compile b/bin/compile index efd6101b2..cffaa0ae6 100755 --- 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 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.4.2.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.1.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 From d024b144fd1bfde7ed1ca55de7a352912cafbc34 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 13 Sep 2017 23:07:50 +0200 Subject: [PATCH 046/553] gmp.h configure patching not needed for recent PHP versions --- support/build/php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/support/build/php b/support/build/php index 2205fa3d4..2a6a5e90e 100755 --- a/support/build/php +++ b/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 From f1f520988a68390fb47f5ceba0b283f0c108a10f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 30 Sep 2017 11:05:56 +0200 Subject: [PATCH 047/553] PHP/7.0.24 --- CHANGELOG.md | 6 ++++++ bin/compile | 2 +- support/build/composer-1.5.1 | 2 +- .../build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 | 2 +- .../build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20151012/memcached-3.0.3 | 2 +- .../extensions/no-debug-non-zts-20151012/mongodb-1.2.10 | 2 +- .../build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../extensions/no-debug-non-zts-20151012/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/redis-3.1.3 | 2 +- support/build/{php-7.0.23 => php-7.0.24} | 0 support/build/{php-min-7.0.23 => php-min-7.0.24} | 0 19 files changed, 22 insertions(+), 16 deletions(-) rename support/build/{php-7.0.23 => php-7.0.24} (100%) rename support/build/{php-min-7.0.23 => php-min-7.0.24} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f23222fd..4fda0ef29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v125 (2017-10-??) + +### ADD + +- PHP/7.0.24 [David Zuelke] + ## v124 (2017-09-07) ### FIX diff --git a/bin/compile b/bin/compile index cffaa0ae6..34e90fc82 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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 diff --git a/support/build/composer-1.5.1 b/support/build/composer-1.5.1 index 17eb37261..575829bb6 100755 --- a/support/build/composer-1.5.1 +++ b/support/build/composer-1.5.1 @@ -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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 index 057782610..07ab442fc 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index fa734a847..332b873a6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index e25eb6e84..4e3e2b725 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index b8c654605..3e1c1770d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index cf4ca8943..de6b09651 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index eb4ca66d9..d7a99333f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 index 337847777..1c5a2de44 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 index 699eb166a..709068360 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 @@ -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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 47d6bc164..a4de189a8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 index 4d1d8f6c6..0fd2f71a9 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 index 73584f7b6..d9703dd5e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 2240f42a5..3324f8f32 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 index b27adf5cc..ebf1c7af2 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 index ca5118a05..0a1042d09 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.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/redis diff --git a/support/build/php-7.0.23 b/support/build/php-7.0.24 similarity index 100% rename from support/build/php-7.0.23 rename to support/build/php-7.0.24 diff --git a/support/build/php-min-7.0.23 b/support/build/php-min-7.0.24 similarity index 100% rename from support/build/php-min-7.0.23 rename to support/build/php-min-7.0.24 From 4ba6eb8bd8ddc27b3f7579e8ac3ea1e817b1b976 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 30 Sep 2017 11:06:54 +0200 Subject: [PATCH 048/553] PHP/7.1.10 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 | 2 +- support/build/{php-7.1.9 => php-7.1.10} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.9 => php-7.1.10} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fda0ef29..6311b7d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.0.24 [David Zuelke] +- PHP/7.1.10 [David Zuelke] ## v124 (2017-09-07) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 index 5d0c51493..b08c3f15d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index 3b5f968e2..85ae1610e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index cf276b63e..b91fec7f2 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index fbf07a877..30f3da21c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 0d48dac08..1f1e71b40 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 9cfe7d0ff..5ce98e718 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 index ad4959ab8..6d91afadf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 index 936a6da1a..c83a2b766 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 @@ -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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index a13d1aa0b..1d51d5b87 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 index c530bb349..18ac6d78a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 index 765ff57eb..02553e8d4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 5a9d6a232..42b94e2fa 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 index 6a4b2f90b..536ad488a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 +++ b/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 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 index 9c5395e8b..4a7e01907 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.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/redis diff --git a/support/build/php-7.1.9 b/support/build/php-7.1.10 similarity index 100% rename from support/build/php-7.1.9 rename to support/build/php-7.1.10 From f974b472d67f86633d6c5667f3388177dc647054 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 30 Sep 2017 11:08:00 +0200 Subject: [PATCH 049/553] Composer/1.5.2 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.5.1 => composer-1.5.2} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.5.1 => composer-1.5.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6311b7d7b..0d8600b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ - PHP/7.0.24 [David Zuelke] - PHP/7.1.10 [David Zuelke] +### CHG + +- Composer/1.5.2 [David Zuelke] + ## v124 (2017-09-07) ### FIX diff --git a/bin/compile b/bin/compile index 34e90fc82..d6d4c1f02 100755 --- 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 --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 diff --git a/support/build/composer-1.5.1 b/support/build/composer-1.5.2 similarity index 100% rename from support/build/composer-1.5.1 rename to support/build/composer-1.5.2 From c4df0f47b8995a9efff7519751712ef47c3771e9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 30 Sep 2017 11:08:56 +0200 Subject: [PATCH 050/553] ext-redis/3.1.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{redis-3.1.3 => redis-3.1.4} | 0 .../no-debug-non-zts-20131226/{redis-3.1.3 => redis-3.1.4} | 0 .../no-debug-non-zts-20151012/{redis-3.1.3 => redis-3.1.4} | 0 .../no-debug-non-zts-20160303/{redis-3.1.3 => redis-3.1.4} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-3.1.3 => redis-3.1.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-3.1.3 => redis-3.1.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-3.1.3 => redis-3.1.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-3.1.3 => redis-3.1.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d8600b9f..9cd192ec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.0.24 [David Zuelke] - PHP/7.1.10 [David Zuelke] +- ext-redis/3.1.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-3.1.3 rename to support/build/extensions/no-debug-non-zts-20121212/redis-3.1.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-3.1.3 rename to support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-3.1.3 rename to support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-3.1.3 rename to support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 From 08a6f955c7cee212d33f72b83090c2c2f0bfed89 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 30 Sep 2017 11:10:53 +0200 Subject: [PATCH 051/553] ext-mongodb/1.3.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.2.10 => mongodb-1.3.0} | 0 .../no-debug-non-zts-20131226/{mongodb-1.2.10 => mongodb-1.3.0} | 0 .../no-debug-non-zts-20151012/{mongodb-1.2.10 => mongodb-1.3.0} | 0 .../no-debug-non-zts-20160303/{mongodb-1.2.10 => mongodb-1.3.0} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.2.10 => mongodb-1.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.2.10 => mongodb-1.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.2.10 => mongodb-1.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.2.10 => mongodb-1.3.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cd192ec1..16af5fd81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - 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] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.10 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.2.10 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.10 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.2.10 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.2.10 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.2.10 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 From 15125941615d55c4d83d81277280029cf2792021 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 30 Sep 2017 11:12:30 +0200 Subject: [PATCH 052/553] blackfire/1.18.0 --- CHANGELOG.md | 1 + .../{blackfire-1.17.3 => blackfire-1.18.0} | 0 .../{blackfire-1.17.3 => blackfire-1.18.0} | 0 .../{blackfire-1.17.3 => blackfire-1.18.0} | 0 .../{blackfire-1.17.3 => blackfire-1.18.0} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.17.3 => blackfire-1.18.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.17.3 => blackfire-1.18.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.17.3 => blackfire-1.18.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.17.3 => blackfire-1.18.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16af5fd81..eb69d41a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - 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 diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.3 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.17.3 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.3 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.17.3 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.3 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.17.3 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.3 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.17.3 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.0 From fd79b5245d32119fcf0569ad8aa3376610e375bf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 5 Oct 2017 00:25:11 +0200 Subject: [PATCH 053/553] v125 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb69d41a0..a96f683d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v125 (2017-10-??) +## v125 (2017-10-04) ### ADD From ef81ae4c76fea29e939c99a2c37be511411c3b41 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 18 Oct 2017 22:27:55 +0200 Subject: [PATCH 054/553] Ignore require-dev when building platform package dependency graph, fixes #240 --- CHANGELOG.md | 6 ++++++ bin/util/platform.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a96f683d1..38694ab36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v126 (2017-10-??) + +### CHG + +- Ignore `require-dev` when building platform package dependency graph (#240) [David Zuelke] + ## v125 (2017-10-04) ### ADD diff --git a/bin/util/platform.php b/bin/util/platform.php index d800a6748..0b9db0c6a 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -165,7 +165,8 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { "prefer-stable" => isset($lock["prefer-stable"]) ? $lock["prefer-stable"] : false, "provide" => $provide, "require" => $require, - "require-dev" => (object)$requireDev, + // only write out require-dev if we're installing in CI, as indicated by the HEROKU_PHP_INSTALL_DEV set (to an empty string) + "require-dev" => getenv("HEROKU_PHP_INSTALL_DEV") === false ? (object)[] : (object)$requireDev, // put require before repositories, or a large number of metapackages from above will cause Composer's regexes to hit PCRE limits for backtracking or JIT stack size "repositories" => $repositories, ]; From 7dfadaa3221c20cecea0bb18e39a192d06fd6c9a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 18 Oct 2017 23:19:10 +0200 Subject: [PATCH 055/553] Rewrite certain known polyfill package manifests to "replace", not "provide", extensions --- CHANGELOG.md | 1 + bin/util/platform.php | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38694ab36..85eeba53b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### CHG - Ignore `require-dev` when building platform package dependency graph (#240) [David Zuelke] +- Rewrite `provide` sections with PHP extensions in package definitions to `replace` for known polyfill packages [David Zuelke] ## v125 (2017-10-04) diff --git a/bin/util/platform.php b/bin/util/platform.php index 0b9db0c6a..edde26996 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -36,6 +36,15 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { $ppro = array_filter(isset($package["provide"]) ? $package["provide"] : [], $platfilter, ARRAY_FILTER_USE_KEY); $pcon = array_filter(isset($package["conflict"]) ? $package["conflict"] : [], $platfilter, ARRAY_FILTER_USE_KEY); if(!$preq && !$prep && !$ppro && !$pcon) return false; + // for known "polyfill" packages, rewrite any extensions they declare as "provide"d to "replace" + // using "provide" will otherwise cause the solver to get stuck on that package from the repository, if it exists, even if it conflicts with other rules (e.g. PHP versions) and could fall back onto that polyfill packge + // example: alcaeus/mongo-php-adapter provides "ext-mongo", but installing it together with a PHP 7 requirement will fail, as ext-mongo is only available for PHP 5, and the solver never uses "alcaeus/mongo-php-adapter" as the solution for "ext-mongo" unless it specifies "ext-mongo" in "replace", which it shouldn't, as it's a polyfill (that will quietly let the real extension take over if it's present, e.g. on PHP 5 environments), and not a replacement for the extension + // we do not want to do this for all packages that so declare their "provide"s, because many polyfills are just an incomplete or slower fallback (e.g. Symfony mbstring with only UTF-8 support, or intl which is slower than native C ICU bindings), and it's rare that extensions are only available for certain versions of a runtime + // see https://github.com/composer/composer/issues/6753 + if(in_array($package["name"], ["alcaeus/mongo-php-adapter"])) { + $prep = $prep + array_filter($ppro, function($k) { return strpos($k, "ext-") === 0; }, ARRAY_FILTER_USE_KEY); + $ppro = array_diff_key($ppro, $prep); + } $have_runtime_req |= hasreq($preq); $metapaks[] = [ "type" => "metapackage", From f0c5b9585f3561aa0baa5a50cfc2d37e3e099591 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 17:55:42 +0200 Subject: [PATCH 056/553] PHP/5.6.32 --- CHANGELOG.md | 4 ++++ support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-3.1.4 | 2 +- support/build/{php-5.6.31 => php-5.6.32} | 0 18 files changed, 20 insertions(+), 16 deletions(-) rename support/build/{php-5.6.31 => php-5.6.32} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85eeba53b..acd9c51a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v126 (2017-10-??) +### ADD + +- PHP/5.6.32 [David Zuelke] + ### CHG - Ignore `require-dev` when building platform package dependency graph (#240) [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 index e9857701e..018ee3625 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 2f087ec21..522cf72d4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index af5f6fdf3..7930f4e00 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/libcassandra-2.7.0 +# Build Deps: php-5.6.32, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 6d1fd96a9..985f98225 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index 3e1b26a97..8ca670441 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 36a655ac4..e5c8dfe42 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 0e4d2870a..8f9dee135 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.32, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index e363b0792..b1f735f6b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 index b18223ea1..3f9e878de 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index e7d9a01de..23dcfbd1b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 5d3c9808a..f332da3ba 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 index 5d3c9808a..f332da3ba 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 894b40b05..99706266d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.32, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index f3f39452d..377e0f0ea 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 index 69edd5529..96389e577 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31, libraries/librdkafka-0.11.0 +# Build Deps: php-5.6.32, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 index f2ab2e227..3a6c1a9c5 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.31 +# Build Deps: php-5.6.32 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.31 b/support/build/php-5.6.32 similarity index 100% rename from support/build/php-5.6.31 rename to support/build/php-5.6.32 From f41f7699940640ec9fa91c877ca2303a7c8b62db Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 17:57:27 +0200 Subject: [PATCH 057/553] PHP/7.0.25 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 | 2 +- support/build/{php-7.0.24 => php-7.0.25} | 0 support/build/{php-min-7.0.24 => php-min-7.0.25} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.24 => php-7.0.25} (100%) rename support/build/{php-min-7.0.24 => php-min-7.0.25} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index acd9c51a4..c07147f60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/5.6.32 [David Zuelke] +- PHP/7.0.25 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index d6d4c1f02..5a40dc774 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.24.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.25.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 diff --git a/support/build/composer-1.5.2 b/support/build/composer-1.5.2 index 575829bb6..6c76347c3 100755 --- a/support/build/composer-1.5.2 +++ b/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.24 +# Build Deps: php-min-7.0.25 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 index 07ab442fc..7821f371f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index 332b873a6..200831c14 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 4e3e2b725..85ea12e7f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.24, libraries/libcassandra-2.7.0 +# Build Deps: php-7.0.25, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 3e1c1770d..de4254d12 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index de6b09651..31d481606 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index d7a99333f..789f58682 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 index 1c5a2de44..8ebdb297d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 +++ b/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.24, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.25, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 index 709068360..7e3958d9d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index a4de189a8..f28c466cb 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 index 0fd2f71a9..2c55c5d38 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 index d9703dd5e..fc1c52c9a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 +++ b/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.24, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.25, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 3324f8f32..7374a13ea 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 index ebf1c7af2..21d53a924 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 +++ b/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.24, libraries/librdkafka-0.11.0 +# Build Deps: php-7.0.25, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 index 0a1042d09..e0e81c487 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 +++ b/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.0.24 +# Build Deps: php-7.0.25 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.24 b/support/build/php-7.0.25 similarity index 100% rename from support/build/php-7.0.24 rename to support/build/php-7.0.25 diff --git a/support/build/php-min-7.0.24 b/support/build/php-min-7.0.25 similarity index 100% rename from support/build/php-min-7.0.24 rename to support/build/php-min-7.0.25 From b5a108bec8b0a27137f7f3e3a34da3c20998cd6b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:02:35 +0200 Subject: [PATCH 058/553] PHP/7.1.11 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 | 2 +- support/build/{php-7.1.10 => php-7.1.11} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.10 => php-7.1.11} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c07147f60..c9bf2b9ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/5.6.32 [David Zuelke] - PHP/7.0.25 [David Zuelke] +- PHP/7.1.11 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 index b08c3f15d..b0d7bd318 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index 85ae1610e..a3ea5915a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index b91fec7f2..81e5ddf2f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.10, libraries/libcassandra-2.7.0 +# Build Deps: php-7.1.11, libraries/libcassandra-2.7.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 30f3da21c..2f369e5a3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 1f1e71b40..ad614b16e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 5ce98e718..ee431b9f4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 index 6d91afadf..65c12f9ff 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 +++ b/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.10, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.11, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 index c83a2b766..46edc817d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 1d51d5b87..a52563308 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 index 18ac6d78a..d82dcf2ad 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 index 02553e8d4..5d6323eca 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 +++ b/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.10, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.11, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 42b94e2fa..6dd2ec792 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 index 536ad488a..0faef6945 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 +++ b/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.10, libraries/librdkafka-0.11.0 +# Build Deps: php-7.1.11, libraries/librdkafka-0.11.0 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 index 4a7e01907..786dc9c1a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 +++ b/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.1.10 +# Build Deps: php-7.1.11 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.10 b/support/build/php-7.1.11 similarity index 100% rename from support/build/php-7.1.10 rename to support/build/php-7.1.11 From fd65fb97493583cad8b80743d036821baf8302cb Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:06:07 +0200 Subject: [PATCH 059/553] ext-newrelic/7.6.0.201 --- CHANGELOG.md | 1 + .../{newrelic-7.5.0.199 => newrelic-7.6.0.201} | 0 .../{newrelic-7.5.0.199 => newrelic-7.6.0.201} | 0 .../{newrelic-7.5.0.199 => newrelic-7.6.0.201} | 0 .../{newrelic-7.5.0.199 => newrelic-7.6.0.201} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-7.5.0.199 => newrelic-7.6.0.201} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-7.5.0.199 => newrelic-7.6.0.201} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-7.5.0.199 => newrelic-7.6.0.201} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-7.5.0.199 => newrelic-7.6.0.201} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9bf2b9ca..c7176ff8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/5.6.32 [David Zuelke] - PHP/7.0.25 [David Zuelke] - PHP/7.1.11 [David Zuelke] +- ext-newrelic/7.6.0.201 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.5.0.199 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.6.0.201 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-7.5.0.199 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-7.6.0.201 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.5.0.199 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.6.0.201 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-7.5.0.199 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-7.6.0.201 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.5.0.199 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.6.0.201 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-7.5.0.199 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-7.6.0.201 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.5.0.199 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.6.0.201 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-7.5.0.199 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-7.6.0.201 From 336a652fd44c37e0257d016c544f3560cc47f437 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:07:58 +0200 Subject: [PATCH 060/553] ext-mongodb/1.3.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.3.0 => mongodb-1.3.1} | 0 .../no-debug-non-zts-20131226/{mongodb-1.3.0 => mongodb-1.3.1} | 0 .../no-debug-non-zts-20151012/{mongodb-1.3.0 => mongodb-1.3.1} | 0 .../no-debug-non-zts-20160303/{mongodb-1.3.0 => mongodb-1.3.1} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.3.0 => mongodb-1.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.3.0 => mongodb-1.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.3.0 => mongodb-1.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.3.0 => mongodb-1.3.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7176ff8c..eb1bbecbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.25 [David Zuelke] - PHP/7.1.11 [David Zuelke] - ext-newrelic/7.6.0.201 [David Zuelke] +- ext-mongodb/1.3.1 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.0 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.0 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.0 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.0 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.1 From 24fe6d7214af43bb8aabf604b4f5247aecde8a8b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:10:49 +0200 Subject: [PATCH 061/553] ext-amqp/1.9.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20131226/{amqp-1.9.1 => amqp-1.9.3} | 0 .../no-debug-non-zts-20151012/{amqp-1.9.1 => amqp-1.9.3} | 0 .../no-debug-non-zts-20160303/{amqp-1.9.1 => amqp-1.9.3} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20131226/{amqp-1.9.1 => amqp-1.9.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{amqp-1.9.1 => amqp-1.9.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{amqp-1.9.1 => amqp-1.9.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb1bbecbf..981f57d76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.11 [David Zuelke] - ext-newrelic/7.6.0.201 [David Zuelke] - ext-mongodb/1.3.1 [David Zuelke] +- ext-amqp/1.9.3 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.1 rename to support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.1 rename to support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.1 rename to support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 From c12806417046f1f3cc0c17d8959c71130aacc05f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:11:51 +0200 Subject: [PATCH 062/553] ext-phalcon/3.2.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.2.2 => phalcon-3.2.4} | 0 .../no-debug-non-zts-20131226/{phalcon-3.2.2 => phalcon-3.2.4} | 0 .../no-debug-non-zts-20151012/{phalcon-3.2.2 => phalcon-3.2.4} | 0 .../no-debug-non-zts-20160303/{phalcon-3.2.2 => phalcon-3.2.4} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.2.2 => phalcon-3.2.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.2.2 => phalcon-3.2.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.2.2 => phalcon-3.2.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.2.2 => phalcon-3.2.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 981f57d76..5e6bbab19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - ext-newrelic/7.6.0.201 [David Zuelke] - ext-mongodb/1.3.1 [David Zuelke] - ext-amqp/1.9.3 [David Zuelke] +- ext-phalcon/3.2.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.2 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.2 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.2 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.2 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 From 3b17edb104d2d0367a0271f5b038a45492a37515 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:21:05 +0200 Subject: [PATCH 063/553] libcassandra/2.7.1 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- .../build/libraries/{libcassandra-2.7.0 => libcassandra-2.7.1} | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename support/build/libraries/{libcassandra-2.7.0 => libcassandra-2.7.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e6bbab19..0f85d3acb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Ignore `require-dev` when building platform package dependency graph (#240) [David Zuelke] - Rewrite `provide` sections with PHP extensions in package definitions to `replace` for known polyfill packages [David Zuelke] +- libcassandra/2.7.1 [David Zuelke] ## v125 (2017-10-04) diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index e71314784..07c547b09 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.7.0 +# Build Deps: php-5.5.38, libraries/libcassandra-2.7.1 source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 7930f4e00..18ef87fbf 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, libraries/libcassandra-2.7.0 +# Build Deps: php-5.6.32, libraries/libcassandra-2.7.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 85ea12e7f..4f1d64bda 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.25, libraries/libcassandra-2.7.0 +# Build Deps: php-7.0.25, libraries/libcassandra-2.7.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 81e5ddf2f..d9a5c86d0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.11, libraries/libcassandra-2.7.0 +# Build Deps: php-7.1.11, libraries/libcassandra-2.7.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/libraries/libcassandra-2.7.0 b/support/build/libraries/libcassandra-2.7.1 similarity index 100% rename from support/build/libraries/libcassandra-2.7.0 rename to support/build/libraries/libcassandra-2.7.1 From 683b8459884688bf6407cbb9f88b24c641d3e137 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 18:22:03 +0200 Subject: [PATCH 064/553] librdkafka/0.11.1 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 | 2 +- .../build/libraries/{librdkafka-0.11.0 => librdkafka-0.11.1} | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename support/build/libraries/{librdkafka-0.11.0 => librdkafka-0.11.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f85d3acb..c33a5b9f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Ignore `require-dev` when building platform package dependency graph (#240) [David Zuelke] - Rewrite `provide` sections with PHP extensions in package definitions to `replace` for known polyfill packages [David Zuelke] - libcassandra/2.7.1 [David Zuelke] +- librdkafka/0.11.1 [David Zuelke] ## v125 (2017-10-04) diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 index 76deed533..65ed3485f 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.11.0 +# Build Deps: php-5.5.38, libraries/librdkafka-0.11.1 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 index 96389e577..1ceab1bb8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, libraries/librdkafka-0.11.0 +# Build Deps: php-5.6.32, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 index 21d53a924..ff7ac2797 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 +++ b/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.25, libraries/librdkafka-0.11.0 +# Build Deps: php-7.0.25, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 index 0faef6945..56ec51cd3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 +++ b/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.11, libraries/librdkafka-0.11.0 +# Build Deps: php-7.1.11, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.11.0 b/support/build/libraries/librdkafka-0.11.1 similarity index 100% rename from support/build/libraries/librdkafka-0.11.0 rename to support/build/libraries/librdkafka-0.11.1 From 82b5e633ad8ca5739c05d59b1d7990757ade418a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 20:19:13 +0200 Subject: [PATCH 065/553] Fix gmp.h lookup patching broken since v125 / d024b14 --- CHANGELOG.md | 4 ++++ support/build/php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c33a5b9f8..49a233533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ - libcassandra/2.7.1 [David Zuelke] - librdkafka/0.11.1 [David Zuelke] +### FIX + +- gmp.h lookup patching broken since v125 / d024b14 [David Zuelke] + ## v125 (2017-10-04) ### ADD diff --git a/support/build/php b/support/build/php index 2a6a5e90e..907bed73a 100755 --- a/support/build/php +++ b/support/build/php @@ -56,7 +56,7 @@ if [[ "$missing" ]]; then apt-get install -q -y $missing fi -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 +if dpkg --compare-versions "$dep_version" "lt" 7.0.16 || dpkg --compare-versions "$dep_version" "eq" 7.1.0 || dpkg --compare-versions "$dep_version" "eq" 7.1.1; 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 From 19844d0b9e0c82163ef7e9a53fcc515952945426 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2017 20:21:49 +0200 Subject: [PATCH 066/553] Apache/2.4.29 --- CHANGELOG.md | 1 + support/build/apache | 12 ++++++++---- support/build/{apache-2.4.20 => apache-2.4.29} | 0 3 files changed, 9 insertions(+), 4 deletions(-) rename support/build/{apache-2.4.20 => apache-2.4.29} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a233533..040fe75de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - ext-mongodb/1.3.1 [David Zuelke] - ext-amqp/1.9.3 [David Zuelke] - ext-phalcon/3.2.4 [David Zuelke] +- Apache/2.4.29 [David Zuelke] ### CHG diff --git a/support/build/apache b/support/build/apache index ee1c0fa89..a55b3ee44 100755 --- a/support/build/apache +++ b/support/build/apache @@ -16,16 +16,20 @@ dep_version=${dep_formula#"${dep_name}-"} dep_package=${dep_name}-${dep_version} dep_dirname=httpd-${dep_version} dep_archive_name=${dep_dirname}.tar.gz -depdeps_archive_name=${dep_dirname}-deps.tar.gz dep_url=https://archive.apache.org/dist/httpd/${dep_archive_name} -depdeps_url=https://archive.apache.org/dist/httpd/${depdeps_archive_name} +apr_url=https://archive.apache.org/dist/apr/apr-1.6.3.tar.gz +aprutil_url=https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.gz dep_manifest=${dep_package}.composer.json echo "-----> Building ${dep_package}..." curl -L ${dep_url} | tar xz -# both of these untar to $dep_dirname -curl -L ${depdeps_url} | tar xz + +mkdir -p ${dep_dirname}/srclib/apr +curl -L ${apr_url} | tar xz --strip-components=1 -C ${dep_dirname}/srclib/apr + +mkdir -p ${dep_dirname}/srclib/apr-util +curl -L ${aprutil_url} | tar xz --strip-components=1 -C ${dep_dirname}/srclib/apr-util pushd ${dep_dirname} ./configure \ diff --git a/support/build/apache-2.4.20 b/support/build/apache-2.4.29 similarity index 100% rename from support/build/apache-2.4.20 rename to support/build/apache-2.4.29 From 505fc819a4d6a234ddcd8e48e0b8c2767edefcc8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 28 Oct 2017 01:58:03 +0200 Subject: [PATCH 067/553] v126 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 040fe75de..8b0b57bb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v126 (2017-10-??) +## v126 (2017-10-29) ### ADD From a63d68ccddd75679db466256800999409c871b6d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 22 Nov 2017 06:07:19 +0100 Subject: [PATCH 068/553] ext-rdkafka/3.0.5 --- CHANGELOG.md | 6 ++++++ .../{rdkafka-3.0.4 => rdkafka-3.0.5} | 0 .../{rdkafka-3.0.4 => rdkafka-3.0.5} | 0 .../{rdkafka-3.0.4 => rdkafka-3.0.5} | 0 .../{rdkafka-3.0.4 => rdkafka-3.0.5} | 0 5 files changed, 6 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{rdkafka-3.0.4 => rdkafka-3.0.5} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{rdkafka-3.0.4 => rdkafka-3.0.5} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{rdkafka-3.0.4 => rdkafka-3.0.5} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{rdkafka-3.0.4 => rdkafka-3.0.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b0b57bb8..faf97266b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v127 (2017-11-??) + +### ADD + +- ext-rdkafka/3.0.5 [David Zuelke] + ## v126 (2017-10-29) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.4 rename to support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.4 rename to support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.4 rename to support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.4 rename to support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 From 9ed1622b515f669a0c22ba47ca3c1abe303ab687 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 22 Nov 2017 06:08:06 +0100 Subject: [PATCH 069/553] ext-mongodb/1.3.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.3.1 => mongodb-1.3.3} | 0 .../no-debug-non-zts-20131226/{mongodb-1.3.1 => mongodb-1.3.3} | 0 .../no-debug-non-zts-20151012/{mongodb-1.3.1 => mongodb-1.3.3} | 0 .../no-debug-non-zts-20160303/{mongodb-1.3.1 => mongodb-1.3.3} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.3.1 => mongodb-1.3.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.3.1 => mongodb-1.3.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.3.1 => mongodb-1.3.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.3.1 => mongodb-1.3.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf97266b..3f30ebec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-rdkafka/3.0.5 [David Zuelke] +- ext-mongodb/1.3.3 [David Zuelke] ## v126 (2017-10-29) diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.1 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.1 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.1 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.1 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.1 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.1 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.1 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.1 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 From 632612359c5b862fefc13476f253bd3af1267f52 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 22 Nov 2017 06:09:01 +0100 Subject: [PATCH 070/553] ext-memcached/3.0.4 --- CHANGELOG.md | 1 + .../{memcached-3.0.3 => memcached-3.0.4} | 0 .../{memcached-3.0.3 => memcached-3.0.4} | 0 3 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{memcached-3.0.3 => memcached-3.0.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{memcached-3.0.3 => memcached-3.0.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f30ebec3..f7a2fc606 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-rdkafka/3.0.5 [David Zuelke] - ext-mongodb/1.3.3 [David Zuelke] +- ext-memcached/3.0.4 [David Zuelke] ## v126 (2017-10-29) diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.3 rename to support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.3 rename to support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 From 7374253a69f833c7148971fadac938e3a8c8d28c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 22 Nov 2017 07:13:28 +0100 Subject: [PATCH 071/553] PHP/7.0.26 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 | 2 +- support/build/{php-7.0.25 => php-7.0.26} | 0 support/build/{php-min-7.0.25 => php-min-7.0.26} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.25 => php-7.0.26} (100%) rename support/build/{php-min-7.0.25 => php-min-7.0.26} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a2fc606..1ced5947b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-rdkafka/3.0.5 [David Zuelke] - ext-mongodb/1.3.3 [David Zuelke] - ext-memcached/3.0.4 [David Zuelke] +- PHP/7.0.26 [David Zuelke] ## v126 (2017-10-29) diff --git a/bin/compile b/bin/compile index 5a40dc774..ec661e0f8 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.25.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.26.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 diff --git a/support/build/composer-1.5.2 b/support/build/composer-1.5.2 index 6c76347c3..15ddf3640 100755 --- a/support/build/composer-1.5.2 +++ b/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.25 +# Build Deps: php-min-7.0.26 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index 7821f371f..f85270762 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index 200831c14..919684f12 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.25 +# Build Deps: php-7.0.26 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 4f1d64bda..554d87018 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.25, libraries/libcassandra-2.7.1 +# Build Deps: php-7.0.26, libraries/libcassandra-2.7.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index de4254d12..e41a35377 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 31d481606..e4b2f0056 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 789f58682..0e2c66a01 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 8ebdb297d..32149c039 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.25, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.26, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 index 7e3958d9d..d010e79c6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index f28c466cb..2399a80c3 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 index 2c55c5d38..5c84def28 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 index fc1c52c9a..25b5a6ac1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 +++ b/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.25, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.26, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 7374a13ea..131f356cc 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index ff7ac2797..f659bc3dd 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.25, libraries/librdkafka-0.11.1 +# Build Deps: php-7.0.26, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 index e0e81c487..6644a9c22 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 +++ b/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.0.25 +# Build Deps: php-7.0.26 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.25 b/support/build/php-7.0.26 similarity index 100% rename from support/build/php-7.0.25 rename to support/build/php-7.0.26 diff --git a/support/build/php-min-7.0.25 b/support/build/php-min-7.0.26 similarity index 100% rename from support/build/php-min-7.0.25 rename to support/build/php-min-7.0.26 From d22c1fff8d02871b87ebf797cfd1dd53ea40eac9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 22 Nov 2017 16:30:41 +0100 Subject: [PATCH 072/553] PHP/7.1.12 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 | 2 +- support/build/{php-7.1.11 => php-7.1.12} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.11 => php-7.1.12} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ced5947b..b8c357f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - ext-mongodb/1.3.3 [David Zuelke] - ext-memcached/3.0.4 [David Zuelke] - PHP/7.0.26 [David Zuelke] +- PHP/7.1.12 [David Zuelke] ## v126 (2017-10-29) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index b0d7bd318..39f91f67b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index a3ea5915a..afdb25fe3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index d9a5c86d0..4a37394c3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.11, libraries/libcassandra-2.7.1 +# Build Deps: php-7.1.12, libraries/libcassandra-2.7.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 2f369e5a3..539143fcb 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index ad614b16e..ee890baa9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index ee431b9f4..8799c2c71 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 65c12f9ff..f3246fb26 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.11, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.12, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 index 46edc817d..878654b29 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index a52563308..e5adfd49e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 index d82dcf2ad..a639b9d8e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 index 5d6323eca..0903a53cc 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 +++ b/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.11, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.12, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 6dd2ec792..dbd03a23d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 56ec51cd3..467f72616 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.11, libraries/librdkafka-0.11.1 +# Build Deps: php-7.1.12, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 index 786dc9c1a..669ffd830 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 +++ b/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.1.11 +# Build Deps: php-7.1.12 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.11 b/support/build/php-7.1.12 similarity index 100% rename from support/build/php-7.1.11 rename to support/build/php-7.1.12 From 7102f91aa2a2bfa8bad6f99ef7cc1bfd8393f7ff Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 22 Nov 2017 16:31:53 +0100 Subject: [PATCH 073/553] drop --enable-gd-native-ttf from php configure unused since PHP 5.5.0, and causes warning in 7.2 --- support/build/php | 1 - 1 file changed, 1 deletion(-) diff --git a/support/build/php b/support/build/php index 907bed73a..c3cff65ed 100755 --- a/support/build/php +++ b/support/build/php @@ -126,7 +126,6 @@ export PATH=${OUT_PREFIX}/bin:$PATH --enable-exif=shared \ --enable-ftp=shared \ --with-gd=shared \ - --enable-gd-native-ttf \ --with-freetype-dir=/usr \ --with-jpeg-dir=/usr \ --with-png-dir=/usr \ From 7a99b00b511125200bc5e9ee2e7ed5e5a03a983b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2017 01:41:40 +0100 Subject: [PATCH 074/553] Fix Heroku\Buildpack\PHP\Downloader::download() signature --- CHANGELOG.md | 4 ++++ support/installer/src/Downloader.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8c357f84..b15bece32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ - PHP/7.0.26 [David Zuelke] - PHP/7.1.12 [David Zuelke] +### FIX + +- Heroku\Buildpack\PHP\Downloader::download() is missing optional third argument [David Zuelke] + ## v126 (2017-10-29) ### ADD diff --git a/support/installer/src/Downloader.php b/support/installer/src/Downloader.php index 210008a0d..f2fc59752 100644 --- a/support/installer/src/Downloader.php +++ b/support/installer/src/Downloader.php @@ -36,7 +36,7 @@ protected function extract($file, $path) // ArchiveDownloader unpacks to a temp dir, then replaces the destination // we can't do that, since we need our contents to be merged into the probably existing folder structure - public function download(PackageInterface $package, $path) + public function download(PackageInterface $package, $path, $output = true) { $temporaryDir = $this->config->get('vendor-dir').'/composer/'.substr(md5(uniqid('', true)), 0, 8); $this->filesystem->ensureDirectoryExists($temporaryDir); From eb35997be18daf00fd332aa0ee4d0a54d2f128ff Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 25 Nov 2017 23:18:03 +0100 Subject: [PATCH 075/553] fix #247: composer.js and similar are inaccessible in document root --- CHANGELOG.md | 1 + conf/apache2/heroku.conf | 2 +- conf/nginx/default_include.conf.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b15bece32..9e79273d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ### FIX - Heroku\Buildpack\PHP\Downloader::download() is missing optional third argument [David Zuelke] +- Files like `composer.js` or similar are inaccessible in web root (#247) [David Zuelke] ## v126 (2017-10-29) diff --git a/conf/apache2/heroku.conf b/conf/apache2/heroku.conf index 3e9f5e56c..bf4fcc2d7 100644 --- a/conf/apache2/heroku.conf +++ b/conf/apache2/heroku.conf @@ -29,7 +29,7 @@ Listen ${PORT} # lock it down fully by default # if it's also the docroot, it'll be opened up again further below Require all denied - + # explicitly deny these again, merged with the docroot later Require all denied diff --git a/conf/nginx/default_include.conf.php b/conf/nginx/default_include.conf.php index 23135a5e2..d9687eebc 100644 --- a/conf/nginx/default_include.conf.php +++ b/conf/nginx/default_include.conf.php @@ -3,6 +3,6 @@ } # for people with app root as doc root, restrict access to a few things -location ~ ^/(composer\.|Procfile$|/|/) { +location ~ ^/(composer\.(json|lock|phar)$|Procfile$|/|/) { deny all; } From b3581e9f61caab7a6bd98d5951f2f385475353b7 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2017 01:43:07 +0100 Subject: [PATCH 076/553] PHP/7.2.0 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 5 +++++ .../build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 | 5 +++++ .../extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 5 +++++ .../build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 5 +++++ .../extensions/no-debug-non-zts-20170718/event-2.3.0 | 5 +++++ .../extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 5 +++++ .../extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 5 +++++ .../extensions/no-debug-non-zts-20170718/mongodb-1.3.3 | 5 +++++ .../extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 5 +++++ .../extensions/no-debug-non-zts-20170718/phalcon-3.2.4 | 5 +++++ .../build/extensions/no-debug-non-zts-20170718/pq-2.1.2 | 5 +++++ .../extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 5 +++++ .../extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 5 +++++ .../extensions/no-debug-non-zts-20170718/redis-3.1.4 | 5 +++++ support/build/php | 8 +++++++- support/build/php-7.2.0 | 5 +++++ 17 files changed, 83 insertions(+), 1 deletion(-) create mode 100755 support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 create mode 100755 support/build/php-7.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e79273d5..3eba406ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - ext-memcached/3.0.4 [David Zuelke] - PHP/7.0.26 [David Zuelke] - PHP/7.1.12 [David Zuelke] +- PHP/7.2.0 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 new file mode 100755 index 000000000..2b32a1fbe --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 new file mode 100755 index 000000000..93c9c738d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 new file mode 100755 index 000000000..e531cf7f6 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0, libraries/libcassandra-2.7.1 + +source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 new file mode 100755 index 000000000..cf6f8e9ea --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 new file mode 100755 index 000000000..487f9a530 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 new file mode 100755 index 000000000..dbbaeb57d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 new file mode 100755 index 000000000..6dd235d2c --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0, libraries/libmemcached-1.0.18 + +source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 new file mode 100755 index 000000000..eeaf4046e --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 new file mode 100755 index 000000000..937ebe711 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 new file mode 100755 index 000000000..0969e5e60 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 new file mode 100755 index 000000000..014e681a9 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0, extensions/no-debug-non-zts-20170718/raphf-2.0.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 new file mode 100755 index 000000000..dce0f8039 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 new file mode 100755 index 000000000..7ae831fcc --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0, libraries/librdkafka-0.11.1 + +source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 new file mode 100755 index 000000000..f43792aaf --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php b/support/build/php index c3cff65ed..2491dd878 100755 --- a/support/build/php +++ b/support/build/php @@ -25,6 +25,8 @@ if [[ $dep_version == *alpha* ]] || [[ $dep_version == *beta* ]] || [[ $dep_vers dep_url=https://downloads.php.net/~ab/${dep_archive_name} elif [[ $dep_version == 7.1.* ]]; then dep_url=https://downloads.php.net/~krakjoe/${dep_archive_name} + elif [[ $dep_version == 7.2.* ]]; then + dep_url=https://downloads.php.net/~pollita/${dep_archive_name} fi else dep_url=https://php.net/get/${dep_archive_name}/from/this/mirror @@ -90,9 +92,13 @@ fi configureopts= if [[ $dep_version == 7.* ]]; then configureopts="\ ---with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix} \ --enable-opcache-file\ " + if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then + configureopts="\ +--with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix} \ +" + fi else configureopts="\ --with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix} \ diff --git a/support/build/php-7.2.0 b/support/build/php-7.2.0 new file mode 100755 index 000000000..788f4a78c --- /dev/null +++ b/support/build/php-7.2.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: libraries/libc-client-2007f + +source $(dirname $0)/php From 436724ab9bf4364710634114b9d39ee9d5296f29 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 30 Nov 2017 01:51:23 +0100 Subject: [PATCH 077/553] libcassandra/2.8.0 --- CHANGELOG.md | 4 ++++ .../extensions/no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/libraries/libcassandra | 1 - .../libraries/{libcassandra-2.7.1 => libcassandra-2.8.0} | 0 8 files changed, 9 insertions(+), 6 deletions(-) rename support/build/libraries/{libcassandra-2.7.1 => libcassandra-2.8.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eba406ab..5b071c6a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - PHP/7.1.12 [David Zuelke] - PHP/7.2.0 [David Zuelke] +### CHG + +- libcassandra/2.8.0 [David Zuelke] + ### FIX - Heroku\Buildpack\PHP\Downloader::download() is missing optional third argument [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index 07c547b09..cbed6bcdf 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.7.1 +# Build Deps: php-5.5.38, libraries/libcassandra-2.8.0 source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 18ef87fbf..1e8554972 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, libraries/libcassandra-2.7.1 +# Build Deps: php-5.6.32, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 554d87018..e43385218 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.26, libraries/libcassandra-2.7.1 +# Build Deps: php-7.0.26, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 4a37394c3..f0cc2e34f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.12, libraries/libcassandra-2.7.1 +# Build Deps: php-7.1.12, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index e531cf7f6..5abb0729b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0, libraries/libcassandra-2.7.1 +# Build Deps: php-7.2.0, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/libraries/libcassandra b/support/build/libraries/libcassandra index 7f6b993b5..47debfaf9 100755 --- a/support/build/libraries/libcassandra +++ b/support/build/libraries/libcassandra @@ -34,7 +34,6 @@ pushd ${dep_dirname} cmake -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_INSTALL_PREFIX:PATH=${OUT_PREFIX} -DCMAKE_BUILD_TYPE=RELEASE -DCASS_USE_ZLIB=ON -DCMAKE_INSTALL_LIBDIR:PATH=lib . make -s -j9 make install -s -rm ${OUT_PREFIX}/lib/libcassandra_static.a strip --strip-unneeded ${OUT_PREFIX}/lib/libcassandra*.so* popd diff --git a/support/build/libraries/libcassandra-2.7.1 b/support/build/libraries/libcassandra-2.8.0 similarity index 100% rename from support/build/libraries/libcassandra-2.7.1 rename to support/build/libraries/libcassandra-2.8.0 From 402f9f04274d322f117ba1f7d7b9eb9cdec69963 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 30 Nov 2017 09:25:14 +0100 Subject: [PATCH 078/553] remove cmp() usage in sync.sh for Python 3 compat --- support/build/_util/sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/build/_util/sync.sh b/support/build/_util/sync.sh index fad745b21..39471f3b1 100755 --- a/support/build/_util/sync.sh +++ b/support/build/_util/sync.sh @@ -86,7 +86,7 @@ echo "" >&2 # this mkrepo.sh call won't actually download, but use the given *.composer.json, and echo a generated packages.json # we use this to compare to the downloaded packages.json -$here/mkrepo.sh $src_bucket $src_prefix ${src_tmp}/*.composer.json 2>/dev/null | python -c 'import sys, json; sys.exit(abs(cmp(json.load(open(sys.argv[1])), json.load(sys.stdin))))' ${src_tmp}/packages.json || { +$here/mkrepo.sh $src_bucket $src_prefix ${src_tmp}/*.composer.json 2>/dev/null | python -c 'import sys, json; sys.exit(json.load(open(sys.argv[1])) != json.load(sys.stdin))' ${src_tmp}/packages.json || { echo "WARNING: packages.json from source does not match its list of manifests!" >&2 echo " You should run 'mkrepo.sh' to update, or ask the bucket maintainers to do so." >&2 read -p "Would you like to abort this operation? [Yn] " proceed @@ -140,7 +140,7 @@ for filename in $common; do # 5 = content identical, src_time < dst_time (probably needs sync the other way) # 7 = content different, src_time < dst_time (probably needs sync the other way) ret = 1 - ret = ret | abs(cmp(src_manifest, dst_manifest))<<1 + ret = ret | (src_manifest != dst_manifest)<<1 ret = ret | (src_time < dst_time)<<2 sys.exit(ret) PYTHON From 8ee088019cd1b0f67314762840077ac6b1bd1389 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 30 Nov 2017 09:33:16 +0100 Subject: [PATCH 079/553] fix Python 3 except syntax --- support/build/_util/sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/build/_util/sync.sh b/support/build/_util/sync.sh index 39471f3b1..ffe3d4e5c 100755 --- a/support/build/_util/sync.sh +++ b/support/build/_util/sync.sh @@ -123,12 +123,12 @@ for filename in $common; do # same for times, but we'll look at them try: src_time = datetime.datetime.strptime(src_manifest.pop("time"), "%Y-%m-%d %H:%M:%S") # UTC - except KeyError, ValueError: + except (KeyError, ValueError): src_time = datetime.datetime.utcfromtimestamp(os.path.getmtime(sys.argv[1])) stderrprint("WARNING: source manifest {} has invalid time entry, using mtime: {}".format(os.path.basename(sys.argv[1]), src_time.isoformat())) try: dst_time = datetime.datetime.strptime(dst_manifest.pop("time"), "%Y-%m-%d %H:%M:%S") # UTC - except KeyError, ValueError: + except (KeyError, ValueError): dst_time = datetime.datetime.utcfromtimestamp(os.path.getmtime(sys.argv[2])) stderrprint("WARNING: destination manifest {} has invalid time entry, using mtime: {}".format(os.path.basename(sys.argv[2]), dst_time.isoformat())) # a newer source time means we will copy From b97556a7d515dde7f3d657113b06911e77465612 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 30 Nov 2017 16:49:53 +0100 Subject: [PATCH 080/553] v127 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b071c6a6..b40637242 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v127 (2017-11-??) +## v127 (2017-11-30) ### ADD From 56159b22f8ebaab7661b28cab76b616359d8ec65 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:20:37 +0100 Subject: [PATCH 081/553] PHP/5.6.33 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../extensions/no-debug-non-zts-20131226/mongodb-1.3.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-3.2.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-3.1.4 | 2 +- support/build/{php-5.6.32 => php-5.6.33} | 0 18 files changed, 22 insertions(+), 16 deletions(-) rename support/build/{php-5.6.32 => php-5.6.33} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b40637242..8b3153847 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v128 (2018-01-04) + +### ADD + +- PHP/5.6.33 [David Zuelke] + ## v127 (2017-11-30) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index 018ee3625..ac4f7e5eb 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 522cf72d4..74b67c68a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 1e8554972..4733817bc 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, libraries/libcassandra-2.8.0 +# Build Deps: php-5.6.33, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 985f98225..ae59cb12a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index 8ca670441..4b808c83a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index e5c8dfe42..7c9d97d91 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 8f9dee135..c055b7313 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.33, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index b1f735f6b..88be2c5fd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 index 3f9e878de..5077300d3 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 23dcfbd1b..a9236685a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index f332da3ba..9b5b44216 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 index f332da3ba..9b5b44216 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 99706266d..ff3f05a55 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.33, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 377e0f0ea..37d10fc23 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 1ceab1bb8..2dedfa87b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32, libraries/librdkafka-0.11.1 +# Build Deps: php-5.6.33, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 index 3a6c1a9c5..bf17d4b86 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.32 +# Build Deps: php-5.6.33 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.32 b/support/build/php-5.6.33 similarity index 100% rename from support/build/php-5.6.32 rename to support/build/php-5.6.33 From 19748417ae7133c4b5fee5bfaabc965a006ac390 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:21:57 +0100 Subject: [PATCH 082/553] PHP/7.0.27 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 | 2 +- support/build/{php-7.0.26 => php-7.0.27} | 0 support/build/{php-min-7.0.26 => php-min-7.0.27} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.26 => php-7.0.27} (100%) rename support/build/{php-min-7.0.26 => php-min-7.0.27} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b3153847..acbacead9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/5.6.33 [David Zuelke] +- PHP/7.0.27 [David Zuelke] ## v127 (2017-11-30) diff --git a/bin/compile b/bin/compile index ec661e0f8..0156338b0 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.26.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.27.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 diff --git a/support/build/composer-1.5.2 b/support/build/composer-1.5.2 index 15ddf3640..89843e9f6 100755 --- a/support/build/composer-1.5.2 +++ b/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.26 +# Build Deps: php-min-7.0.27 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index f85270762..d4a60ebe9 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 index 919684f12..922ba1011 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 +++ b/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.26 +# Build Deps: php-7.0.27 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index e43385218..8ae3dc6b6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.26, libraries/libcassandra-2.8.0 +# Build Deps: php-7.0.27, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index e41a35377..b3345e6f0 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index e4b2f0056..237bc85c2 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 0e2c66a01..23c763c04 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 32149c039..52321a858 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.26, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.27, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 index d010e79c6..be326d8e8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 2399a80c3..b8010c34c 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 index 5c84def28..1840cb787 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 index 25b5a6ac1..a9760e593 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 +++ b/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.26, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.27, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 131f356cc..b17ba21fc 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index f659bc3dd..36ad7d367 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.26, libraries/librdkafka-0.11.1 +# Build Deps: php-7.0.27, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 index 6644a9c22..8877e289f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 +++ b/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.0.26 +# Build Deps: php-7.0.27 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.26 b/support/build/php-7.0.27 similarity index 100% rename from support/build/php-7.0.26 rename to support/build/php-7.0.27 diff --git a/support/build/php-min-7.0.26 b/support/build/php-min-7.0.27 similarity index 100% rename from support/build/php-min-7.0.26 rename to support/build/php-min-7.0.27 From ca711bec9b58b03422767bb0442726e724bf16c8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:23:11 +0100 Subject: [PATCH 083/553] PHP/7.1.13 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 | 2 +- support/build/{php-7.1.12 => php-7.1.13} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.12 => php-7.1.13} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index acbacead9..6491653b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/5.6.33 [David Zuelke] - PHP/7.0.27 [David Zuelke] +- PHP/7.1.13 [David Zuelke] ## v127 (2017-11-30) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 39f91f67b..5c6a7bc2b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 index afdb25fe3..512e1656b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 +++ b/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.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index f0cc2e34f..730b677b6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.12, libraries/libcassandra-2.8.0 +# Build Deps: php-7.1.13, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 539143fcb..16911e8df 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index ee890baa9..dfb1bf780 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 8799c2c71..95e815839 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index f3246fb26..70d6ba275 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.12, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.13, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 index 878654b29..33d30aa37 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index e5adfd49e..38edd0b70 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 index a639b9d8e..0bdcfd0a6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 index 0903a53cc..4d0cff786 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 +++ b/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.12, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.13, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index dbd03a23d..2d4c49a93 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 467f72616..15839bb53 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.12, libraries/librdkafka-0.11.1 +# Build Deps: php-7.1.13, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 index 669ffd830..e64a46665 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 +++ b/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.1.12 +# Build Deps: php-7.1.13 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.12 b/support/build/php-7.1.13 similarity index 100% rename from support/build/php-7.1.12 rename to support/build/php-7.1.13 From 4595fc0cf9efc571b99f5e189b790a8e8f402442 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:25:02 +0100 Subject: [PATCH 084/553] PHP/7.2.1 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 | 2 +- support/build/{php-7.2.0 => php-7.2.1} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.2.0 => php-7.2.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6491653b4..a96d3cd67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/5.6.33 [David Zuelke] - PHP/7.0.27 [David Zuelke] - PHP/7.1.13 [David Zuelke] +- PHP/7.2.1 [David Zuelke] ## v127 (2017-11-30) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 2b32a1fbe..8937d9be3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 index 93c9c738d..467236baa 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 5abb0729b..49ee623dc 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0, libraries/libcassandra-2.8.0 +# Build Deps: php-7.2.1, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index cf6f8e9ea..3f715a0fa 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index 487f9a530..cfcaa28fb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index dbbaeb57d..12ee52352 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index 6dd235d2c..2126bfcad 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.1, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 index eeaf4046e..a292b733e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 937ebe711..3d4d5ef8e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 index 0969e5e60..7303e8dfb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 index 014e681a9..7e184a9b9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.1, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index dce0f8039..9426ebee4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 7ae831fcc..b8e74aa2a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0, libraries/librdkafka-0.11.1 +# Build Deps: php-7.2.1, libraries/librdkafka-0.11.1 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 index f43792aaf..91bdd2090 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.0 +# Build Deps: php-7.2.1 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.0 b/support/build/php-7.2.1 similarity index 100% rename from support/build/php-7.2.0 rename to support/build/php-7.2.1 From a8d43b5d4bb2e4b818afa26f401b881364d5f2eb Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:28:03 +0100 Subject: [PATCH 085/553] Composer/1.6.0 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.5.2 => composer-1.6.0} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.5.2 => composer-1.6.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a96d3cd67..918643d88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ - PHP/7.1.13 [David Zuelke] - PHP/7.2.1 [David Zuelke] +### CHG + +- Composer/1.6.0 [David Zuelke] + ## v127 (2017-11-30) ### ADD diff --git a/bin/compile b/bin/compile index 0156338b0..26bddb262 100755 --- 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 --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." +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.6.0.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 diff --git a/support/build/composer-1.5.2 b/support/build/composer-1.6.0 similarity index 100% rename from support/build/composer-1.5.2 rename to support/build/composer-1.6.0 From 72438a6ee877bb1cc2a9be2834152788b3766aec Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:37:46 +0100 Subject: [PATCH 086/553] ext-blackfire/1.18.0 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20121212/blackfire | 3 +++ support/build/extensions/no-debug-non-zts-20170718/blackfire | 4 ++++ .../extensions/no-debug-non-zts-20170718/blackfire-1.18.0 | 4 ++++ 4 files changed, 12 insertions(+) create mode 100755 support/build/extensions/no-debug-non-zts-20170718/blackfire create mode 100755 support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 918643d88..bfb015838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.27 [David Zuelke] - PHP/7.1.13 [David Zuelke] - PHP/7.2.1 [David Zuelke] +- ext-blackfire/1.18.0 for PHP 7.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire b/support/build/extensions/no-debug-non-zts-20121212/blackfire index bbb3e6acc..4f9f9b320 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/blackfire +++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire @@ -26,6 +26,9 @@ case ${ZEND_MODULE_API_VERSION} in 20160303) series=7.1 ;; + 20170718) + series=7.2 + ;; *) echo "Unsupported PHP/Zend Module API version: ${ZEND_MODULE_API_VERSION}" exit 1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire b/support/build/extensions/no-debug-non-zts-20170718/blackfire new file mode 100755 index 000000000..153289a11 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/blackfire @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ + +source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.0 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.0 new file mode 100755 index 000000000..e093375c3 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.0 @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ + +source $(dirname $0)/blackfire From 2ba715c7324b872bcd0d56a33be0eefa92299562 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:42:46 +0100 Subject: [PATCH 087/553] librdkafka/0.11.3 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../build/libraries/{librdkafka-0.11.1 => librdkafka-0.11.3} | 0 7 files changed, 6 insertions(+), 5 deletions(-) rename support/build/libraries/{librdkafka-0.11.1 => librdkafka-0.11.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfb015838..26f1d80bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ### CHG - Composer/1.6.0 [David Zuelke] +- librdkafka/0.11.3 [David Zuelke] ## v127 (2017-11-30) diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index 65ed3485f..a60e0ac73 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.11.1 +# Build Deps: php-5.5.38, libraries/librdkafka-0.11.3 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 2dedfa87b..cf313f1b3 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33, libraries/librdkafka-0.11.1 +# Build Deps: php-5.6.33, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 36ad7d367..f5b17f3d4 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27, libraries/librdkafka-0.11.1 +# Build Deps: php-7.0.27, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 15839bb53..d62508017 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13, libraries/librdkafka-0.11.1 +# Build Deps: php-7.1.13, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index b8e74aa2a..e46f250a4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1, libraries/librdkafka-0.11.1 +# Build Deps: php-7.2.1, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.11.1 b/support/build/libraries/librdkafka-0.11.3 similarity index 100% rename from support/build/libraries/librdkafka-0.11.1 rename to support/build/libraries/librdkafka-0.11.3 From 849abb705ced7ae37502641c263551ba097d7b06 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:43:47 +0100 Subject: [PATCH 088/553] ext-apcu/5.1.9 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20151012/{apcu-5.1.8 => apcu-5.1.9} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.8 => apcu-5.1.9} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.8 => apcu-5.1.9} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.8 => apcu-5.1.9} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.8 => apcu-5.1.9} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.8 => apcu-5.1.9} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26f1d80bf..0b878c6bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.13 [David Zuelke] - PHP/7.2.1 [David Zuelke] - ext-blackfire/1.18.0 for PHP 7.2 [David Zuelke] +- ext-apcu/5.1.9 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.8 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.8 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.8 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 From 05f8cce29f42f9fa4d5edf0adb160cadbbe67ba1 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:45:07 +0100 Subject: [PATCH 089/553] ext-mongodb/1.3.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.3.3 => mongodb-1.3.4} | 0 .../no-debug-non-zts-20131226/{mongodb-1.3.3 => mongodb-1.3.4} | 0 .../no-debug-non-zts-20151012/{mongodb-1.3.3 => mongodb-1.3.4} | 0 .../no-debug-non-zts-20160303/{mongodb-1.3.3 => mongodb-1.3.4} | 0 .../no-debug-non-zts-20170718/{mongodb-1.3.3 => mongodb-1.3.4} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.3.3 => mongodb-1.3.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.3.3 => mongodb-1.3.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.3.3 => mongodb-1.3.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.3.3 => mongodb-1.3.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.3.3 => mongodb-1.3.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b878c6bc..3429a9de4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - PHP/7.2.1 [David Zuelke] - ext-blackfire/1.18.0 for PHP 7.2 [David Zuelke] - ext-apcu/5.1.9 [David Zuelke] +- ext-mongodb/1.3.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.3 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.3 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.3 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.3 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.3 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 From 12cd56bd5c3c911f39f7472cd21bd2bd3c89b113 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:46:42 +0100 Subject: [PATCH 090/553] ext-phalcon/3.3.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.2.4 => phalcon-3.3.0} | 0 .../no-debug-non-zts-20131226/{phalcon-3.2.4 => phalcon-3.3.0} | 0 .../no-debug-non-zts-20151012/{phalcon-3.2.4 => phalcon-3.3.0} | 0 .../no-debug-non-zts-20160303/{phalcon-3.2.4 => phalcon-3.3.0} | 0 .../no-debug-non-zts-20170718/{phalcon-3.2.4 => phalcon-3.3.0} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.2.4 => phalcon-3.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.2.4 => phalcon-3.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.2.4 => phalcon-3.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.2.4 => phalcon-3.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.2.4 => phalcon-3.3.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3429a9de4..e8eaf287a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - ext-blackfire/1.18.0 for PHP 7.2 [David Zuelke] - ext-apcu/5.1.9 [David Zuelke] - ext-mongodb/1.3.4 [David Zuelke] +- ext-phalcon/3.3.0 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.2.4 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.2.4 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.2.4 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.2.4 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.2.4 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.0 From 036f28f4540bcaf8f45a644ab3b48bf85ba220ce Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Jan 2018 13:47:33 +0100 Subject: [PATCH 091/553] ext-redis/3.1.6 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{redis-3.1.4 => redis-3.1.6} | 0 .../no-debug-non-zts-20131226/{redis-3.1.4 => redis-3.1.6} | 0 .../no-debug-non-zts-20151012/{redis-3.1.4 => redis-3.1.6} | 0 .../no-debug-non-zts-20160303/{redis-3.1.4 => redis-3.1.6} | 0 .../no-debug-non-zts-20170718/{redis-3.1.4 => redis-3.1.6} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-3.1.4 => redis-3.1.6} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-3.1.4 => redis-3.1.6} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-3.1.4 => redis-3.1.6} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-3.1.4 => redis-3.1.6} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{redis-3.1.4 => redis-3.1.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8eaf287a..f792a92c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - ext-apcu/5.1.9 [David Zuelke] - ext-mongodb/1.3.4 [David Zuelke] - ext-phalcon/3.3.0 [David Zuelke] +- ext-redis/3.1.6 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-3.1.4 rename to support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-3.1.4 rename to support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-3.1.4 rename to support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-3.1.4 rename to support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/redis-3.1.4 rename to support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 From 8e16fb8defd2d63afb5fb6545e13bafcc91416e5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 10 Jan 2018 18:31:15 +0100 Subject: [PATCH 092/553] Composer/1.6.2 --- CHANGELOG.md | 6 ++++++ bin/compile | 2 +- support/build/{composer-1.6.0 => composer-1.6.2} | 0 3 files changed, 7 insertions(+), 1 deletion(-) rename support/build/{composer-1.6.0 => composer-1.6.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f792a92c2..37ff69e03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v129 (2018-01-10) + +### CHG + +- Composer/1.6.2 [David Zuelke] + ## v128 (2018-01-04) ### ADD diff --git a/bin/compile b/bin/compile index 26bddb262..b6c5c6b3f 100755 --- 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 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.6.0.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.6.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 diff --git a/support/build/composer-1.6.0 b/support/build/composer-1.6.2 similarity index 100% rename from support/build/composer-1.6.0 rename to support/build/composer-1.6.2 From 17aa2307f0c6c44a68b21edf6dd3717ecd3390cf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 10 Jan 2018 18:36:25 +0100 Subject: [PATCH 093/553] ext-phalcon/3.3.1 --- CHANGELOG.md | 4 ++++ .../{phalcon-3.3.0 => phalcon-3.3.1} | 0 .../{phalcon-3.3.0 => phalcon-3.3.1} | 0 .../{phalcon-3.3.0 => phalcon-3.3.1} | 0 .../{phalcon-3.3.0 => phalcon-3.3.1} | 0 .../{phalcon-3.3.0 => phalcon-3.3.1} | 0 6 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.3.0 => phalcon-3.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.3.0 => phalcon-3.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.3.0 => phalcon-3.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.3.0 => phalcon-3.3.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.3.0 => phalcon-3.3.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ff69e03..0a0e50157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v129 (2018-01-10) +### ADD + +- ext-phalcon/3.3.1 [David Zuelke] + ### CHG - Composer/1.6.2 [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.0 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.0 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.0 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.0 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.0 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.0 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.0 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.0 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.0 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.0 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 From 61535e1b34edb9d155554e9e1277619ae30ed18c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 10 Jan 2018 18:37:34 +0100 Subject: [PATCH 094/553] ext-pq/2.1.3 --- CHANGELOG.md | 1 + .../extensions/no-debug-non-zts-20151012/{pq-2.1.2 => pq-2.1.3} | 0 .../extensions/no-debug-non-zts-20160303/{pq-2.1.2 => pq-2.1.3} | 0 .../extensions/no-debug-non-zts-20170718/{pq-2.1.2 => pq-2.1.3} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{pq-2.1.2 => pq-2.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{pq-2.1.2 => pq-2.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{pq-2.1.2 => pq-2.1.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a0e50157..1e16996ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-phalcon/3.3.1 [David Zuelke] +- ext-pq/2.1.3 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/pq-2.1.2 rename to support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/pq-2.1.2 rename to support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/pq-2.1.2 rename to support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 From 1f046e8919a48d288ae3cfa426c07745994ca259 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 11 Jan 2018 12:57:36 +0100 Subject: [PATCH 095/553] ext-newrelic/7.7.0.203 --- CHANGELOG.md | 6 ++++++ support/build/extensions/no-debug-non-zts-20121212/newrelic | 3 +++ .../{newrelic-7.6.0.201 => newrelic-7.7.0.203} | 0 .../{newrelic-7.6.0.201 => newrelic-7.7.0.203} | 0 .../{newrelic-7.6.0.201 => newrelic-7.7.0.203} | 0 .../{newrelic-7.6.0.201 => newrelic-7.7.0.203} | 0 .../extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 | 4 ++++ 7 files changed, 13 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-7.6.0.201 => newrelic-7.7.0.203} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-7.6.0.201 => newrelic-7.7.0.203} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-7.6.0.201 => newrelic-7.7.0.203} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-7.6.0.201 => newrelic-7.7.0.203} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e16996ac..b7ee4161c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v130 (2018-01-11) + +### ADD + +- ext-newrelic/7.7.0.203 [David Zuelke] + ## v129 (2018-01-10) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index caf012516..467fb1639 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -33,6 +33,9 @@ case ${ZEND_MODULE_API_VERSION} in 20160303) series=7.1 ;; + 20170718) + series=7.2 + ;; esac dep_manifest=${dep_package}_php-$series.composer.json diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.6.0.201 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.7.0.203 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-7.6.0.201 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-7.7.0.203 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.6.0.201 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.7.0.203 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-7.6.0.201 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-7.7.0.203 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.6.0.201 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.7.0.203 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-7.6.0.201 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-7.7.0.203 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.6.0.201 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.7.0.203 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-7.6.0.201 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-7.7.0.203 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 new file mode 100755 index 000000000..42faa757d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ + +source $(dirname $0)/../no-debug-non-zts-20121212/newrelic From 1dcee60bafade2877033fff3a228455b5a38b240 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 5 Feb 2018 02:40:52 +0100 Subject: [PATCH 096/553] PHP/7.1.14 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../extensions/no-debug-non-zts-20160303/mongodb-1.3.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../extensions/no-debug-non-zts-20160303/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/{php-7.1.13 => php-7.1.14} | 0 16 files changed, 20 insertions(+), 14 deletions(-) rename support/build/{php-7.1.13 => php-7.1.14} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7ee4161c..f67849645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v131 (2018-02-??) + +### ADD + +- PHP/7.1.14 [David Zuelke] + ## v130 (2018-01-11) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 5c6a7bc2b..354d1ba31 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 index 512e1656b..c55660c48 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 730b677b6..4bf89b479 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.13, libraries/libcassandra-2.8.0 +# Build Deps: php-7.1.14, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 16911e8df..3b1f344ae 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index dfb1bf780..c2fd0c193 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 95e815839..73f7aebb0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 70d6ba275..1e5f07fad 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.14, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 index 33d30aa37..8d975ba4d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 38edd0b70..612fafe2e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 index 0bdcfd0a6..f71de1285 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 index 4d0cff786..5fb8ea41d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.14, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 2d4c49a93..08a0bf5e9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index d62508017..aebe30cfc 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13, libraries/librdkafka-0.11.3 +# Build Deps: php-7.1.14, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index e64a46665..e99a13aca 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.13 +# Build Deps: php-7.1.14 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.13 b/support/build/php-7.1.14 similarity index 100% rename from support/build/php-7.1.13 rename to support/build/php-7.1.14 From 01f9e2cd1390991792886459472962dc66bab350 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 5 Feb 2018 02:44:58 +0100 Subject: [PATCH 097/553] PHP/7.2.2 --- CHANGELOG.md | 5 +++++ .../extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- .../extensions/no-debug-non-zts-20170718/apcu-5.1.9 | 2 +- .../no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../extensions/no-debug-non-zts-20170718/mongodb-1.3.4 | 2 +- .../extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../extensions/no-debug-non-zts-20170718/phalcon-3.3.1 | 2 +- .../extensions/no-debug-non-zts-20170718/pq-2.1.3 | 2 +- .../extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/php | 10 ++++++++++ support/build/{php-7.2.1 => php-7.2.2} | 0 17 files changed, 29 insertions(+), 14 deletions(-) rename support/build/{php-7.2.1 => php-7.2.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f67849645..dea9246e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ ### ADD - PHP/7.1.14 [David Zuelke] +- PHP/7.2.2 [David Zuelke] + +### CHG + +- Enable ext-sodium for PHP 7.2 on stack heroku-16 [David Zuelke] ## v130 (2018-01-11) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 8937d9be3..6952bca1b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 index 467236baa..f8ed6dc39 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 49ee623dc..e7aa15816 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1, libraries/libcassandra-2.8.0 +# Build Deps: php-7.2.2, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 3f715a0fa..e4f918d3e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index cfcaa28fb..e08b25ce9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 12ee52352..5b4fb24b6 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index 2126bfcad..3f788cf8b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.2, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 index a292b733e..b494ad228 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 3d4d5ef8e..19cb66dd2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 index 7303e8dfb..1defe09b6 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 index 7e184a9b9..27cbbd6a3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.2, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 9426ebee4..adb1819a8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index e46f250a4..2e5826978 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1, libraries/librdkafka-0.11.3 +# Build Deps: php-7.2.2, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 91bdd2090..97db29eda 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.1 +# Build Deps: php-7.2.2 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php b/support/build/php index 2491dd878..a93c3c6c1 100755 --- a/support/build/php +++ b/support/build/php @@ -45,6 +45,9 @@ if [[ $STACK == "cedar-14" ]]; then fi # we need libgmp for GMP, libpam0g for IMAP, libicu for intl, libsasl2/krb/ldap for LDAP needed=( libgmp10 libpam0g $libicu libsasl2-2 libkrb5-3 libldap-2.4-2 ) +if [[ $STACK != "cedar-14" ]]; then + needed+=( libsodium18 ) +fi missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then echo "Error! Missing libraries: $missing" @@ -52,6 +55,9 @@ if [[ "$missing" ]]; then fi # we need libgmp-dev for GMP, libpam0g-dev for IMAP, libicu-dev for intl, libsasl2/krb5/ldap2-dev for LDAP needed=( libgmp-dev libpam0g-dev libicu-dev libsasl2-dev libkrb5-dev libldap2-dev ) +if [[ $STACK != "cedar-14" ]]; then + needed+=( libsodium-dev ) +fi missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } @@ -97,6 +103,10 @@ if [[ $dep_version == 7.* ]]; then if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then configureopts="\ --with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix} \ +" + elif [[ $STACK != "cedar-14" ]]; then + configureopts="\ +--with-sodium=shared \ " fi else diff --git a/support/build/php-7.2.1 b/support/build/php-7.2.2 similarity index 100% rename from support/build/php-7.2.1 rename to support/build/php-7.2.2 From cade0f7f0bb8359d1f7590c01cf9df796beb2199 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 5 Feb 2018 03:02:37 +0100 Subject: [PATCH 098/553] ext-blackfire/1.18.2 --- CHANGELOG.md | 1 + .../{blackfire-1.18.0 => blackfire-1.18.2} | 0 .../{blackfire-1.18.0 => blackfire-1.18.2} | 0 .../{blackfire-1.18.0 => blackfire-1.18.2} | 0 .../{blackfire-1.18.0 => blackfire-1.18.2} | 0 .../{blackfire-1.18.0 => blackfire-1.18.2} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.18.0 => blackfire-1.18.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.18.0 => blackfire-1.18.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.18.0 => blackfire-1.18.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.18.0 => blackfire-1.18.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.18.0 => blackfire-1.18.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dea9246e6..83f33acc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.1.14 [David Zuelke] - PHP/7.2.2 [David Zuelke] +- ext-blackfire/1.18.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.0 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.0 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.0 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.0 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.0 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.0 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.0 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.0 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.0 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.0 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.2 From 9d8d3785a91e661c1de26c65ae9b5819fe97adf7 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 5 Feb 2018 03:04:34 +0100 Subject: [PATCH 099/553] Composer/1.6.3 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{composer-1.6.2 => composer-1.6.3} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{composer-1.6.2 => composer-1.6.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83f33acc2..975660ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### CHG - Enable ext-sodium for PHP 7.2 on stack heroku-16 [David Zuelke] +- Composer/1.6.3 [David Zuelke] ## v130 (2018-01-11) diff --git a/bin/compile b/bin/compile index b6c5c6b3f..15df4331a 100755 --- 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 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.6.2.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.6.3.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 diff --git a/support/build/composer-1.6.2 b/support/build/composer-1.6.3 similarity index 100% rename from support/build/composer-1.6.2 rename to support/build/composer-1.6.3 From 19f8ba672ff3b9ec7d1d7becd2f9a021bc376534 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 12 Feb 2018 14:45:10 +0100 Subject: [PATCH 100/553] ext-mongodb/1.4.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.3.4 => mongodb-1.4.0} | 0 .../no-debug-non-zts-20131226/{mongodb-1.3.4 => mongodb-1.4.0} | 0 .../no-debug-non-zts-20151012/{mongodb-1.3.4 => mongodb-1.4.0} | 0 .../no-debug-non-zts-20160303/{mongodb-1.3.4 => mongodb-1.4.0} | 0 .../no-debug-non-zts-20170718/{mongodb-1.3.4 => mongodb-1.4.0} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.3.4 => mongodb-1.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.3.4 => mongodb-1.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.3.4 => mongodb-1.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.3.4 => mongodb-1.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.3.4 => mongodb-1.4.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 975660ca2..ccc9d08de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.1.14 [David Zuelke] - PHP/7.2.2 [David Zuelke] - ext-blackfire/1.18.2 [David Zuelke] +- ext-mongodb/1.4.0 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.3.4 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.3.4 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.3.4 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.3.4 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.3.4 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 From 084914998373ffa118c520da7034fa38bdd4eef6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 12 Feb 2018 18:45:51 +0100 Subject: [PATCH 101/553] skip LDAP_LIBDIR lookup path patch for upcoming PHP 7.1.15+ and 7.2.3+ --- support/build/php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/support/build/php b/support/build/php index a93c3c6c1..7a0c8a361 100755 --- a/support/build/php +++ b/support/build/php @@ -71,9 +71,11 @@ if dpkg --compare-versions "$dep_version" "lt" 7.0.16 || dpkg --compare-versions 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 -sed -i 's/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure +if dpkg --compare-versions "$dep_version" "lt" 7.1.15 || dpkg --compare-versions "$dep_version" "eq" 7.2.0 || dpkg --compare-versions "$dep_version" "eq" 7.2.1 || dpkg --compare-versions "$dep_version" "eq" 7.2.2; then + # 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 + sed -i 's/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure +fi # let's see if mcrypt is there, if not then we have to use the vendored one needed=( libmcrypt4 ) From 8cf8199e3c93fcf69b71c3c8d5b6d5bb68d8b7a1 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 12 Feb 2018 20:18:34 +0100 Subject: [PATCH 102/553] Use Linux abstract socket for New Relic daemon communications --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20121212/newrelic | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc9d08de..1ff02fe3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Enable ext-sodium for PHP 7.2 on stack heroku-16 [David Zuelke] - Composer/1.6.3 [David Zuelke] +- Use Linux abstract socket for New Relic daemon communications [David Zuelke] ## v130 (2018-01-11) diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 467fb1639..70c5df9b3 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -71,7 +71,7 @@ if [[ -n "$NEW_RELIC_LICENSE_KEY" ]]; then tail -qF -n 0 /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log 1>&2 & # daemon start - /app/.heroku/php/bin/newrelic-daemon --foreground --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" & + /app/.heroku/php/bin/newrelic-daemon --foreground --port "@newrelic-daemon" --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" & # give it a moment to connect sleep 2 @@ -84,7 +84,8 @@ mkdir -p ${OUT_PREFIX}/etc/php/conf.d cat > ${OUT_PREFIX}/etc/php/conf.d/newrelic.ini-dist <<'EOF' extension = newrelic.so -newrelic.daemon.location = /app/.heroku/php/bin/newrelic-daemon +newrelic.daemon.location = /app/.heroku/php/bin/newrelic- +newrelic.daemon.port = @newrelic-daemon newrelic.loglevel = ${NEW_RELIC_LOG_LEVEL} newrelic.daemon.loglevel = ${NEW_RELIC_LOG_LEVEL} From fee2eaff64f3ce72fbf5835e2a989c66599a7ed6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 13 Feb 2018 00:30:38 +0100 Subject: [PATCH 103/553] v131 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ff02fe3e..60757f050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v131 (2018-02-??) +## v131 (2018-02-12) ### ADD From e17369dedfc842482c1560cf0fddad248854acf2 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 14:54:14 +0100 Subject: [PATCH 104/553] PHP/5.6.34 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../extensions/no-debug-non-zts-20131226/mongodb-1.4.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- support/build/{php-5.6.33 => php-5.6.34} | 0 18 files changed, 22 insertions(+), 16 deletions(-) rename support/build/{php-5.6.33 => php-5.6.34} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60757f050..dd2fbb301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v132 (2018-03-02) + +### ADD + +- PHP/5.6.34 [David Zuelke] + ## v131 (2018-02-12) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index ac4f7e5eb..6eedf295f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 74b67c68a..8a2d8f87d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 4733817bc..8b659e62b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33, libraries/libcassandra-2.8.0 +# Build Deps: php-5.6.34, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index ae59cb12a..210ee2d3c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index 4b808c83a..c95114f68 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 7c9d97d91..b51ccf3bd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index c055b7313..94601fc6a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.34, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index 88be2c5fd..57efaa767 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 index 5077300d3..47cd2ea4f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index a9236685a..9ce7d8bfa 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 9b5b44216..bcf6be24a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 index 9b5b44216..bcf6be24a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index ff3f05a55..b4c63e0e4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.34, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 37d10fc23..81d770241 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index cf313f1b3..5f64d1f2d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33, libraries/librdkafka-0.11.3 +# Build Deps: php-5.6.34, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index bf17d4b86..3c3315be8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.33 +# Build Deps: php-5.6.34 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.33 b/support/build/php-5.6.34 similarity index 100% rename from support/build/php-5.6.33 rename to support/build/php-5.6.34 From b369032aa0be0bc1dfc3786dfea0ae8e4d6d94f9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 14:55:19 +0100 Subject: [PATCH 105/553] PHP/7.0.28 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.6.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/{php-7.0.27 => php-7.0.28} | 0 support/build/{php-min-7.0.27 => php-min-7.0.28} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.27 => php-7.0.28} (100%) rename support/build/{php-min-7.0.27 => php-min-7.0.28} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd2fbb301..f09a58582 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/5.6.34 [David Zuelke] +- PHP/7.0.28 [David Zuelke] ## v131 (2018-02-12) diff --git a/bin/compile b/bin/compile index 15df4331a..7d1ac0965 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ 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.27.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.28.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 diff --git a/support/build/composer-1.6.3 b/support/build/composer-1.6.3 index 89843e9f6..bde1af4bf 100755 --- a/support/build/composer-1.6.3 +++ b/support/build/composer-1.6.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.27 +# Build Deps: php-min-7.0.28 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index d4a60ebe9..a3405c5d4 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 index 922ba1011..6c6ac5508 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27 +# Build Deps: php-7.0.28 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 8ae3dc6b6..2d176595d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.27, libraries/libcassandra-2.8.0 +# Build Deps: php-7.0.28, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index b3345e6f0..f0684f45d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 237bc85c2..5f573e335 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 23c763c04..4fc6791ef 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 52321a858..caec4ac91 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.28, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 index be326d8e8..64c2a0884 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index b8010c34c..b1872a8d6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 index 1840cb787..ce5cb4f8e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 index a9760e593..e681e1cad 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.28, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index b17ba21fc..7529584a5 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index f5b17f3d4..65736453d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27, libraries/librdkafka-0.11.3 +# Build Deps: php-7.0.28, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index 8877e289f..21f21c274 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.27 +# Build Deps: php-7.0.28 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.27 b/support/build/php-7.0.28 similarity index 100% rename from support/build/php-7.0.27 rename to support/build/php-7.0.28 diff --git a/support/build/php-min-7.0.27 b/support/build/php-min-7.0.28 similarity index 100% rename from support/build/php-min-7.0.27 rename to support/build/php-min-7.0.28 From 77bdfd96ac6f56e88ca5cdef0644436a66e5f117 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 14:55:53 +0100 Subject: [PATCH 106/553] PHP/7.1.15 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/{php-7.1.14 => php-7.1.15} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.14 => php-7.1.15} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f09a58582..b57794876 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/5.6.34 [David Zuelke] - PHP/7.0.28 [David Zuelke] +- PHP/7.1.15 [David Zuelke] ## v131 (2018-02-12) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 354d1ba31..c4126c1dc 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 index c55660c48..5c976a1ca 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 4bf89b479..422d84b8c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.14, libraries/libcassandra-2.8.0 +# Build Deps: php-7.1.15, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 3b1f344ae..fc02d1c45 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index c2fd0c193..fb36e5472 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 73f7aebb0..093942c98 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 1e5f07fad..a61fadc60 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.15, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 index 8d975ba4d..e6e8f34d4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 612fafe2e..d453e430f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 index f71de1285..1b133c929 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 index 5fb8ea41d..030f42825 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.15, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 08a0bf5e9..43140932c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index aebe30cfc..c27e5fca6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14, libraries/librdkafka-0.11.3 +# Build Deps: php-7.1.15, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index e99a13aca..72754e838 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.14 +# Build Deps: php-7.1.15 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.14 b/support/build/php-7.1.15 similarity index 100% rename from support/build/php-7.1.14 rename to support/build/php-7.1.15 From 4f1c010dd0bccaedca81519748f2eeb373b0e9fc Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 14:57:49 +0100 Subject: [PATCH 107/553] PHP/7.2.3 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/{php-7.2.2 => php-7.2.3} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.2.2 => php-7.2.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b57794876..e686a27ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/5.6.34 [David Zuelke] - PHP/7.0.28 [David Zuelke] - PHP/7.1.15 [David Zuelke] +- PHP/7.2.3 [David Zuelke] ## v131 (2018-02-12) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 6952bca1b..46fff288d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 index f8ed6dc39..3eb9ee101 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index e7aa15816..4fb47c2bb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2, libraries/libcassandra-2.8.0 +# Build Deps: php-7.2.3, libraries/libcassandra-2.8.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index e4f918d3e..da3309073 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index e08b25ce9..ea3e9b5b7 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 5b4fb24b6..7957ce402 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index 3f788cf8b..325536b0d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.3, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 index b494ad228..b125604b7 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 19cb66dd2..4480f988f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 index 1defe09b6..d29f4120a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 index 27cbbd6a3..bd68dc617 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.3, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index adb1819a8..8cee5e7b8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 2e5826978..29d691fe3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2, libraries/librdkafka-0.11.3 +# Build Deps: php-7.2.3, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 97db29eda..4f442aa1d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.2 +# Build Deps: php-7.2.3 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.2 b/support/build/php-7.2.3 similarity index 100% rename from support/build/php-7.2.2 rename to support/build/php-7.2.3 From 49e4d7d2b35d81de718a77b8fdaa734d139ce7e3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 14:58:53 +0100 Subject: [PATCH 108/553] ext-mongodb/1.4.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.4.0 => mongodb-1.4.1} | 0 .../no-debug-non-zts-20131226/{mongodb-1.4.0 => mongodb-1.4.1} | 0 .../no-debug-non-zts-20151012/{mongodb-1.4.0 => mongodb-1.4.1} | 0 .../no-debug-non-zts-20160303/{mongodb-1.4.0 => mongodb-1.4.1} | 0 .../no-debug-non-zts-20170718/{mongodb-1.4.0 => mongodb-1.4.1} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.4.0 => mongodb-1.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.4.0 => mongodb-1.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.4.0 => mongodb-1.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.4.0 => mongodb-1.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.4.0 => mongodb-1.4.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e686a27ab..221f010ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.28 [David Zuelke] - PHP/7.1.15 [David Zuelke] - PHP/7.2.3 [David Zuelke] +- ext-mongodb/1.4.1 [David Zuelke] ## v131 (2018-02-12) diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.0 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.0 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.0 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.0 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.0 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.1 From f7fd52df6bf8a6875b6cade0762cd91280d97a9b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 15:03:06 +0100 Subject: [PATCH 109/553] ext-apcu/5.1.10 with ext-apcu_bc/1.0.4 --- CHANGELOG.md | 2 ++ support/build/extensions/no-debug-non-zts-20151012/apcu | 2 +- .../no-debug-non-zts-20151012/{apcu-5.1.9 => apcu-5.1.10} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.9 => apcu-5.1.10} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.9 => apcu-5.1.10} | 0 5 files changed, 3 insertions(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.9 => apcu-5.1.10} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.9 => apcu-5.1.10} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.9 => apcu-5.1.10} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 221f010ef..36cb5261b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ - PHP/7.1.15 [David Zuelke] - PHP/7.2.3 [David Zuelke] - ext-mongodb/1.4.1 [David Zuelke] +- ext-apcu/5.1.10 [David Zuelke] +- ext-apcu_bc/1.0.4 [David Zuelke] ## v131 (2018-02-12) diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu b/support/build/extensions/no-debug-non-zts-20151012/apcu index 3bec956a8..998048d8e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu @@ -35,7 +35,7 @@ make install -s popd dep2_name=apcu_bc -dep2_version=1.0.3 +dep2_version=1.0.4 dep2_dirname=${dep2_name}-${dep2_version} dep2_archive_name=${dep2_dirname}.tgz dep2_url=https://pecl.php.net/get/${dep2_archive_name} diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.9 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.10 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.9 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.10 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.10 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.9 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.10 From ebce5ab0483db20b236ddb32e4558c795b7a4631 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 2 Mar 2018 15:04:27 +0100 Subject: [PATCH 110/553] libcassandra/2.8.1 --- CHANGELOG.md | 4 ++++ .../extensions/no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- .../libraries/{libcassandra-2.8.0 => libcassandra-2.8.1} | 0 7 files changed, 9 insertions(+), 5 deletions(-) rename support/build/libraries/{libcassandra-2.8.0 => libcassandra-2.8.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36cb5261b..bf5a1e496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ - ext-apcu/5.1.10 [David Zuelke] - ext-apcu_bc/1.0.4 [David Zuelke] +### CHG + +- libcassandra/2.8.1 [David Zuelke] + ## v131 (2018-02-12) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index cbed6bcdf..7c11ba884 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.8.0 +# Build Deps: php-5.5.38, libraries/libcassandra-2.8.1 source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 8b659e62b..bb886c659 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34, libraries/libcassandra-2.8.0 +# Build Deps: php-5.6.34, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 2d176595d..743ffa314 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.28, libraries/libcassandra-2.8.0 +# Build Deps: php-7.0.28, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 422d84b8c..439bb5606 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.15, libraries/libcassandra-2.8.0 +# Build Deps: php-7.1.15, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 4fb47c2bb..abe46b427 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3, libraries/libcassandra-2.8.0 +# Build Deps: php-7.2.3, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/libraries/libcassandra-2.8.0 b/support/build/libraries/libcassandra-2.8.1 similarity index 100% rename from support/build/libraries/libcassandra-2.8.0 rename to support/build/libraries/libcassandra-2.8.1 From e67ef6bd46525c1771d5bd1a6fdbfc31be0aa789 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 13 Nov 2017 17:00:24 +0100 Subject: [PATCH 111/553] spaces to tabs --- bin/compile | 110 ++--- bin/detect | 5 +- bin/heroku-hhvm-apache2 | 326 +++++++-------- bin/heroku-hhvm-nginx | 326 +++++++-------- bin/heroku-php-apache2 | 382 +++++++++--------- bin/heroku-php-nginx | 382 +++++++++--------- bin/util/autotune.php | 102 ++--- bin/util/blackfire.sh | 22 +- bin/util/common.sh | 74 ++-- bin/util/newrelic.sh | 34 +- composer.json | 36 +- conf/apache2/heroku.conf | 86 ++-- conf/hhvm/php.ini.php | 2 +- conf/nginx/default_include.conf.php | 4 +- conf/nginx/heroku.conf.php | 140 +++---- conf/php/php-fpm.conf | 28 +- support/build/_util/include/manifest.py | 28 +- support/build/_util/include/manifest.sh | 18 +- support/build/apache | 26 +- .../no-debug-non-zts-20121212/blackfire | 12 +- .../no-debug-non-zts-20121212/cassandra | 4 +- .../no-debug-non-zts-20121212/memcached | 58 +-- .../no-debug-non-zts-20121212/newrelic | 42 +- .../extensions/no-debug-non-zts-20131226/amqp | 6 +- .../extensions/no-debug-non-zts-20151012/apcu | 6 +- support/build/extensions/pecl | 4 +- support/build/hhvm | 16 +- support/build/libraries/libc-client | 4 +- support/build/libraries/libcassandra | 4 +- support/build/libraries/libmcrypt | 18 +- support/build/libraries/libmemcached | 46 +-- support/build/libraries/librdkafka | 4 +- support/build/nginx | 24 +- support/build/php | 190 ++++----- support/build/php-min | 48 +-- 35 files changed, 1308 insertions(+), 1309 deletions(-) diff --git a/bin/compile b/bin/compile index 7d1ac0965..55dc3a054 100755 --- a/bin/compile +++ b/bin/compile @@ -30,40 +30,40 @@ cd $build_dir export_env_dir "$env_dir" '^COMPOSER$' if [[ -n ${COMPOSER:-} ]]; then - status "Using '$COMPOSER' (from "'$COMPOSER env var) for installation.' + status "Using '$COMPOSER' (from "'$COMPOSER env var) for installation.' else - export COMPOSER="composer.json" + export COMPOSER="composer.json" fi export COMPOSER_LOCK=$(basename "$COMPOSER" ".json")".lock" # replace .json with .lock if it exists, append .lock otherwise # a bunch of sanity checks first if [[ -s "$COMPOSER" ]]; then - cat "$COMPOSER" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER'; make sure it's valid!" - if [[ ! -f "$COMPOSER_LOCK" ]]; then - cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || error "Your '$COMPOSER' lists dependencies inside 'require', + cat "$COMPOSER" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER'; make sure it's valid!" + if [[ ! -f "$COMPOSER_LOCK" ]]; then + cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || error "Your '$COMPOSER' lists dependencies inside 'require', but no '$COMPOSER_LOCK' was found. Please run 'composer update' to re-generate '$COMPOSER_LOCK' if necessary, and commit it into your repository. For more information, please refer to the docs at https://devcenter.heroku.com/articles/php-support#activation" - else - cat "$COMPOSER_LOCK" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER_LOCK'; make sure it's valid!" - cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || warning "Your '$COMPOSER' contains a non-'stable' setting + else + cat "$COMPOSER_LOCK" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER_LOCK'; make sure it's valid!" + cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || warning "Your '$COMPOSER' contains a non-'stable' setting for 'minimum-stability'. This may cause the installation of unstable versions of runtimes and extensions during this deploy. It is recommended that you always use stability flags instead, even if you have 'prefer-stable' enabled. For more information, see https://getcomposer.org/doc/01-basic-usage.md#stability" - fi + fi else - if [[ ! -f "$COMPOSER" ]]; then - warning "No '$COMPOSER' found. + if [[ ! -f "$COMPOSER" ]]; then + warning "No '$COMPOSER' found. Using 'index.php' to declare app type as PHP is considered legacy functionality and may lead to unexpected behavior." - else - notice "Your '$COMPOSER' is completely empty. + else + notice "Your '$COMPOSER' is completely empty. Please change its contents to at least '{}' so it is valid JSON." - fi - echo "{}" > $COMPOSER + fi + echo "{}" > $COMPOSER fi # PHP expects to be installed in /app/.heroku/php because of compiled paths, let's set that up! @@ -108,7 +108,7 @@ rm $build_dir/.heroku/composer.tar.gz # this alias is just for now while we install platform packages composer() { - /app/.heroku/php-min/bin/php /app/.heroku/php/bin/composer "$@" + /app/.heroku/php-min/bin/php /app/.heroku/php/bin/composer "$@" } export -f composer @@ -140,9 +140,9 @@ export COMPOSER=composer.json export export_file_path=$bp_dir/export export profile_dir_path=$build_dir/.profile.d if composer install -d "$build_dir/.heroku/php" ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} 2>&1 | tee $build_dir/.heroku/php/install.log | grep --line-buffered -E '^ - (Instal|Enab)ling heroku-sys/' | sed -u -E -e 's/^ - (Instal|Enab)ling /- /' -e 's/heroku-sys\///g' | indent; then - : + : else - error "Failed to install system packages. + error "Failed to install system packages. Your platform requirements (for runtimes and extensions) could not be resolved to an installable set of dependencies, or a @@ -166,11 +166,11 @@ refer to: https://devcenter.heroku.com/articles/php-support" fi if composer show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/php 2>/dev/null; then - engine="php" - engine_r="php -r" + engine="php" + engine_r="php -r" elif composer show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/hhvm 2>/dev/null; then - engine="hhvm" - engine_r="hhvm --php -r" + engine="hhvm" + engine_r="hhvm --php -r" fi # done with platform installs; restore COMPOSER from previous value @@ -190,7 +190,7 @@ unset -f composer source $bp_dir/export composer() { - $engine $(which composer) "$@" + $engine $(which composer) "$@" } export -f composer @@ -198,14 +198,14 @@ status "Installing dependencies..." # check if we should use a composer.phar version bundled with the project if [[ -f "composer.phar" ]]; then - [[ -x "composer.phar" ]] || error "File '/composer.phar' isn't executable; please 'chmod +x'!" - $engine_r 'new Phar("composer.phar");' &> /dev/null || error "File '/composer.phar' is not a valid PHAR archive!" - composer() { - $engine composer.phar "$@" - } - export -f composer - composer --version 2>&1 | grep "^Composer version" > /dev/null || error "File '/composer.phar' is not a Composer executable!" - notice_inline "Using '/composer.phar' to install dependencies." + [[ -x "composer.phar" ]] || error "File '/composer.phar' isn't executable; please 'chmod +x'!" + $engine_r 'new Phar("composer.phar");' &> /dev/null || error "File '/composer.phar' is not a valid PHAR archive!" + composer() { + $engine composer.phar "$@" + } + export -f composer + composer --version 2>&1 | grep "^Composer version" > /dev/null || error "File '/composer.phar' is not a Composer executable!" + notice_inline "Using '/composer.phar' to install dependencies." fi # echo composer version for info purposes # tail to get rid of outdated version warnings (Composer sends those to STDOUT instead of STDERR) @@ -213,14 +213,14 @@ composer --version 2> /dev/null | tail -n 1 | indent # throw a notice if people have added their vendor dir to Git; that's bad practice and makes everything slow and cluttered if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" ]]; then - # we should not do this check separately; there is no reliable way of telling whether or not it really is the real Composer bin dir or if it comes from somewhere else - composer_warn_bindir="" - if [[ ! "$composer_bindir/" == "$composer_vendordir"/* && -d "$composer_bindir" ]]; then - composer_warn_bindir=" + # we should not do this check separately; there is no reliable way of telling whether or not it really is the real Composer bin dir or if it comes from somewhere else + composer_warn_bindir="" + if [[ ! "$composer_bindir/" == "$composer_vendordir"/* && -d "$composer_bindir" ]]; then + composer_warn_bindir=" Your Composer bin dir is configured to reside outside of vendor dir, so please repeat the two steps above for '$composer_bindir/'." - fi - warning "Your Composer vendor dir is part of your Git repository. + fi + warning "Your Composer vendor dir is part of your Git repository. This directory should not be under version control; only your '$COMPOSER' and '$COMPOSER_LOCK' files should be added, which will let Composer handle installation of dependencies on deploy. @@ -235,15 +235,15 @@ fi export_env_dir "$env_dir" '^COMPOSER_GITHUB_OAUTH_TOKEN$' COMPOSER_GITHUB_OAUTH_TOKEN=${COMPOSER_GITHUB_OAUTH_TOKEN:-} if [[ -n "$COMPOSER_GITHUB_OAUTH_TOKEN" ]]; then - if curl --fail --silent -H "Authorization: token $COMPOSER_GITHUB_OAUTH_TOKEN" https://api.github.com/rate_limit > /dev/null; then - composer config -g github-oauth.github.com "$COMPOSER_GITHUB_OAUTH_TOKEN" &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) - notice_inline 'Using $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth.' - else - error 'Invalid $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth!' - fi + if curl --fail --silent -H "Authorization: token $COMPOSER_GITHUB_OAUTH_TOKEN" https://api.github.com/rate_limit > /dev/null; then + composer config -g github-oauth.github.com "$COMPOSER_GITHUB_OAUTH_TOKEN" &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) + notice_inline 'Using $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth.' + else + error 'Invalid $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth!' + fi else - # don't forget to remove any stored key if it's gone from the env - composer config -g --unset github-oauth.github.com &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) + # don't forget to remove any stored key if it's gone from the env + composer config -g --unset github-oauth.github.com &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) fi # no need for the token to stay around in the env unset COMPOSER_GITHUB_OAUTH_TOKEN @@ -259,8 +259,8 @@ This package may only be used as a dependency in 'require-dev'!" fi if cat "$COMPOSER" | python -c 'import sys,json; sys.exit("compile" not in json.load(sys.stdin).get("scripts", {}));'; then - status "Running 'composer compile'..." - composer run-script ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --no-interaction compile 2>&1 | indent + status "Running 'composer compile'..." + composer run-script ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --no-interaction compile 2>&1 | indent fi status "Preparing runtime environment..." @@ -285,8 +285,8 @@ ln -fs $relbins . cd $build_dir if [[ ! -f "Procfile" ]]; then - echo "web: heroku-$engine-apache2" > Procfile - notice_inline "No Procfile, using 'web: heroku-$engine-apache2'." + echo "web: heroku-$engine-apache2" > Procfile + notice_inline "No Procfile, using 'web: heroku-$engine-apache2'." fi # write empty WEB_CONCURRENCY.sh to overwrite the defaults logic from a prior buildpack, e.g. Node (all buildpacks use the same filename to allow this) @@ -298,12 +298,12 @@ export COMPOSER=composer.json # unless we're running a CI build... if [[ "${HEROKU_PHP_INSTALL_DEV+CI}" != "CI" ]]; then - status "Checking for additional extensions to install..." - # special treatment for Blackfire; we enable it if we detect a server id and a server token for it - install_blackfire_ext - # special treatment for New Relic; we enable it if we detect a license key for it - install_newrelic_ext - install_newrelic_userini + status "Checking for additional extensions to install..." + # special treatment for Blackfire; we enable it if we detect a server id and a server token for it + install_blackfire_ext + # special treatment for New Relic; we enable it if we detect a license key for it + install_newrelic_ext + install_newrelic_userini fi # done with platform installs; restore COMPOSER from previous value diff --git a/bin/detect b/bin/detect index 8cecf6680..8eabae00b 100755 --- a/bin/detect +++ b/bin/detect @@ -1,8 +1,7 @@ #!/usr/bin/env bash if [[ -f "$1/composer.json" || -f "$1/index.php" ]]; then - echo "PHP" && exit 0 + echo "PHP" && exit 0 else - exit 1 + exit 1 fi - diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2 index e8dae1e60..4e346f305 100755 --- a/bin/heroku-hhvm-apache2 +++ b/bin/heroku-hhvm-apache2 @@ -12,30 +12,30 @@ shopt -s nullglob verbose= php_passthrough() { - local dir=$(dirname "$1") - local file=$(basename "$1") - local out=$(basename "$file" .php) - if [[ "$out" != "$file" ]]; then - [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 - out="$dir/$out" - hhvm "$1" > "$out" - echo "$out" - else - echo "$1" - fi + local dir=$(dirname "$1") + local file=$(basename "$1") + local out=$(basename "$file" .php) + if [[ "$out" != "$file" ]]; then + [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 + out="$dir/$out" + hhvm "$1" > "$out" + echo "$out" + else + echo "$1" + fi } check_exists() { - if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then - echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 - exit 1 - else - echo "$HEROKU_APP_DIR/$1" - fi + if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then + echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 + exit 1 + else + echo "$HEROKU_APP_DIR/$1" + fi } touch_log() { - mkdir -p $(dirname "$1") && touch "$1" + mkdir -p $(dirname "$1") && touch "$1" } print_help() { @@ -102,83 +102,83 @@ optstring=":-:C:c:I:i:l:p:vh" # process flags first while getopts "$optstring" opt; do - case $opt in - -) - case "$OPTARG" in - verbose) - verbose=1 - ;; - help) - print_help 2>&1 - exit 2 - ;; - *) - echo "Invalid option: --$OPTARG" >&2 - exit - ;; - esac - ;; - v) - verbose=1 - ;; - h) - print_help 2>&1 - exit - ;; - esac + case $opt in + -) + case "$OPTARG" in + verbose) + verbose=1 + ;; + help) + print_help 2>&1 + exit 2 + ;; + *) + echo "Invalid option: --$OPTARG" >&2 + exit + ;; + esac + ;; + v) + verbose=1 + ;; + h) + print_help 2>&1 + exit + ;; + esac done OPTIND=1 # start over with options parsing while getopts "$optstring" opt; do - case $opt in - C) - httpd_config_include=$(check_exists "$OPTARG" "C") - ;; - c) - httpd_config=$(check_exists "$OPTARG" "c") - ;; - I) - hhvm_config_extra=$(check_exists "$OPTARG" "I") - ;; - i) - php_config=$(check_exists "$OPTARG" "i") - ;; - l) - logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values - if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) - echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 - exit 1 - fi - for logfile in "${logarg[@]}"; do - if [[ -d "$logfile" ]]; then - echo "-l '$logfile': is a directory" >&2 - exit 1 - fi - touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } - [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 - logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name - done - ;; - p) - PORT="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 2 - ;; - :) - echo "Option -$OPTARG requires an argument" >&2 - exit 2 - ;; - esac + case $opt in + C) + httpd_config_include=$(check_exists "$OPTARG" "C") + ;; + c) + httpd_config=$(check_exists "$OPTARG" "c") + ;; + I) + hhvm_config_extra=$(check_exists "$OPTARG" "I") + ;; + i) + php_config=$(check_exists "$OPTARG" "i") + ;; + l) + logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values + if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) + echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 + exit 1 + fi + for logfile in "${logarg[@]}"; do + if [[ -d "$logfile" ]]; then + echo "-l '$logfile': is a directory" >&2 + exit 1 + fi + touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } + [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 + logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name + done + ;; + p) + PORT="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 2 + ;; + :) + echo "Option -$OPTARG requires an argument" >&2 + exit 2 + ;; + esac done # clear processed arguments shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, + print_help "$0: too many arguments. If you're using options, make sure to list them before any document root argument you're providing." - exit 2 + exit 2 fi # our standard logs @@ -189,84 +189,84 @@ hhvm --php -r 'exit((int)version_compare(HHVM_VERSION, "3.0.1", "<"));' || { ech # make sure we run a local composer.phar if present, or global composer if not composer() { - local composer_bin=$(which ./composer.phar composer | head -n1) - # check if we the composer binary is executable by PHP - if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar - # run it directly; it's probably a bash script or similar (homebrew-php does this) - $composer_bin "$@" - else - hhvm $composer_bin "$@" - fi + local composer_bin=$(which ./composer.phar composer | head -n1) + # check if we the composer binary is executable by PHP + if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar + # run it directly; it's probably a bash script or similar (homebrew-php does this) + $composer_bin "$@" + else + hhvm $composer_bin "$@" + fi } COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export if [[ "$#" == "1" ]]; then - DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" - if [[ ! -d "$DOCUMENT_ROOT" ]]; then - echo "DOCUMENT_ROOT '$1' does not exist" >&2 - exit 1 - else - # strip trailing slashes if present - DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob - if [[ $verbose ]]; then - echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 - else - echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 - fi - fi + DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" + if [[ ! -d "$DOCUMENT_ROOT" ]]; then + echo "DOCUMENT_ROOT '$1' does not exist" >&2 + exit 1 + else + # strip trailing slashes if present + DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob + if [[ $verbose ]]; then + echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 + else + echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 + fi + fi fi function prepare_hhvm_ini() { # we have to do this twice, as the WEB_CONCURRENCY setting is evaluated using PHP code, not ${...} syntax which HHVM does not support; if a value for $1 is passed then it won't echo messages upon second invocation if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then - echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 fi php_configs=( "-c" "$(php_passthrough "$php_config")" ) if [[ -n ${hhvm_config_extra:-} ]]; then - [[ ${1:-} ]] || echo "Using additional HHVM configuration (php.ini) file '${hhvm_config_extra#$HEROKU_APP_DIR/}'" >&2 - php_configs+=( "-c" "$(php_passthrough "$hhvm_config_extra")" ) + [[ ${1:-} ]] || echo "Using additional HHVM configuration (php.ini) file '${hhvm_config_extra#$HEROKU_APP_DIR/}'" >&2 + php_configs+=( "-c" "$(php_passthrough "$hhvm_config_extra")" ) fi } prepare_hhvm_ini if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf"} && $verbose ) ]]; then - echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 + echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 fi httpd_config_include=$(php_passthrough "$httpd_config_include") export HEROKU_PHP_HTTPD_CONFIG_INCLUDE="$httpd_config_include" if [[ -n ${httpd_config:-} || ( ${httpd_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf"} && $verbose) ]]; then - echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 fi httpd_config=$(php_passthrough "$httpd_config") if [[ -z ${WEB_CONCURRENCY:-} ]]; then - maxprocs=$(ulimit -u) - ram="512M" - if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then - echo "Optimizing defaults for PX dyno...." >&2 - ram="6G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then - echo "Optimizing defaults for IX dyno...." >&2 - ram="2560M" - elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then - echo "Optimizing defaults for 2X dyno..." >&2 - ram="1G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then - echo "Optimizing defaults for 1X dyno..." >&2 - elif [[ -n ${DYNO:-} || $verbose ]]; then - echo "No dyno detected; using defaults for 1X..." >&2 - fi - - # determine number of HHVM threads to run - read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php "$ram") # tail, as composer echos outdated version warnings to STDOUT - [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 - export WEB_CONCURRENCY - - echo "${WEB_CONCURRENCY} threads at ${php_memory_limit}B memory limit." >&2 + maxprocs=$(ulimit -u) + ram="512M" + if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then + echo "Optimizing defaults for PX dyno...." >&2 + ram="6G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then + echo "Optimizing defaults for IX dyno...." >&2 + ram="2560M" + elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then + echo "Optimizing defaults for 2X dyno..." >&2 + ram="1G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then + echo "Optimizing defaults for 1X dyno..." >&2 + elif [[ -n ${DYNO:-} || $verbose ]]; then + echo "No dyno detected; using defaults for 1X..." >&2 + fi + + # determine number of HHVM threads to run + read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php "$ram") # tail, as composer echos outdated version warnings to STDOUT + [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 + export WEB_CONCURRENCY + + echo "${WEB_CONCURRENCY} threads at ${php_memory_limit}B memory limit." >&2 else - echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} threads." >&2 + echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} threads." >&2 fi # we changed WEB_CONCURRENCY; now we need to re-evaluate the configs as HHVM doesn't support ${...} syntax, so the configs contain PHP getenv() calls and are templated; we pass an argument to it to avoid it echoing "using HHVM config ..." messages again because that already happened @@ -296,10 +296,10 @@ trap 'trap - TERM EXIT; cleanup; kill -TERM $$' TERM trap 'trap - EXIT; cleanup' EXIT # if FD 1 is a TTY (that's the -t 1 check), trap SIGINT/Ctrl+C, then same procedure as for QUIT and TERM above if [[ -t 1 ]]; then - trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; + trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; # if FD 1 is not a TTY (e.g. when we're run through 'foreman start'), do nothing on SIGINT; the assumption is that the parent will send us a SIGTERM or something when this happens. With the trap above, Ctrl+C-ing out of a 'foreman start' run would trigger the INT trap both in Foreman and here (because Ctrl+C sends SIGINT to the entire process group, but there is no way to tell the two cases apart), and while the trap is still doing its shutdown work triggered by the SIGTERM from the Ctrl+C, Foreman would then send a SIGTERM because that's what it does when it receives a SIGINT itself. else - trap '' INT; + trap '' INT; fi # we are now launching a subshell for each of the tasks (log tail, app server, web server) @@ -317,29 +317,29 @@ fi [[ $verbose ]] && echo "Starting log redirection..." >&2 ( - trap '' INT; - trap 'echo "tail" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - touch "${logs[@]}" - - tail -qF -n 0 "${logs[@]}" 1>&2 & pid=$! - - wait + trap '' INT; + trap 'echo "tail" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + touch "${logs[@]}" + + tail -qF -n 0 "${logs[@]}" 1>&2 & pid=$! + + wait ) & pids+=($!) disown $! echo "Starting hhvm..." >&2 ( - trap '' INT; - trap 'echo "hhvm" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - hhvm --mode server "${php_configs[@]}" & pid=$! - - wait + trap '' INT; + trap 'echo "hhvm" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + hhvm --mode server "${php_configs[@]}" & pid=$! + + wait ) & pids+=($!) disown $! @@ -348,14 +348,14 @@ sleep 2 echo "Starting httpd..." >&2 ( - trap '' INT; - trap 'echo "httpd" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - httpd -D NO_DETACH -c "Include $httpd_config" & pid=$! - - wait + trap '' INT; + trap 'echo "httpd" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + httpd -D NO_DETACH -c "Include $httpd_config" & pid=$! + + wait ) & pids+=($!) disown $! diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index be9a4d38f..3d6bb7570 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -12,30 +12,30 @@ shopt -s nullglob verbose= php_passthrough() { - local dir=$(dirname "$1") - local file=$(basename "$1") - local out=$(basename "$file" .php) - if [[ "$out" != "$file" ]]; then - [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 - out="$dir/$out" - hhvm "$1" > "$out" - echo "$out" - else - echo "$1" - fi + local dir=$(dirname "$1") + local file=$(basename "$1") + local out=$(basename "$file" .php) + if [[ "$out" != "$file" ]]; then + [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 + out="$dir/$out" + hhvm "$1" > "$out" + echo "$out" + else + echo "$1" + fi } check_exists() { - if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then - echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 - exit 1 - else - echo "$HEROKU_APP_DIR/$1" - fi + if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then + echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 + exit 1 + else + echo "$HEROKU_APP_DIR/$1" + fi } touch_log() { - mkdir -p $(dirname "$1") && touch "$1" + mkdir -p $(dirname "$1") && touch "$1" } print_help() { @@ -103,83 +103,83 @@ optstring=":-:C:c:I:i:l:p:vh" # process flags first while getopts "$optstring" opt; do - case $opt in - -) - case "$OPTARG" in - verbose) - verbose=1 - ;; - help) - print_help 2>&1 - exit - ;; - *) - echo "Invalid option: --$OPTARG" >&2 - exit 2 - ;; - esac - ;; - v) - verbose=1 - ;; - h) - print_help 2>&1 - exit - ;; - esac + case $opt in + -) + case "$OPTARG" in + verbose) + verbose=1 + ;; + help) + print_help 2>&1 + exit + ;; + *) + echo "Invalid option: --$OPTARG" >&2 + exit 2 + ;; + esac + ;; + v) + verbose=1 + ;; + h) + print_help 2>&1 + exit + ;; + esac done OPTIND=1 # start over with options parsing while getopts "$optstring" opt; do - case $opt in - C) - nginx_config_include=$(check_exists "$OPTARG" "C") - ;; - c) - nginx_config=$(check_exists "$OPTARG" "c") - ;; - I) - hhvm_config_extra=$(check_exists "$OPTARG" "I") - ;; - i) - php_config=$(check_exists "$OPTARG" "i") - ;; - l) - logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values - if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) - echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 - exit 1 - fi - for logfile in "${logarg[@]}"; do - if [[ -d "$logfile" ]]; then - echo "-l '$logfile': is a directory" >&2 - exit 1 - fi - touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } - [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 - logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name - done - ;; - p) - PORT="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 2 - ;; - :) - echo "Option -$OPTARG requires an argument" >&2 - exit 2 - ;; - esac + case $opt in + C) + nginx_config_include=$(check_exists "$OPTARG" "C") + ;; + c) + nginx_config=$(check_exists "$OPTARG" "c") + ;; + I) + hhvm_config_extra=$(check_exists "$OPTARG" "I") + ;; + i) + php_config=$(check_exists "$OPTARG" "i") + ;; + l) + logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values + if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) + echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 + exit 1 + fi + for logfile in "${logarg[@]}"; do + if [[ -d "$logfile" ]]; then + echo "-l '$logfile': is a directory" >&2 + exit 1 + fi + touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } + [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 + logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name + done + ;; + p) + PORT="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 2 + ;; + :) + echo "Option -$OPTARG requires an argument" >&2 + exit 2 + ;; + esac done # clear processed arguments shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, + print_help "$0: too many arguments. If you're using options, make sure to list them before any document root argument you're providing." - exit 2 + exit 2 fi # our standard logs @@ -189,84 +189,84 @@ hhvm --php -r 'exit((int)version_compare(HHVM_VERSION, "3.0.1", "<"));' || { ech # make sure we run a local composer.phar if present, or global composer if not composer() { - local composer_bin=$(which ./composer.phar composer | head -n1) - # check if we the composer binary is executable by HHVM - if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar - # run it directly; it's probably a bash script or similar (homebrew-php does this) - $composer_bin "$@" - else - hhvm $composer_bin "$@" - fi + local composer_bin=$(which ./composer.phar composer | head -n1) + # check if we the composer binary is executable by HHVM + if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar + # run it directly; it's probably a bash script or similar (homebrew-php does this) + $composer_bin "$@" + else + hhvm $composer_bin "$@" + fi } COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export if [[ "$#" == "1" ]]; then - DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" - if [[ ! -d "$DOCUMENT_ROOT" ]]; then - echo "DOCUMENT_ROOT '$1' does not exist" >&2 - exit 1 - else - # strip trailing slashes if present - DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob - if [[ $verbose ]]; then - echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 - else - echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 - fi - fi + DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" + if [[ ! -d "$DOCUMENT_ROOT" ]]; then + echo "DOCUMENT_ROOT '$1' does not exist" >&2 + exit 1 + else + # strip trailing slashes if present + DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob + if [[ $verbose ]]; then + echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 + else + echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 + fi + fi fi function prepare_hhvm_ini() { # we have to do this twice, as the WEB_CONCURRENCY setting is evaluated using PHP code, not ${...} syntax which HHVM does not support; if a value for $1 is passed then it won't echo messages upon second invocation if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then - echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 fi php_configs=( "-c" "$(php_passthrough "$php_config")" ) if [[ -n ${hhvm_config_extra:-} ]]; then - [[ ${1:-} ]] || echo "Using additional HHVM configuration (php.ini) file '${hhvm_config_extra#$HEROKU_APP_DIR/}'" >&2 - php_configs+=( "-c" "$(php_passthrough "$hhvm_config_extra")" ) + [[ ${1:-} ]] || echo "Using additional HHVM configuration (php.ini) file '${hhvm_config_extra#$HEROKU_APP_DIR/}'" >&2 + php_configs+=( "-c" "$(php_passthrough "$hhvm_config_extra")" ) fi } prepare_hhvm_ini if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then - echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 + echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 fi nginx_config_include=$(php_passthrough "$nginx_config_include") export HEROKU_PHP_NGINX_CONFIG_INCLUDE="$nginx_config_include" if [[ -n ${nginx_config:-} || ( ${nginx_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php"} && $verbose) ]]; then - echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 fi nginx_config=$(php_passthrough "$nginx_config") if [[ -z ${WEB_CONCURRENCY:-} ]]; then - maxprocs=$(ulimit -u) - ram="512M" - if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then - echo "Optimizing defaults for PX dyno...." >&2 - ram="6G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then - echo "Optimizing defaults for IX dyno...." >&2 - ram="2560M" - elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then - echo "Optimizing defaults for 2X dyno..." >&2 - ram="1G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then - echo "Optimizing defaults for 1X dyno..." >&2 - elif [[ -n ${DYNO:-} || $verbose ]]; then - echo "No dyno detected; using defaults for 1X..." >&2 - fi - - # determine number of HHVM threads to run - read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php "$ram") # tail, as composer echos outdated version warnings to STDOUT - [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 - export WEB_CONCURRENCY - - echo "${WEB_CONCURRENCY} threads at ${php_memory_limit}B memory limit." >&2 + maxprocs=$(ulimit -u) + ram="512M" + if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then + echo "Optimizing defaults for PX dyno...." >&2 + ram="6G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then + echo "Optimizing defaults for IX dyno...." >&2 + ram="2560M" + elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then + echo "Optimizing defaults for 2X dyno..." >&2 + ram="1G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then + echo "Optimizing defaults for 1X dyno..." >&2 + elif [[ -n ${DYNO:-} || $verbose ]]; then + echo "No dyno detected; using defaults for 1X..." >&2 + fi + + # determine number of HHVM threads to run + read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php "$ram") # tail, as composer echos outdated version warnings to STDOUT + [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 + export WEB_CONCURRENCY + + echo "${WEB_CONCURRENCY} threads at ${php_memory_limit}B memory limit." >&2 else - echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} threads." >&2 + echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} threads." >&2 fi # we changed WEB_CONCURRENCY; now we need to re-evaluate the configs as HHVM doesn't support ${...} syntax, so the configs contain PHP getenv() calls and are templated; we pass an argument to it to avoid it echoing "using HHVM config ..." messages again because that already happened @@ -296,10 +296,10 @@ trap 'trap - TERM EXIT; cleanup; kill -TERM $$' TERM trap 'trap - EXIT; cleanup' EXIT # if FD 1 is a TTY (that's the -t 1 check), trap SIGINT/Ctrl+C, then same procedure as for QUIT and TERM above if [[ -t 1 ]]; then - trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; + trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; # if FD 1 is not a TTY (e.g. when we're run through 'foreman start'), do nothing on SIGINT; the assumption is that the parent will send us a SIGTERM or something when this happens. With the trap above, Ctrl+C-ing out of a 'foreman start' run would trigger the INT trap both in Foreman and here (because Ctrl+C sends SIGINT to the entire process group, but there is no way to tell the two cases apart), and while the trap is still doing its shutdown work triggered by the SIGTERM from the Ctrl+C, Foreman would then send a SIGTERM because that's what it does when it receives a SIGINT itself. else - trap '' INT; + trap '' INT; fi # we are now launching a subshell for each of the tasks (log tail, app server, web server) @@ -317,29 +317,29 @@ fi [[ $verbose ]] && echo "Starting log redirection..." >&2 ( - trap '' INT; - trap 'echo "tail" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - touch "${logs[@]}" - - tail -qF -n 0 "${logs[@]}" 1>&2 & pid=$! - - wait + trap '' INT; + trap 'echo "tail" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + touch "${logs[@]}" + + tail -qF -n 0 "${logs[@]}" 1>&2 & pid=$! + + wait ) & pids+=($!) disown $! echo "Starting hhvm..." >&2 ( - trap '' INT; - trap 'echo "hhvm" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - hhvm --mode server "${php_configs[@]}" & pid=$! - - wait + trap '' INT; + trap 'echo "hhvm" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + hhvm --mode server "${php_configs[@]}" & pid=$! + + wait ) & pids+=($!) disown $! @@ -348,14 +348,14 @@ sleep 2 echo "Starting nginx..." >&2 ( - trap '' INT; - trap 'echo "nginx" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - nginx -g "daemon off; include $nginx_config;" & pid=$! - - wait + trap '' INT; + trap 'echo "nginx" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + nginx -g "daemon off; include $nginx_config;" & pid=$! + + wait ) & pids+=($!) disown $! diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index c3d8de89b..24e80f8dd 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -12,30 +12,30 @@ shopt -s nullglob verbose= php_passthrough() { - local dir=$(dirname "$1") - local file=$(basename "$1") - local out=$(basename "$file" .php) - if [[ "$out" != "$file" ]]; then - [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 - out="$dir/$out" - php -n "$1" > "$out" - echo "$out" - else - echo "$1" - fi + local dir=$(dirname "$1") + local file=$(basename "$1") + local out=$(basename "$file" .php) + if [[ "$out" != "$file" ]]; then + [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 + out="$dir/$out" + php -n "$1" > "$out" + echo "$out" + else + echo "$1" + fi } check_exists() { - if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then - echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 - exit 1 - else - echo "$HEROKU_APP_DIR/$1" - fi + if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then + echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 + exit 1 + else + echo "$HEROKU_APP_DIR/$1" + fi } touch_log() { - mkdir -p $(dirname "$1") && touch "$1" + mkdir -p $(dirname "$1") && touch "$1" } print_help() { @@ -106,86 +106,86 @@ optstring=":-:C:c:F:f:i:l:p:vh" # process flags first while getopts "$optstring" opt; do - case $opt in - -) - case "$OPTARG" in - verbose) - verbose=1 - ;; - help) - print_help 2>&1 - exit - ;; - *) - echo "Invalid option: --$OPTARG" >&2 - exit 2 - ;; - esac - ;; - v) - verbose=1 - ;; - h) - print_help 2>&1 - exit - ;; - esac + case $opt in + -) + case "$OPTARG" in + verbose) + verbose=1 + ;; + help) + print_help 2>&1 + exit + ;; + *) + echo "Invalid option: --$OPTARG" >&2 + exit 2 + ;; + esac + ;; + v) + verbose=1 + ;; + h) + print_help 2>&1 + exit + ;; + esac done OPTIND=1 # start over with options parsing while getopts "$optstring" opt; do - case $opt in - C) - httpd_config_include=$(check_exists "$OPTARG" "C") - ;; - c) - httpd_config=$(check_exists "$OPTARG" "c") - ;; - F) - fpm_config_include=$(check_exists "$OPTARG" "F") - ;; - f) - fpm_config=$(check_exists "$OPTARG" "f") - ;; - i) - php_config=$(check_exists "$OPTARG" "i") - ;; - l) - logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values - if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) - echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 - exit 1 - fi - for logfile in "${logarg[@]}"; do - if [[ -d "$logfile" ]]; then - echo "-l '$logfile': is a directory" >&2 - exit 1 - fi - touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } - [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 - logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name - done - ;; - p) - PORT="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 2 - ;; - :) - echo "Option -$OPTARG requires an argument" >&2 - exit 2 - ;; - esac + case $opt in + C) + httpd_config_include=$(check_exists "$OPTARG" "C") + ;; + c) + httpd_config=$(check_exists "$OPTARG" "c") + ;; + F) + fpm_config_include=$(check_exists "$OPTARG" "F") + ;; + f) + fpm_config=$(check_exists "$OPTARG" "f") + ;; + i) + php_config=$(check_exists "$OPTARG" "i") + ;; + l) + logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values + if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) + echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 + exit 1 + fi + for logfile in "${logarg[@]}"; do + if [[ -d "$logfile" ]]; then + echo "-l '$logfile': is a directory" >&2 + exit 1 + fi + touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } + [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 + logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name + done + ;; + p) + PORT="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 2 + ;; + :) + echo "Option -$OPTARG requires an argument" >&2 + exit 2 + ;; + esac done # clear processed arguments shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, + print_help "$0: too many arguments. If you're using options, make sure to list them before any document root argument you're providing." - exit 2 + exit 2 fi # our standard logs @@ -198,88 +198,88 @@ php -n -r 'exit((int)version_compare(PHP_VERSION, "5.5.11", "<"));' || { echo "T # make sure we run a local composer.phar if present, or global composer if not composer() { - local composer_bin=$(which ./composer.phar composer | head -n1) - # check if we the composer binary is executable by PHP - if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar - # run it directly; it's probably a bash script or similar (homebrew-php does this) - $composer_bin "$@" - else - php -n $composer_bin "$@" - fi + local composer_bin=$(which ./composer.phar composer | head -n1) + # check if we the composer binary is executable by PHP + if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar + # run it directly; it's probably a bash script or similar (homebrew-php does this) + $composer_bin "$@" + else + php -n $composer_bin "$@" + fi } COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export if [[ "$#" == "1" ]]; then - DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" - if [[ ! -d "$DOCUMENT_ROOT" ]]; then - echo "DOCUMENT_ROOT '$1' does not exist" >&2 - exit 1 - else - # strip trailing slashes if present - DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob - if [[ $verbose ]]; then - echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 - else - echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 - fi - fi + DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" + if [[ ! -d "$DOCUMENT_ROOT" ]]; then + echo "DOCUMENT_ROOT '$1' does not exist" >&2 + exit 1 + else + # strip trailing slashes if present + DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob + if [[ $verbose ]]; then + echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 + else + echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 + fi + fi fi if [[ -n ${fpm_config_include:-} ]]; then - echo "Using PHP-FPM configuration include '${fpm_config_include#$HEROKU_APP_DIR/}'" >&2 - fpm_config_include=$(php_passthrough "$fpm_config_include") - export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" + echo "Using PHP-FPM configuration include '${fpm_config_include#$HEROKU_APP_DIR/}'" >&2 + fpm_config_include=$(php_passthrough "$fpm_config_include") + export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" fi if [[ -n ${fpm_config:-} || ( ${fpm_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf"} && $verbose ) ]]; then - echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 fi fpm_config=$(php_passthrough "$fpm_config") if [[ -n ${php_config:-} ]]; then - echo "Using PHP configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 - php_config=$(php_passthrough "$php_config") + echo "Using PHP configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 + php_config=$(php_passthrough "$php_config") fi if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf"} && $verbose ) ]]; then - echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 + echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 fi httpd_config_include=$(php_passthrough "$httpd_config_include") export HEROKU_PHP_HTTPD_CONFIG_INCLUDE="$httpd_config_include" if [[ -n ${httpd_config:-} || ( ${httpd_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf"} && $verbose) ]]; then - echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 fi httpd_config=$(php_passthrough "$httpd_config") if [[ -z ${WEB_CONCURRENCY:-} ]]; then - maxprocs=$(ulimit -u) - ram="512M" - if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then - echo "Optimizing defaults for PX dyno...." >&2 - ram="6G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then - echo "Optimizing defaults for IX dyno...." >&2 - ram="2560M" - elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then - echo "Optimizing defaults for 2X dyno..." >&2 - ram="1G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then - echo "Optimizing defaults for 1X dyno..." >&2 - elif [[ -n ${DYNO:-} || $verbose ]]; then - echo "No dyno detected; using defaults for 1X..." >&2 - fi - - # determine number of FPM processes to run - # prevent loading of extension INIs (and thus e.g. newrelic) using empty PHP_INI_SCAN_DIR - read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") # tail, as composer echos outdated version warnings to STDOUT - [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 - export WEB_CONCURRENCY - - echo "${WEB_CONCURRENCY} processes at ${php_memory_limit}B memory limit." >&2 + maxprocs=$(ulimit -u) + ram="512M" + if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then + echo "Optimizing defaults for PX dyno...." >&2 + ram="6G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then + echo "Optimizing defaults for IX dyno...." >&2 + ram="2560M" + elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then + echo "Optimizing defaults for 2X dyno..." >&2 + ram="1G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then + echo "Optimizing defaults for 1X dyno..." >&2 + elif [[ -n ${DYNO:-} || $verbose ]]; then + echo "No dyno detected; using defaults for 1X..." >&2 + fi + + # determine number of FPM processes to run + # prevent loading of extension INIs (and thus e.g. newrelic) using empty PHP_INI_SCAN_DIR + read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") # tail, as composer echos outdated version warnings to STDOUT + [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 + export WEB_CONCURRENCY + + echo "${WEB_CONCURRENCY} processes at ${php_memory_limit}B memory limit." >&2 else - echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} processes." >&2 + echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} processes." >&2 fi # make a shared pipe; we'll write the name of the process that exits to it once that happens, and wait for that event below @@ -306,10 +306,10 @@ trap 'trap - TERM EXIT; cleanup; kill -TERM $$' TERM trap 'trap - EXIT; cleanup' EXIT # if FD 1 is a TTY (that's the -t 1 check), trap SIGINT/Ctrl+C, then same procedure as for QUIT and TERM above if [[ -t 1 ]]; then - trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; + trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; # if FD 1 is not a TTY (e.g. when we're run through 'foreman start'), do nothing on SIGINT; the assumption is that the parent will send us a SIGTERM or something when this happens. With the trap above, Ctrl+C-ing out of a 'foreman start' run would trigger the INT trap both in Foreman and here (because Ctrl+C sends SIGINT to the entire process group, but there is no way to tell the two cases apart), and while the trap is still doing its shutdown work triggered by the SIGTERM from the Ctrl+C, Foreman would then send a SIGTERM because that's what it does when it receives a SIGINT itself. else - trap '' INT; + trap '' INT; fi # we are now launching a subshell for each of the tasks (log tail, app server, web server) @@ -327,50 +327,50 @@ fi [[ $verbose ]] && echo "Starting log redirection..." >&2 ( - # the TERM trap here is special, because - # 1) there is a pipeline from tail to sed - # 2) we thus need to kill several children - # 3) kill $! will no longer do the job in that case - # 4) job control (set -m, where we could then kill %% instead) has weird side effects e.g. on ctrl+c (kills the parent terminal after that too) - # 5) so we try to kill all currently running jobs - # 5a) gracefully, by redirecting STDERR to /dev/null - one of the children will already be gone - # 6) the sed with the Darwin/GNU sed arg case used to be a function, but that was even worse with an extra wrapping subshell for sed - # FIXME: fires when the subshell or the tail is killed, but not when the sed is killed, because... pipes :( maybe we can do http://mywiki.wooledge.org/ProcessManagement#My_script_runs_a_pipeline.__When_the_script_is_killed.2C_I_want_the_pipeline_to_die_too. - logs_pipe=$(mktemp -t "heroku.logspipe-$$.XXXXXX" -u) - rm -f $logs_pipe - mkfifo $logs_pipe - unset logs_procs - - trap '' INT; - trap 'echo "tail" >&3;' EXIT - trap 'trap - TERM; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - touch "${logs[@]}" - - if [[ $(uname) == "Darwin" ]]; then - sedbufarg="-l" # mac/bsd sed: -l buffers on line boundaries - else - sedbufarg="-u" # unix/gnu sed: -u unbuffered (arbitrary) chunks of data - fi - - tail -qF -n 0 "${logs[@]}" > "$logs_pipe" & logs_procs+=($!) - sed $sedbufarg -E -e 's/^\[[^]]+\] WARNING: \[pool [^]]+\] child [0-9]+ said into std(err|out): "(.*)("|...)$/\2\3/' -e 's/"$//' < "$logs_pipe" 1>&2 & logs_procs+=($!) # messages that are too long are cut off using "..." by FPM instead of closing double quotation marks; we want to preserve those three dots but not the closing double quotes - - wait + # the TERM trap here is special, because + # 1) there is a pipeline from tail to sed + # 2) we thus need to kill several children + # 3) kill $! will no longer do the job in that case + # 4) job control (set -m, where we could then kill %% instead) has weird side effects e.g. on ctrl+c (kills the parent terminal after that too) + # 5) so we try to kill all currently running jobs + # 5a) gracefully, by redirecting STDERR to /dev/null - one of the children will already be gone + # 6) the sed with the Darwin/GNU sed arg case used to be a function, but that was even worse with an extra wrapping subshell for sed + # FIXME: fires when the subshell or the tail is killed, but not when the sed is killed, because... pipes :( maybe we can do http://mywiki.wooledge.org/ProcessManagement#My_script_runs_a_pipeline.__When_the_script_is_killed.2C_I_want_the_pipeline_to_die_too. + logs_pipe=$(mktemp -t "heroku.logspipe-$$.XXXXXX" -u) + rm -f $logs_pipe + mkfifo $logs_pipe + unset logs_procs + + trap '' INT; + trap 'echo "tail" >&3;' EXIT + trap 'trap - TERM; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + touch "${logs[@]}" + + if [[ $(uname) == "Darwin" ]]; then + sedbufarg="-l" # mac/bsd sed: -l buffers on line boundaries + else + sedbufarg="-u" # unix/gnu sed: -u unbuffered (arbitrary) chunks of data + fi + + tail -qF -n 0 "${logs[@]}" > "$logs_pipe" & logs_procs+=($!) + sed $sedbufarg -E -e 's/^\[[^]]+\] WARNING: \[pool [^]]+\] child [0-9]+ said into std(err|out): "(.*)("|...)$/\2\3/' -e 's/"$//' < "$logs_pipe" 1>&2 & logs_procs+=($!) # messages that are too long are cut off using "..." by FPM instead of closing double quotation marks; we want to preserve those three dots but not the closing double quotes + + wait ) & pids+=($!) disown $! echo "Starting php-fpm..." >&2 ( - trap '' INT; - trap 'echo "php-fpm" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - php-fpm --nodaemonize -y "$fpm_config" ${php_config:+-c "$php_config"} & pid=$! - - wait + trap '' INT; + trap 'echo "php-fpm" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + php-fpm --nodaemonize -y "$fpm_config" ${php_config:+-c "$php_config"} & pid=$! + + wait ) & pids+=($!) disown $! @@ -379,14 +379,14 @@ sleep 2 echo "Starting httpd..." >&2 ( - trap '' INT; - trap 'echo "httpd" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - httpd -D NO_DETACH -c "Include $httpd_config" & pid=$! - - wait + trap '' INT; + trap 'echo "httpd" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + httpd -D NO_DETACH -c "Include $httpd_config" & pid=$! + + wait ) & pids+=($!) disown $! diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index 2a432153c..a9115e633 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -12,30 +12,30 @@ shopt -s nullglob verbose= php_passthrough() { - local dir=$(dirname "$1") - local file=$(basename "$1") - local out=$(basename "$file" .php) - if [[ "$out" != "$file" ]]; then - [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 - out="$dir/$out" - php -n "$1" > "$out" - echo "$out" - else - echo "$1" - fi + local dir=$(dirname "$1") + local file=$(basename "$1") + local out=$(basename "$file" .php) + if [[ "$out" != "$file" ]]; then + [[ $verbose ]] && echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2 + out="$dir/$out" + php -n "$1" > "$out" + echo "$out" + else + echo "$1" + fi } check_exists() { - if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then - echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 - exit 1 - else - echo "$HEROKU_APP_DIR/$1" - fi + if [[ ! -f "$HEROKU_APP_DIR/$1" ]]; then + echo "Cannot read -$2 '$1' (relative to '$HEROKU_APP_DIR')" >&2 + exit 1 + else + echo "$HEROKU_APP_DIR/$1" + fi } touch_log() { - mkdir -p $(dirname "$1") && touch "$1" + mkdir -p $(dirname "$1") && touch "$1" } print_help() { @@ -107,86 +107,86 @@ optstring=":-:C:c:F:f:i:l:p:vh" # process flags first while getopts "$optstring" opt; do - case $opt in - -) - case "$OPTARG" in - verbose) - verbose=1 - ;; - help) - print_help 2>&1 - exit - ;; - *) - echo "Invalid option: --$OPTARG" >&2 - exit 2 - ;; - esac - ;; - v) - verbose=1 - ;; - h) - print_help 2>&1 - exit - ;; - esac + case $opt in + -) + case "$OPTARG" in + verbose) + verbose=1 + ;; + help) + print_help 2>&1 + exit + ;; + *) + echo "Invalid option: --$OPTARG" >&2 + exit 2 + ;; + esac + ;; + v) + verbose=1 + ;; + h) + print_help 2>&1 + exit + ;; + esac done OPTIND=1 # start over with options parsing while getopts "$optstring" opt; do - case $opt in - C) - nginx_config_include=$(check_exists "$OPTARG" "C") - ;; - c) - nginx_config=$(check_exists "$OPTARG" "c") - ;; - F) - fpm_config_include=$(check_exists "$OPTARG" "F") - ;; - f) - fpm_config=$(check_exists "$OPTARG" "f") - ;; - i) - php_config=$(check_exists "$OPTARG" "i") - ;; - l) - logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values - if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) - echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 - exit 1 - fi - for logfile in "${logarg[@]}"; do - if [[ -d "$logfile" ]]; then - echo "-l '$logfile': is a directory" >&2 - exit 1 - fi - touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } - [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 - logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name - done - ;; - p) - PORT="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 2 - ;; - :) - echo "Option -$OPTARG requires an argument" >&2 - exit 2 - ;; - esac + case $opt in + C) + nginx_config_include=$(check_exists "$OPTARG" "C") + ;; + c) + nginx_config=$(check_exists "$OPTARG" "c") + ;; + F) + fpm_config_include=$(check_exists "$OPTARG" "F") + ;; + f) + fpm_config=$(check_exists "$OPTARG" "f") + ;; + i) + php_config=$(check_exists "$OPTARG" "i") + ;; + l) + logarg=( $OPTARG ) # must not quote this or wildcards won't get expanded into individual values + if [[ ${#logarg[@]} -eq 0 ]]; then # we set nullglob to detect if a pattern matched nothing (then the array is empty) + echo "Pattern '$OPTARG' passed to option -l matched no files" >&2 + exit 1 + fi + for logfile in "${logarg[@]}"; do + if [[ -d "$logfile" ]]; then + echo "-l '$logfile': is a directory" >&2 + exit 1 + fi + touch_log "$logfile" || { echo "Could not touch '$logfile'; permissions problem?" >&2; exit 1; } + [[ $verbose ]] && echo "Tailing '$logfile' to stderr" >&2 + logs+=("$logfile") # must quote here in case a wildcard matched a file with a space in the name + done + ;; + p) + PORT="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 2 + ;; + :) + echo "Option -$OPTARG requires an argument" >&2 + exit 2 + ;; + esac done # clear processed arguments shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, + print_help "$0: too many arguments. If you're using options, make sure to list them before any document root argument you're providing." - exit 2 + exit 2 fi # our standard logs @@ -199,88 +199,88 @@ unset -f php-fpm # remove the alias we made earlier that would prevent newrelic # make sure we run a local composer.phar if present, or global composer if not composer() { - local composer_bin=$(which ./composer.phar composer | head -n1) - # check if we the composer binary is executable by PHP - if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar - # run it directly; it's probably a bash script or similar (homebrew-php does this) - $composer_bin "$@" - else - php -n $composer_bin "$@" - fi + local composer_bin=$(which ./composer.phar composer | head -n1) + # check if we the composer binary is executable by PHP + if file --brief --dereference $composer_bin | grep -e "shell" -e "bash" > /dev/null ; then # newer versions of file return "data" for .phar + # run it directly; it's probably a bash script or similar (homebrew-php does this) + $composer_bin "$@" + else + php -n $composer_bin "$@" + fi } COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export if [[ "$#" == "1" ]]; then - DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" - if [[ ! -d "$DOCUMENT_ROOT" ]]; then - echo "DOCUMENT_ROOT '$1' does not exist" >&2 - exit 1 - else - # strip trailing slashes if present - DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob - if [[ $verbose ]]; then - echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 - else - echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 - fi - fi + DOCUMENT_ROOT="$HEROKU_APP_DIR/$1" + if [[ ! -d "$DOCUMENT_ROOT" ]]; then + echo "DOCUMENT_ROOT '$1' does not exist" >&2 + exit 1 + else + # strip trailing slashes if present + DOCUMENT_ROOT=${DOCUMENT_ROOT%%*(/)} # powered by extglob + if [[ $verbose ]]; then + echo "DOCUMENT_ROOT changed to '$DOCUMENT_ROOT'" >&2 + else + echo "DOCUMENT_ROOT changed to '${1%%*(/)}/'" >&2 + fi + fi fi if [[ -n ${fpm_config_include:-} ]]; then - echo "Using PHP-FPM configuration include '${fpm_config_include#$HEROKU_APP_DIR/}'" >&2 - fpm_config_include=$(php_passthrough "$fpm_config_include") - export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" + echo "Using PHP-FPM configuration include '${fpm_config_include#$HEROKU_APP_DIR/}'" >&2 + fpm_config_include=$(php_passthrough "$fpm_config_include") + export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" fi if [[ -n ${fpm_config:-} || ( ${fpm_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf"} && $verbose ) ]]; then - echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 fi fpm_config=$(php_passthrough "$fpm_config") if [[ -n ${php_config:-} ]]; then - echo "Using PHP configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 - php_config=$(php_passthrough "$php_config") + echo "Using PHP configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 + php_config=$(php_passthrough "$php_config") fi if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then - echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 + echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 fi nginx_config_include=$(php_passthrough "$nginx_config_include") export HEROKU_PHP_NGINX_CONFIG_INCLUDE="$nginx_config_include" if [[ -n ${nginx_config:-} || ( ${nginx_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php"} && $verbose) ]]; then - echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 + echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 fi nginx_config=$(php_passthrough "$nginx_config") if [[ -z ${WEB_CONCURRENCY:-} ]]; then - maxprocs=$(ulimit -u) - ram="512M" - if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then - echo "Optimizing defaults for PX dyno...." >&2 - ram="6G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then - echo "Optimizing defaults for IX dyno...." >&2 - ram="2560M" - elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then - echo "Optimizing defaults for 2X dyno..." >&2 - ram="1G" - elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then - echo "Optimizing defaults for 1X dyno..." >&2 - elif [[ -n ${DYNO:-} || $verbose ]]; then - echo "No dyno detected; using defaults for 1X..." >&2 - fi - - # determine number of FPM processes to run - # prevent loading of extension INIs (and thus e.g. newrelic) using empty PHP_INI_SCAN_DIR - read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") # tail, as composer echos outdated version warnings to STDOUT - [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 - export WEB_CONCURRENCY - - echo "${WEB_CONCURRENCY} processes at ${php_memory_limit}B memory limit." >&2 + maxprocs=$(ulimit -u) + ram="512M" + if [[ -n ${DYNO:-} && "$maxprocs" == "32768" ]]; then + echo "Optimizing defaults for PX dyno...." >&2 + ram="6G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "16384" ]]; then + echo "Optimizing defaults for IX dyno...." >&2 + ram="2560M" + elif [[ -n ${DYNO:-} && "$maxprocs" == "512" ]]; then + echo "Optimizing defaults for 2X dyno..." >&2 + ram="1G" + elif [[ -n ${DYNO:-} && "$maxprocs" == "256" ]]; then + echo "Optimizing defaults for 1X dyno..." >&2 + elif [[ -n ${DYNO:-} || $verbose ]]; then + echo "No dyno detected; using defaults for 1X..." >&2 + fi + + # determine number of FPM processes to run + # prevent loading of extension INIs (and thus e.g. newrelic) using empty PHP_INI_SCAN_DIR + read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") # tail, as composer echos outdated version warnings to STDOUT + [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 + export WEB_CONCURRENCY + + echo "${WEB_CONCURRENCY} processes at ${php_memory_limit}B memory limit." >&2 else - echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} processes." >&2 + echo "Using WEB_CONCURRENCY=${WEB_CONCURRENCY} processes." >&2 fi # make a shared pipe; we'll write the name of the process that exits to it once that happens, and wait for that event below @@ -307,10 +307,10 @@ trap 'trap - TERM EXIT; cleanup; kill -TERM $$' TERM trap 'trap - EXIT; cleanup' EXIT # if FD 1 is a TTY (that's the -t 1 check), trap SIGINT/Ctrl+C, then same procedure as for QUIT and TERM above if [[ -t 1 ]]; then - trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; + trap 'trap - INT EXIT; cleanup; kill -INT $$' INT; # if FD 1 is not a TTY (e.g. when we're run through 'foreman start'), do nothing on SIGINT; the assumption is that the parent will send us a SIGTERM or something when this happens. With the trap above, Ctrl+C-ing out of a 'foreman start' run would trigger the INT trap both in Foreman and here (because Ctrl+C sends SIGINT to the entire process group, but there is no way to tell the two cases apart), and while the trap is still doing its shutdown work triggered by the SIGTERM from the Ctrl+C, Foreman would then send a SIGTERM because that's what it does when it receives a SIGINT itself. else - trap '' INT; + trap '' INT; fi # we are now launching a subshell for each of the tasks (log tail, app server, web server) @@ -328,50 +328,50 @@ fi [[ $verbose ]] && echo "Starting log redirection..." >&2 ( - # the TERM trap here is special, because - # 1) there is a pipeline from tail to sed - # 2) we thus need to kill several children - # 3) kill $! will no longer do the job in that case - # 4) job control (set -m, where we could then kill %% instead) has weird side effects e.g. on ctrl+c (kills the parent terminal after that too) - # 5) so we try to kill all currently running jobs - # 5a) gracefully, by redirecting STDERR to /dev/null - one of the children will already be gone - # 6) the sed with the Darwin/GNU sed arg case used to be a function, but that was even worse with an extra wrapping subshell for sed - # FIXME: fires when the subshell or the tail is killed, but not when the sed is killed, because... pipes :( maybe we can do http://mywiki.wooledge.org/ProcessManagement#My_script_runs_a_pipeline.__When_the_script_is_killed.2C_I_want_the_pipeline_to_die_too. - logs_pipe=$(mktemp -t "heroku.logspipe-$$.XXXXXX" -u) - rm -f $logs_pipe - mkfifo $logs_pipe - unset logs_procs - - trap '' INT; - trap 'echo "tail" >&3;' EXIT - trap 'trap - TERM; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - touch "${logs[@]}" - - if [[ $(uname) == "Darwin" ]]; then - sedbufarg="-l" # mac/bsd sed: -l buffers on line boundaries - else - sedbufarg="-u" # unix/gnu sed: -u unbuffered (arbitrary) chunks of data - fi - - tail -qF -n 0 "${logs[@]}" > "$logs_pipe" & logs_procs+=($!) - sed $sedbufarg -E -e 's/^\[[^]]+\] WARNING: \[pool [^]]+\] child [0-9]+ said into std(err|out): "(.*)("|...)$/\2\3/' -e 's/"$//' < "$logs_pipe" 1>&2 & logs_procs+=($!) # messages that are too long are cut off using "..." by FPM instead of closing double quotation marks; we want to preserve those three dots but not the closing double quotes - - wait + # the TERM trap here is special, because + # 1) there is a pipeline from tail to sed + # 2) we thus need to kill several children + # 3) kill $! will no longer do the job in that case + # 4) job control (set -m, where we could then kill %% instead) has weird side effects e.g. on ctrl+c (kills the parent terminal after that too) + # 5) so we try to kill all currently running jobs + # 5a) gracefully, by redirecting STDERR to /dev/null - one of the children will already be gone + # 6) the sed with the Darwin/GNU sed arg case used to be a function, but that was even worse with an extra wrapping subshell for sed + # FIXME: fires when the subshell or the tail is killed, but not when the sed is killed, because... pipes :( maybe we can do http://mywiki.wooledge.org/ProcessManagement#My_script_runs_a_pipeline.__When_the_script_is_killed.2C_I_want_the_pipeline_to_die_too. + logs_pipe=$(mktemp -t "heroku.logspipe-$$.XXXXXX" -u) + rm -f $logs_pipe + mkfifo $logs_pipe + unset logs_procs + + trap '' INT; + trap 'echo "tail" >&3;' EXIT + trap 'trap - TERM; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM "${logs_procs[@]}" 2> /dev/null || true & wait "${logs_procs[@]}" 2> /dev/null || true; rm -f $logs_pipe; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + touch "${logs[@]}" + + if [[ $(uname) == "Darwin" ]]; then + sedbufarg="-l" # mac/bsd sed: -l buffers on line boundaries + else + sedbufarg="-u" # unix/gnu sed: -u unbuffered (arbitrary) chunks of data + fi + + tail -qF -n 0 "${logs[@]}" > "$logs_pipe" & logs_procs+=($!) + sed $sedbufarg -E -e 's/^\[[^]]+\] WARNING: \[pool [^]]+\] child [0-9]+ said into std(err|out): "(.*)("|...)$/\2\3/' -e 's/"$//' < "$logs_pipe" 1>&2 & logs_procs+=($!) # messages that are too long are cut off using "..." by FPM instead of closing double quotation marks; we want to preserve those three dots but not the closing double quotes + + wait ) & pids+=($!) disown $! echo "Starting php-fpm..." >&2 ( - trap '' INT; - trap 'echo "php-fpm" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - php-fpm --nodaemonize -y "$fpm_config" ${php_config:+-c "$php_config"} & pid=$! - - wait + trap '' INT; + trap 'echo "php-fpm" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + php-fpm --nodaemonize -y "$fpm_config" ${php_config:+-c "$php_config"} & pid=$! + + wait ) & pids+=($!) disown $! @@ -380,14 +380,14 @@ sleep 2 echo "Starting nginx..." >&2 ( - trap '' INT; - trap 'echo "nginx" >&3;' EXIT - trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM - trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - - nginx -g "daemon off; include $nginx_config;" & pid=$! - - wait + trap '' INT; + trap 'echo "nginx" >&3;' EXIT + trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM + trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 + + nginx -g "daemon off; include $nginx_config;" & pid=$! + + wait ) & pids+=($!) disown $! diff --git a/bin/util/autotune.php b/bin/util/autotune.php index 1d5bfad5b..316febbad 100755 --- a/bin/util/autotune.php +++ b/bin/util/autotune.php @@ -2,73 +2,73 @@ $directives) { - foreach($directives as $key => $value) { - if($section == "www" && $key == "php_admin_value" && isset($value['memory_limit'])) { - $retval['php_admin_value'] = $value['memory_limit']; - } elseif($section == "www" && $key == "php_value" && isset($value['memory_limit']) && !isset($retval['php_value'])) { - // an existing value takes precedence - // we can only emulate that for includes; within the same file, the INI parser overwrites earlier values :( - $retval['php_value'] = $value['memory_limit']; - } elseif($key == "include") { - // values from the include don't overwrite existing values - $retval = array_merge(get_fpm_memory_limit($value, $section), $retval); - } - - if(isset($retval['php_admin_value'])) { - // done for good as nothing can change this anymore, bubble upwards - return $retval; - } - } - } - - return $retval; + if(!is_readable($fpmconf)) { + return array(); + } + $fpm = parse_ini_string("[$startsection]\n".file_get_contents($fpmconf), true); // prepend section from parent so stuff is parsed correctly in includes that lack a leading section marker + + $retval = array(); + + foreach($fpm as $section => $directives) { + foreach($directives as $key => $value) { + if($section == "www" && $key == "php_admin_value" && isset($value['memory_limit'])) { + $retval['php_admin_value'] = $value['memory_limit']; + } elseif($section == "www" && $key == "php_value" && isset($value['memory_limit']) && !isset($retval['php_value'])) { + // an existing value takes precedence + // we can only emulate that for includes; within the same file, the INI parser overwrites earlier values :( + $retval['php_value'] = $value['memory_limit']; + } elseif($key == "include") { + // values from the include don't overwrite existing values + $retval = array_merge(get_fpm_memory_limit($value, $section), $retval); + } + + if(isset($retval['php_admin_value'])) { + // done for good as nothing can change this anymore, bubble upwards + return $retval; + } + } + } + + return $retval; } $opts = getopt("y:t:"); $limits = get_fpm_memory_limit(isset($opts["y"]) ? $opts["y"] : null); - + if( - !$limits /* .user.ini memory limit is ignored if one is set via FPM */ && - isset($opts['t']) && - is_readable($opts['t'].'/.user.ini') + !$limits /* .user.ini memory limit is ignored if one is set via FPM */ && + isset($opts['t']) && + is_readable($opts['t'].'/.user.ini') ) { - // we only read the topmost .user.ini inside document root - $userini = parse_ini_file($opts['t'].'/.user.ini'); - if(isset($userini['memory_limit'])) { - $limits['php_value'] = $userini['memory_limit']; - } + // we only read the topmost .user.ini inside document root + $userini = parse_ini_file($opts['t'].'/.user.ini'); + if(isset($userini['memory_limit'])) { + $limits['php_value'] = $userini['memory_limit']; + } } if(isset($limits['php_admin_value'])) { - ini_set('memory_limit', $limits['php_admin_value']); + ini_set('memory_limit', $limits['php_admin_value']); } elseif(isset($limits['php_value'])) { - ini_set('memory_limit', $limits['php_value']); + ini_set('memory_limit', $limits['php_value']); } $limit = ini_get('memory_limit'); diff --git a/bin/util/blackfire.sh b/bin/util/blackfire.sh index 10deb0107..5a15d7895 100755 --- a/bin/util/blackfire.sh +++ b/bin/util/blackfire.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash install_blackfire_ext() { - # special treatment for Blackfire; we enable it if we detect a server id and a server token for it - # otherwise users would have to have it in their require section, which is annoying in development environments - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID:-} - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN:-} - if [[ "$engine" == "php" && -n "$BLACKFIRE_SERVER_TOKEN" && -n "$BLACKFIRE_SERVER_ID" ]] && ! $engine -n $(which composer) show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/ext-blackfire 2>/dev/null; then - if $engine -n $(which composer) require --update-no-dev -d "$build_dir/.heroku/php" -- "heroku-sys/ext-blackfire:*" >> $build_dir/.heroku/php/install.log 2>&1; then - echo "- Blackfire detected, installed ext-blackfire" | indent - else - warning_inline "Blackfire detected, but no suitable extension available" - fi - fi + # special treatment for Blackfire; we enable it if we detect a server id and a server token for it + # otherwise users would have to have it in their require section, which is annoying in development environments + BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID:-} + BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN:-} + if [[ "$engine" == "php" && -n "$BLACKFIRE_SERVER_TOKEN" && -n "$BLACKFIRE_SERVER_ID" ]] && ! $engine -n $(which composer) show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/ext-blackfire 2>/dev/null; then + if $engine -n $(which composer) require --update-no-dev -d "$build_dir/.heroku/php" -- "heroku-sys/ext-blackfire:*" >> $build_dir/.heroku/php/install.log 2>&1; then + echo "- Blackfire detected, installed ext-blackfire" | indent + else + warning_inline "Blackfire detected, but no suitable extension available" + fi + fi } diff --git a/bin/util/common.sh b/bin/util/common.sh index c4507f9b9..b0490e3a9 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -1,66 +1,66 @@ error() { - echo - echo " ! ERROR: $*" | indent no_first_line_indent - echo - exit 1 + echo + echo " ! ERROR: $*" | indent no_first_line_indent + echo + exit 1 } warning() { - echo - echo " ! WARNING: $*" | indent no_first_line_indent - echo + echo + echo " ! WARNING: $*" | indent no_first_line_indent + echo } warning_inline() { - echo " ! WARNING: $*" | indent no_first_line_indent + echo " ! WARNING: $*" | indent no_first_line_indent } status() { - echo "-----> $*" + echo "-----> $*" } notice() { - echo - echo "NOTICE: $*" | indent - echo + echo + echo "NOTICE: $*" | indent + echo } notice_inline() { - echo "NOTICE: $*" | indent + echo "NOTICE: $*" | indent } # sed -l basically makes sed replace and buffer through stdin to stdout # so you get updates while the command runs and dont wait for the end # e.g. npm install | indent indent() { - # if an arg is given it's a flag indicating we shouldn't indent the first line, so use :+ to tell SED accordingly if that parameter is set, otherwise null string for no range selector prefix (it selects from line 2 onwards and then every 1st line, meaning all lines) - local c="${1:+"2,999"} s/^/ /" - case $(uname) in - Darwin) sed -l "$c";; # mac/bsd sed: -l buffers on line boundaries - *) sed -u "$c";; # unix/gnu sed: -u unbuffered (arbitrary) chunks of data - esac + # if an arg is given it's a flag indicating we shouldn't indent the first line, so use :+ to tell SED accordingly if that parameter is set, otherwise null string for no range selector prefix (it selects from line 2 onwards and then every 1st line, meaning all lines) + local c="${1:+"2,999"} s/^/ /" + case $(uname) in + Darwin) sed -l "$c";; # mac/bsd sed: -l buffers on line boundaries + *) sed -u "$c";; # unix/gnu sed: -u unbuffered (arbitrary) chunks of data + esac } export_env_dir() { - local env_dir=$1 - local whitelist_regex=${2:-''} - local blacklist_regex=${3:-'^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH|IFS)$'} - if [ -d "$env_dir" ]; then - for e in $(ls $env_dir); do - echo "$e" | grep -E "$whitelist_regex" | grep -qvE "$blacklist_regex" && - export "$e=$(cat $env_dir/$e)" - : - done - fi + local env_dir=$1 + local whitelist_regex=${2:-''} + local blacklist_regex=${3:-'^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH|IFS)$'} + if [ -d "$env_dir" ]; then + for e in $(ls $env_dir); do + echo "$e" | grep -E "$whitelist_regex" | grep -qvE "$blacklist_regex" && + export "$e=$(cat $env_dir/$e)" + : + done + fi } curl_retry_on_18() { - local ec=18; - local attempts=0; - while [[ $ec -eq 18 && $attempts -lt 3 ]]; do - ((attempts++)) - curl "$@" # -C - would return code 33 if unsupported by server - ec=$? - done - return $ec + local ec=18; + local attempts=0; + while [[ $ec -eq 18 && $attempts -lt 3 ]]; do + ((attempts++)) + curl "$@" # -C - would return code 33 if unsupported by server + ec=$? + done + return $ec } diff --git a/bin/util/newrelic.sh b/bin/util/newrelic.sh index 9e38cf74d..d664051f4 100755 --- a/bin/util/newrelic.sh +++ b/bin/util/newrelic.sh @@ -1,25 +1,25 @@ #!/usr/bin/env bash install_newrelic_ext() { - # special treatment for New Relic; we enable it if we detect a license key for it - # otherwise users would have to have it in their require section, which is annoying in development environments - NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY:-} - if [[ "$engine" == "php" && -n "$NEW_RELIC_LICENSE_KEY" ]] && ! $engine -n $(which composer) show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/ext-newrelic 2>/dev/null; then - if $engine -n $(which composer) require --update-no-dev -d "$build_dir/.heroku/php" -- "heroku-sys/ext-newrelic:*" >> $build_dir/.heroku/php/install.log 2>&1; then - echo "- New Relic detected, installed ext-newrelic" | indent - else - warning_inline "New Relic detected, but no suitable extension available" - fi - fi + # special treatment for New Relic; we enable it if we detect a license key for it + # otherwise users would have to have it in their require section, which is annoying in development environments + NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY:-} + if [[ "$engine" == "php" && -n "$NEW_RELIC_LICENSE_KEY" ]] && ! $engine -n $(which composer) show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/ext-newrelic 2>/dev/null; then + if $engine -n $(which composer) require --update-no-dev -d "$build_dir/.heroku/php" -- "heroku-sys/ext-newrelic:*" >> $build_dir/.heroku/php/install.log 2>&1; then + echo "- New Relic detected, installed ext-newrelic" | indent + else + warning_inline "New Relic detected, but no suitable extension available" + fi + fi } install_newrelic_userini() { - if [[ "$engine" == "php" && -n "${NEW_RELIC_CONFIG_FILE:-}" ]]; then - if [[ ! -f "${NEW_RELIC_CONFIG_FILE}" ]]; then - error "Config var 'NEW_RELIC_CONFIG_FILE' points to non existing file + if [[ "$engine" == "php" && -n "${NEW_RELIC_CONFIG_FILE:-}" ]]; then + if [[ ! -f "${NEW_RELIC_CONFIG_FILE}" ]]; then + error "Config var 'NEW_RELIC_CONFIG_FILE' points to non existing file '${NEW_RELIC_CONFIG_FILE}'" - fi - notice_inline "Using custom New Relic config '${NEW_RELIC_CONFIG_FILE}'" - ( cd $build_dir/.heroku/php/etc/php/conf.d; ln -s "../../../../../${NEW_RELIC_CONFIG_FILE}" "ext-newrelic.user.ini" ) - fi + fi + notice_inline "Using custom New Relic config '${NEW_RELIC_CONFIG_FILE}'" + ( cd $build_dir/.heroku/php/etc/php/conf.d; ln -s "../../../../../${NEW_RELIC_CONFIG_FILE}" "ext-newrelic.user.ini" ) + fi } diff --git a/composer.json b/composer.json index 81ea47007..52c7643f6 100644 --- a/composer.json +++ b/composer.json @@ -1,20 +1,20 @@ { - "name": "heroku/heroku-buildpack-php", - "description": "Toolkit for starting a PHP application locally, with or without foreman, using the same config for PHP/HHVM and Apache2/Nginx as on Heroku", - "keywords": ["heroku", "foreman", "php", "hhvm", "apache", "apache2", "nginx"], - "homepage": "https://github.com/heroku/heroku-buildpack-php", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "David Zuelke", - "email": "dz@heroku.com" - } - ], - "bin": [ - "bin/heroku-hhvm-apache2", - "bin/heroku-hhvm-nginx", - "bin/heroku-php-apache2", - "bin/heroku-php-nginx" - ] + "name": "heroku/heroku-buildpack-php", + "description": "Toolkit for starting a PHP application locally, with or without foreman, using the same config for PHP/HHVM and Apache2/Nginx as on Heroku", + "keywords": ["heroku", "foreman", "php", "hhvm", "apache", "apache2", "nginx"], + "homepage": "https://github.com/heroku/heroku-buildpack-php", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "David Zuelke", + "email": "dz@heroku.com" + } + ], + "bin": [ + "bin/heroku-hhvm-apache2", + "bin/heroku-hhvm-nginx", + "bin/heroku-php-apache2", + "bin/heroku-php-nginx" + ] } diff --git a/conf/apache2/heroku.conf b/conf/apache2/heroku.conf index bf4fcc2d7..cf32ffcd5 100644 --- a/conf/apache2/heroku.conf +++ b/conf/apache2/heroku.conf @@ -7,64 +7,64 @@ Define heroku-fcgi unix:/tmp/heroku.fcgi.${PORT}.sock|fcgi://heroku-fcgi # this is also a lot more convenient for users # http://thread.gmane.org/gmane.comp.apache.devel/52892 - # we must declare a parameter in here or it'll not register the proxy ahead of time - # min=0 is an obvious candidate since that's the default value already and sensible - ProxySet min=0 + # we must declare a parameter in here or it'll not register the proxy ahead of time + # min=0 is an obvious candidate since that's the default value already and sensible + ProxySet min=0 Listen ${PORT} - ServerName localhost + ServerName localhost - ErrorLog /tmp/heroku.apache2_error.${PORT}.log - # redefine "combined" log format so includes can overwrite it - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" heroku - CustomLog /tmp/heroku.apache2_access.${PORT}.log heroku + ErrorLog /tmp/heroku.apache2_error.${PORT}.log + # redefine "combined" log format so includes can overwrite it + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" heroku + CustomLog /tmp/heroku.apache2_access.${PORT}.log heroku - TraceEnable off + TraceEnable off - - # lock it down fully by default - # if it's also the docroot, it'll be opened up again further below - Require all denied - - # explicitly deny these again, merged with the docroot later - Require all denied - - - # handle these separately; who knows where they are and whether they're accessible - - Require all denied - - - Require all denied - + + # lock it down fully by default + # if it's also the docroot, it'll be opened up again further below + Require all denied + + # explicitly deny these again, merged with the docroot later + Require all denied + + + # handle these separately; who knows where they are and whether they're accessible + + Require all denied + + + Require all denied + - DocumentRoot "${DOCUMENT_ROOT}" + DocumentRoot "${DOCUMENT_ROOT}" - - Options FollowSymLinks + + Options FollowSymLinks - # allow .htaccess to do everything - AllowOverride All + # allow .htaccess to do everything + AllowOverride All - # no limits - Require all granted - + # no limits + Require all granted + - # mod_proxy doesn't forward the Authorization header, must fix that ourselves - SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + # mod_proxy doesn't forward the Authorization header, must fix that ourselves + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - # pass requests to .php files to mod_proxy_fcgi - # this requires Apache 2.4.10+ and PHP 5.5.15+ to work properly - - # make sure the file exists so that if not, Apache will show its 404 page and not FPM - SetHandler proxy:fcgi://heroku-fcgi - - + # pass requests to .php files to mod_proxy_fcgi + # this requires Apache 2.4.10+ and PHP 5.5.15+ to work properly + + # make sure the file exists so that if not, Apache will show its 404 page and not FPM + SetHandler proxy:fcgi://heroku-fcgi + + - Include "${HEROKU_PHP_HTTPD_CONFIG_INCLUDE}" + Include "${HEROKU_PHP_HTTPD_CONFIG_INCLUDE}" diff --git a/conf/hhvm/php.ini.php b/conf/hhvm/php.ini.php index ad789f54c..bb6b53ef7 100644 --- a/conf/hhvm/php.ini.php +++ b/conf/hhvm/php.ini.php @@ -1,7 +1,7 @@ ; php options date.timezone = UTC expose_php = off - + ; hhvm specific hhvm.log.level = Warning hhvm.log.always_log_unhandled_exceptions = true diff --git a/conf/nginx/default_include.conf.php b/conf/nginx/default_include.conf.php index d9687eebc..613854bbf 100644 --- a/conf/nginx/default_include.conf.php +++ b/conf/nginx/default_include.conf.php @@ -1,8 +1,8 @@ location / { - index index.php index.html index.htm; + index index.php index.html index.htm; } # for people with app root as doc root, restrict access to a few things location ~ ^/(composer\.(json|lock|phar)$|Procfile$|/|/) { - deny all; + deny all; } diff --git a/conf/nginx/heroku.conf.php b/conf/nginx/heroku.conf.php index 4a044ba11..5d9d59775 100644 --- a/conf/nginx/heroku.conf.php +++ b/conf/nginx/heroku.conf.php @@ -1,72 +1,72 @@ http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - server_tokens off; - - fastcgi_buffers 256 4k; - - # define an easy to reference name that can be used in fastgi_pass - upstream heroku-fcgi { - #server 127.0.0.1:4999 max_fails=3 fail_timeout=3s; - server unix:/tmp/heroku.fcgi..sock max_fails=3 fail_timeout=3s; - keepalive 16; - } - - server { - # define an easy to reference name that can be used in try_files - location @heroku-fcgi { - include fastcgi_params; - - fastcgi_split_path_info ^(.+\.php)(/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - # try_files resets $fastcgi_path_info, see http://trac.nginx.org/nginx/ticket/321, so we use the if instead - fastcgi_param PATH_INFO $fastcgi_path_info if_not_empty; - - if (!-f $document_root$fastcgi_script_name) { - # check if the script exists - # otherwise, /foo.jpg/bar.php would get passed to FPM, which wouldn't run it as it's not in the list of allowed extensions, but this check is a good idea anyway, just in case - return 404; - } - - fastcgi_pass heroku-fcgi; - } - - # TODO: use X-Forwarded-Host? http://comments.gmane.org/gmane.comp.web.nginx.english/2170 - server_name localhost; - listen ; - # FIXME: breaks redirects with foreman - port_in_redirect off; - - root ""; - - error_log stderr; - access_log /tmp/heroku.nginx_access..log; - - include ""; - - # restrict access to hidden files, just in case - location ~ /\. { - deny all; - } - - # default handling of .php - location ~ \.php { - try_files @heroku-fcgi @heroku-fcgi; - } - } + include mime.types; + default_type application/octet-stream; + + #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + # '$status $body_bytes_sent "$http_referer" ' + # '"$http_user_agent" "$http_x_forwarded_for"'; + + #access_log logs/access.log main; + + sendfile on; + #tcp_nopush on; + + #keepalive_timeout 0; + keepalive_timeout 65; + + #gzip on; + + server_tokens off; + + fastcgi_buffers 256 4k; + + # define an easy to reference name that can be used in fastgi_pass + upstream heroku-fcgi { + #server 127.0.0.1:4999 max_fails=3 fail_timeout=3s; + server unix:/tmp/heroku.fcgi..sock max_fails=3 fail_timeout=3s; + keepalive 16; + } + + server { + # define an easy to reference name that can be used in try_files + location @heroku-fcgi { + include fastcgi_params; + + fastcgi_split_path_info ^(.+\.php)(/.*)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + # try_files resets $fastcgi_path_info, see http://trac.nginx.org/nginx/ticket/321, so we use the if instead + fastcgi_param PATH_INFO $fastcgi_path_info if_not_empty; + + if (!-f $document_root$fastcgi_script_name) { + # check if the script exists + # otherwise, /foo.jpg/bar.php would get passed to FPM, which wouldn't run it as it's not in the list of allowed extensions, but this check is a good idea anyway, just in case + return 404; + } + + fastcgi_pass heroku-fcgi; + } + + # TODO: use X-Forwarded-Host? http://comments.gmane.org/gmane.comp.web.nginx.english/2170 + server_name localhost; + listen ; + # FIXME: breaks redirects with foreman + port_in_redirect off; + + root ""; + + error_log stderr; + access_log /tmp/heroku.nginx_access..log; + + include ""; + + # restrict access to hidden files, just in case + location ~ /\. { + deny all; + } + + # default handling of .php + location ~ \.php { + try_files @heroku-fcgi @heroku-fcgi; + } + } } diff --git a/conf/php/php-fpm.conf b/conf/php/php-fpm.conf index e08cc34a7..3e525ae61 100644 --- a/conf/php/php-fpm.conf +++ b/conf/php/php-fpm.conf @@ -87,11 +87,11 @@ log_level = warning ; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. ; Default Value: yes daemonize = no - + ; Set open file descriptor rlimit for the master process. ; Default Value: system defined value ;rlimit_files = 1024 - + ; Set max core size rlimit for the master process. ; Possible Values: 'unlimited' or an integer greater or equal to 0 ; Default Value: system defined value @@ -171,7 +171,7 @@ listen = /tmp/heroku.fcgi.${PORT}.sock ;listen.owner = nobody ;listen.group = nobody ;listen.mode = 0666 - + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original ; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address @@ -244,7 +244,7 @@ pm.max_spare_servers = 3 ; Note: Used only when pm is set to 'ondemand' ; Default Value: 10s ;pm.process_idle_timeout = 10s; - + ; The number of requests each child process should execute before respawning. ; This can be useful to work around memory leaks in 3rd party libraries. For ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. @@ -349,7 +349,7 @@ pm.max_spare_servers = 3 ; may conflict with a real PHP file. ; Default Value: not set ;pm.status_path = /status - + ; The ping URI to call the monitoring page of FPM. If this value is not set, no ; URI will be recognized as a ping page. This could be used to test from outside ; that FPM is alive and responding, or to @@ -425,34 +425,34 @@ pm.max_spare_servers = 3 ; ; Default: "%R - %u %t \"%m %r\" %s" ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - + ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set slowlog = /tmp/heroku.php-fpm.${PORT}.www.slowlog - + ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. ; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) ; Default Value: 0 ;request_slowlog_timeout = 0 - + ; The timeout for serving a single request after which the worker process will ; be killed. This option should be used when the 'max_execution_time' ini option ; does not stop script execution for some reason. A value of '0' means 'off'. ; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) ; Default Value: 0 ;request_terminate_timeout = 0 - + ; Set open file descriptor rlimit. ; Default Value: system defined value ;rlimit_files = 1024 - + ; Set max core size rlimit. ; Possible Values: 'unlimited' or an integer greater or equal to 0 ; Default Value: system defined value ;rlimit_core = 0 - + ; Chroot to this directory at the start. This value must be defined as an ; absolute path. When this value is not set, chroot is not used. ; Note: you can prefix with '$prefix' to chroot to the pool prefix or one @@ -463,12 +463,12 @@ slowlog = /tmp/heroku.php-fpm.${PORT}.www.slowlog ; (error_log, sessions.save_path, ...). ; Default Value: not set ;chroot = - + ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot ;chdir = /var/www - + ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. ; Note: on highloaded environement, this can cause some delay in the page @@ -492,7 +492,7 @@ clear_env = no ; Note: set an empty value to allow all extensions. ; Default Value: .php ;security.limit_extensions = .php .php3 .php4 .php5 - + ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; the current environment. ; Default Value: clean env diff --git a/support/build/_util/include/manifest.py b/support/build/_util/include/manifest.py index c44922583..42cf7f34a 100644 --- a/support/build/_util/include/manifest.py +++ b/support/build/_util/include/manifest.py @@ -6,22 +6,22 @@ require["heroku/installer-plugin"] = "^1.2.0" if sys.argv[1] == 'heroku-sys-library': - require["heroku/installer-plugin"] = "^1.3.0" + require["heroku/installer-plugin"] = "^1.3.0" manifest = { - "type": sys.argv[1], - "name": sys.argv[2], - "version": sys.argv[3], - "dist": { - "type": "heroku-sys-tar", - "url": "https://"+os.getenv("S3_BUCKET")+"."+os.getenv("S3_REGION", "s3")+".amazonaws.com/"+os.getenv("S3_PREFIX")+sys.argv[4] - }, - "require": require, - "conflict": json.loads(sys.argv[6]) if len(sys.argv) > 6 else {}, - "replace": json.loads(sys.argv[7]) if len(sys.argv) > 7 else {}, - "provide": json.loads(sys.argv[8]) if len(sys.argv) > 8 else {}, - "extra": json.loads(sys.argv[9]) if len(sys.argv) > 9 else {}, - "time": datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + "type": sys.argv[1], + "name": sys.argv[2], + "version": sys.argv[3], + "dist": { + "type": "heroku-sys-tar", + "url": "https://"+os.getenv("S3_BUCKET")+"."+os.getenv("S3_REGION", "s3")+".amazonaws.com/"+os.getenv("S3_PREFIX")+sys.argv[4] + }, + "require": require, + "conflict": json.loads(sys.argv[6]) if len(sys.argv) > 6 else {}, + "replace": json.loads(sys.argv[7]) if len(sys.argv) > 7 else {}, + "provide": json.loads(sys.argv[8]) if len(sys.argv) > 8 else {}, + "extra": json.loads(sys.argv[9]) if len(sys.argv) > 9 else {}, + "time": datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") } json.dump(manifest, sys.stdout, sort_keys=True) diff --git a/support/build/_util/include/manifest.sh b/support/build/_util/include/manifest.sh index b2d56c604..0b7846f5a 100755 --- a/support/build/_util/include/manifest.sh +++ b/support/build/_util/include/manifest.sh @@ -1,19 +1,19 @@ #!/bin/bash print_or_export_manifest_cmd() { - if [[ "${MANIFEST_CMD:-}" ]]; then - echo "$1" > $MANIFEST_CMD - else - echo "-----> Done. Run '$1' to upload manifest." - fi + if [[ "${MANIFEST_CMD:-}" ]]; then + echo "$1" > $MANIFEST_CMD + else + echo "-----> Done. Run '$1' to upload manifest." + fi } generate_manifest_cmd() { - echo "s3cmd --ssl${AWS_ACCESS_KEY_ID+" --access_key=\$AWS_ACCESS_KEY_ID"}${AWS_SECRET_ACCESS_KEY+" --secret_key=\$AWS_SECRET_ACCESS_KEY"} --acl-public -m application/json put $(pwd)/${1} s3://${S3_BUCKET}/${S3_PREFIX}${1}" + echo "s3cmd --ssl${AWS_ACCESS_KEY_ID+" --access_key=\$AWS_ACCESS_KEY_ID"}${AWS_SECRET_ACCESS_KEY+" --secret_key=\$AWS_SECRET_ACCESS_KEY"} --acl-public -m application/json put $(pwd)/${1} s3://${S3_BUCKET}/${S3_PREFIX}${1}" } soname_version() { - soname=$(objdump -p $1 | grep SONAME | awk '{ printf $2; }') - file=$(basename $1) - echo "${soname#${file}.}" + soname=$(objdump -p $1 | grep SONAME | awk '{ printf $2; }') + file=$(basename $1) + echo "${soname#${file}.}" } \ No newline at end of file diff --git a/support/build/apache b/support/build/apache index a55b3ee44..b58d895ca 100755 --- a/support/build/apache +++ b/support/build/apache @@ -33,19 +33,19 @@ curl -L ${aprutil_url} | tar xz --strip-components=1 -C ${dep_dirname}/srclib/ap pushd ${dep_dirname} ./configure \ - --enable-layout=GNU \ - --prefix=${OUT_PREFIX} \ - --disable-static \ - --with-included-apr \ - --with-pcre \ - --with-z \ - --with-ssl \ - --with-mpm=event \ - --enable-mods-shared=all \ - --enable-proxy \ - --enable-proxy-fcgi \ - --enable-rewrite \ - --enable-deflate + --enable-layout=GNU \ + --prefix=${OUT_PREFIX} \ + --disable-static \ + --with-included-apr \ + --with-pcre \ + --with-z \ + --with-ssl \ + --with-mpm=event \ + --enable-mods-shared=all \ + --enable-proxy \ + --enable-proxy-fcgi \ + --enable-rewrite \ + --enable-deflate make -s -j 9 make install -s find ${OUT_PREFIX} -type f \( -executable -o -name '*.a' \) -exec sh -c "file -i '{}' | grep -Eq 'application/x-(archive|executable|sharedlib); charset=binary'" \; -print | xargs strip --strip-unneeded diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire b/support/build/extensions/no-debug-non-zts-20121212/blackfire index 4f9f9b320..a96931221 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/blackfire +++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire @@ -98,12 +98,12 @@ find ${OUT_PREFIX} -type f \( -executable -o -name '*.a' \) -exec sh -c "file -i # gets sourced on dyno boot cat > ${OUT_PREFIX}/bin/profile.blackfire.sh <<'EOF' if [[ -n "$BLACKFIRE_SERVER_TOKEN" && -n "$BLACKFIRE_SERVER_ID" ]]; then - if [[ -f "/app/.heroku/php/bin/blackfire-agent" ]]; then - touch /app/.heroku/php/var/blackfire/run/agent.sock - /app/.heroku/php/bin/blackfire-agent -config=/app/.heroku/php/etc/blackfire/agent.ini -socket="unix:///app/.heroku/php/var/blackfire/run/agent.sock" & - else - echo >&2 "WARNING: Add-on 'blackfire' detected, but PHP extension not yet installed. Push an update to the application to finish installation of the add-on; an empty change ('git commit --allow-empty') is sufficient." - fi + if [[ -f "/app/.heroku/php/bin/blackfire-agent" ]]; then + touch /app/.heroku/php/var/blackfire/run/agent.sock + /app/.heroku/php/bin/blackfire-agent -config=/app/.heroku/php/etc/blackfire/agent.ini -socket="unix:///app/.heroku/php/var/blackfire/run/agent.sock" & + else + echo >&2 "WARNING: Add-on 'blackfire' detected, but PHP extension not yet installed. Push an update to the application to finish installation of the add-on; an empty change ('git commit --allow-empty') is sufficient." + fi fi EOF mkdir -p ${OUT_PREFIX}/etc/php/conf.d diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra b/support/build/extensions/no-debug-non-zts-20121212/cassandra index c6bf2bcd9..4730de3a1 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra @@ -4,8 +4,8 @@ needed=( libgmp-dev ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi dep_name=$(basename $BASH_SOURCE) diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached b/support/build/extensions/no-debug-non-zts-20121212/memcached index 3cc57272b..d0dfb5281 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached @@ -9,47 +9,47 @@ export PATH=${OUT_PREFIX}/bin:${PATH} needed=( libsasl2-2 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "Error! Missing libraries: $missing" - exit 1 + echo "Error! Missing libraries: $missing" + exit 1 fi # let's see if libmemcached is there, if not then we have to use the vendored one needed=( libmemcached11 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "Using vendored libmemcached..." - # use vendored libmcrypt - CONFIGURE_EXTRA="--with-libmemcached-dir=${OUT_PREFIX}" - - # we need to declare the required version of libmemcached - dep_formula=${0#$WORKSPACE_DIR/} - dep_version=${dep_formula##*"/${dep_name}-"} - series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest - case "$dep_version" in - *) - MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/libmemcached\":\"^1.0.18\",\"heroku-sys/libmemcached-abi\":\"^11\"}"}" - ;; - esac + echo "Using vendored libmemcached..." + # use vendored libmcrypt + CONFIGURE_EXTRA="--with-libmemcached-dir=${OUT_PREFIX}" + + # we need to declare the required version of libmemcached + dep_formula=${0#$WORKSPACE_DIR/} + dep_version=${dep_formula##*"/${dep_name}-"} + series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest + case "$dep_version" in + *) + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/libmemcached\":\"^1.0.18\",\"heroku-sys/libmemcached-abi\":\"^11\"}"}" + ;; + esac else - echo "Using system libmemcached..." - # use system libmemcached - CONFIGURE_EXTRA= - # but do we need headers? - needed=( libmemcached-dev ) - missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) - if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing - fi + echo "Using system libmemcached..." + # use system libmemcached + CONFIGURE_EXTRA= + # but do we need headers? + needed=( libmemcached-dev ) + missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) + if [[ "$missing" ]]; then + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing + fi fi # we need libsasl2-dev for ext-memcached needed=( libsasl2-dev ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/memcached.ini-dist\"}"}" @@ -61,8 +61,8 @@ cat > ${OUT_PREFIX}/etc/php/conf.d/memcached.ini-dist <<'EOF' extension = memcached.so EOF if [[ $dep_version == 2.* ]]; then - # this setting is gone in v3; SASL gets initialized on demand - cat >> ${OUT_PREFIX}/etc/php/conf.d/memcached.ini-dist <<'EOF' + # this setting is gone in v3; SASL gets initialized on demand + cat >> ${OUT_PREFIX}/etc/php/conf.d/memcached.ini-dist <<'EOF' memcached.use_sasl = 1 EOF fi diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 70c5df9b3..471c53ac7 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -57,27 +57,27 @@ mkdir -p ${OUT_PREFIX}/bin # gets sourced on dyno boot cat > ${OUT_PREFIX}/bin/profile.newrelic.sh <<'EOF' if [[ -n "$NEW_RELIC_LICENSE_KEY" ]]; then - if [[ -f "/app/.heroku/php/bin/newrelic-daemon" ]]; then - export NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME:-${HEROKU_APP_NAME:-"PHP Application on Heroku"}} - export NEW_RELIC_LOG_LEVEL=${NEW_RELIC_LOG_LEVEL:-"warning"} - - # The daemon is a started in foreground mode so it will not daemonize - # (i.e. disassociate from the controlling TTY and disappear into the - # background). - # - # Perpetually tail and redirect the daemon log file to stderr so that it - # may be observed via 'heroku logs'. - touch /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log - tail -qF -n 0 /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log 1>&2 & - - # daemon start - /app/.heroku/php/bin/newrelic-daemon --foreground --port "@newrelic-daemon" --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" & - - # give it a moment to connect - sleep 2 - else - echo >&2 "WARNING: Add-on 'newrelic' detected, but PHP extension not yet installed. Push an update to the application to finish installation of the add-on; an empty change ('git commit --allow-empty') is sufficient." - fi + if [[ -f "/app/.heroku/php/bin/newrelic-daemon" ]]; then + export NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME:-${HEROKU_APP_NAME:-"PHP Application on Heroku"}} + export NEW_RELIC_LOG_LEVEL=${NEW_RELIC_LOG_LEVEL:-"warning"} + + # The daemon is a started in foreground mode so it will not daemonize + # (i.e. disassociate from the controlling TTY and disappear into the + # background). + # + # Perpetually tail and redirect the daemon log file to stderr so that it + # may be observed via 'heroku logs'. + touch /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log + tail -qF -n 0 /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log 1>&2 & + + # daemon start + /app/.heroku/php/bin/newrelic-daemon --foreground --port "@newrelic-daemon" --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" & + + # give it a moment to connect + sleep 2 + else + echo >&2 "WARNING: Add-on 'newrelic' detected, but PHP extension not yet installed. Push an update to the application to finish installation of the add-on; an empty change ('git commit --allow-empty') is sufficient." + fi fi EOF mkdir -p ${OUT_PREFIX}/etc/php/conf.d diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp b/support/build/extensions/no-debug-non-zts-20131226/amqp index ce331ed32..89c4db3c4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp @@ -4,15 +4,15 @@ needed=( librabbitmq4 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "Need $missing"; exit 1; + echo "Need $missing"; exit 1; fi # but do we need headers? needed=( librabbitmq-dev ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi dep_name=$(basename $BASH_SOURCE) diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu b/support/build/extensions/no-debug-non-zts-20151012/apcu index 998048d8e..92e7d9999 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu @@ -28,8 +28,8 @@ curl -L ${dep_url} | tar xz pushd ${dep_dirname} phpize ./configure \ - --prefix=${OUT_PREFIX} \ - ${CONFIGURE_EXTRA:-} + --prefix=${OUT_PREFIX} \ + ${CONFIGURE_EXTRA:-} make -s -j 9 make install -s popd @@ -47,7 +47,7 @@ curl -L ${dep2_url} | tar xz pushd ${dep2_dirname} phpize ./configure \ - --prefix=${OUT_PREFIX} + --prefix=${OUT_PREFIX} make -s -j 9 # php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension rm -rf ${OUT_PREFIX}/* diff --git a/support/build/extensions/pecl b/support/build/extensions/pecl index 30f3d6dfe..18c921dd6 100755 --- a/support/build/extensions/pecl +++ b/support/build/extensions/pecl @@ -27,8 +27,8 @@ curl -L ${dep_url} | tar xz pushd ${dep_dirname} phpize ./configure \ - --prefix=${OUT_PREFIX} \ - ${CONFIGURE_EXTRA:-} + --prefix=${OUT_PREFIX} \ + ${CONFIGURE_EXTRA:-} make -s -j 9 # php was a build dep, and it's in $OUT_PREFIX. nuke that, then make install so all we're left with is the extension rm -rf ${OUT_PREFIX}/* diff --git a/support/build/hhvm b/support/build/hhvm index bd74455d4..ff8af047a 100755 --- a/support/build/hhvm +++ b/support/build/hhvm @@ -18,9 +18,9 @@ dep_version=${dep_formula#"${dep_name}-"} dep_package=${dep_name}-${dep_version} dep_dirname=hhvm_${dep_version} if [[ $STACK == "cedar" ]]; then - dep_archive_name=${dep_dirname}~lucid_amd64.deb + dep_archive_name=${dep_dirname}~lucid_amd64.deb else - dep_archive_name=${dep_dirname}~trusty_amd64.deb + dep_archive_name=${dep_dirname}~trusty_amd64.deb fi dep_url=http://dl.hhvm.com/ubuntu/pool/main/h/hhvm/${dep_archive_name} dep_manifest=${dep_package}.composer.json @@ -30,7 +30,7 @@ echo "-----> Building ${dep_package}..." mkdir -p $OUT_PREFIX if [[ $STACK == "cedar" ]]; then - deps="${dep_url} + deps="${dep_url} http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu/pool/main/b/binutils/binutils_2.22-4ubuntu1~10.04.1_amd64.deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~10.04.1_amd64.deb http://mirrors.kernel.org/ubuntu/pool/universe/t/tbb/libtbb2_2.2+r009-1_amd64.deb @@ -39,7 +39,7 @@ http://mirrors.kernel.org/ubuntu/pool/universe/libm/libmcrypt/libmcrypt4_2.5.8-3 http://mirrors.kernel.org/ubuntu/pool/universe/u/uw-imap/libc-client2007e_2007e~dfsg-3.1_amd64.deb http://mirrors.kernel.org/ubuntu/pool/main/e/elfutils/libelf1_0.143-1_amd64.deb" else - deps="${dep_url} + deps="${dep_url} http://mirrors.kernel.org/ubuntu/pool/main/b/boost1.54/libboost-filesystem1.54.0_1.54.0-4ubuntu3.1_amd64.deb http://mirrors.kernel.org/ubuntu/pool/main/b/boost1.54/libboost-program-options1.54.0_1.54.0-4ubuntu3.1_amd64.deb http://mirrors.kernel.org/ubuntu/pool/main/b/boost1.54/libboost-regex1.54.0_1.54.0-4ubuntu3.1_amd64.deb @@ -60,10 +60,10 @@ http://mirrors.kernel.org/ubuntu/pool/main/libu/libunwind/libunwind8_1.1-3.2_amd fi for dep in $deps; do - depb=$(basename $dep) - echo " - $depb" - curl -LO $dep - dpkg -x $depb ${OUT_PREFIX} + depb=$(basename $dep) + echo " - $depb" + curl -LO $dep + dpkg -x $depb ${OUT_PREFIX} done strip --strip-unneeded ${OUT_PREFIX}/usr/bin/* diff --git a/support/build/libraries/libc-client b/support/build/libraries/libc-client index 3b874c1a1..66ff63d1d 100755 --- a/support/build/libraries/libc-client +++ b/support/build/libraries/libc-client @@ -25,8 +25,8 @@ echo "-----> Building ${dep_package}..." needed=( libpam0g-dev ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi curl -L ${dep_url} | tar xz diff --git a/support/build/libraries/libcassandra b/support/build/libraries/libcassandra index 47debfaf9..5a4a88152 100755 --- a/support/build/libraries/libcassandra +++ b/support/build/libraries/libcassandra @@ -23,8 +23,8 @@ dep_manifest=${dep_package}.composer.json needed=( libgmp-dev cmake ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi echo "-----> Building ${dep_package}..." diff --git a/support/build/libraries/libmcrypt b/support/build/libraries/libmcrypt index 4c35f1866..cd9fe8159 100755 --- a/support/build/libraries/libmcrypt +++ b/support/build/libraries/libmcrypt @@ -24,19 +24,19 @@ needed=( libmcrypt4 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "-----> Building ${dep_package}..." + echo "-----> Building ${dep_package}..." - curl -L ${dep_url} | tar xz + curl -L ${dep_url} | tar xz - pushd ${dep_dirname} - ./configure --disable-posix-threads --prefix=${OUT_PREFIX} - make -s -j 9 - make install-strip -s - popd + pushd ${dep_dirname} + ./configure --disable-posix-threads --prefix=${OUT_PREFIX} + make -s -j 9 + make install-strip -s + popd - rm -rf ${OUT_PREFIX}/man + rm -rf ${OUT_PREFIX}/man else - echo "-----> System ${dep_name} available, creating empty package..." + echo "-----> System ${dep_name} available, creating empty package..." fi python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" > $dep_manifest diff --git a/support/build/libraries/libmemcached b/support/build/libraries/libmemcached index 90622c3c8..eb7175c86 100755 --- a/support/build/libraries/libmemcached +++ b/support/build/libraries/libmemcached @@ -23,39 +23,39 @@ dep_manifest=${dep_package}.composer.json needed=( libsasl2-2 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "Error! Missing libraries: $missing" - exit 1 + echo "Error! Missing libraries: $missing" + exit 1 fi # skip build if already present needed=( libmemcached11 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - # we need libsasl2-dev - needed=( libsasl2-dev ) - missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) - if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing - fi - echo "-----> Building ${dep_package}..." + # we need libsasl2-dev + needed=( libsasl2-dev ) + missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) + if [[ "$missing" ]]; then + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing + fi + echo "-----> Building ${dep_package}..." - curl -L ${dep_url} | tar xz - pushd ${dep_dirname} - ./configure --prefix=${OUT_PREFIX} --without-memcached --disable-static - make -s -j 9 - make install-strip -s - popd + curl -L ${dep_url} | tar xz + pushd ${dep_dirname} + ./configure --prefix=${OUT_PREFIX} --without-memcached --disable-static + make -s -j 9 + make install-strip -s + popd - rm -rf ${OUT_PREFIX}/share/man + rm -rf ${OUT_PREFIX}/share/man - ABI_VERSION=$(soname_version ${OUT_PREFIX}/lib/libmemcached.so) - type="heroku-sys-library" + ABI_VERSION=$(soname_version ${OUT_PREFIX}/lib/libmemcached.so) + type="heroku-sys-library" else - echo "-----> System ${dep_name} available, creating empty package..." - ABI_VERSION=$(soname_version /usr/lib/x86_64-linux-gnu/libmemcached.so) - # we don't want this dummy package to end up in the Composer repository - type="heroku-sys-package" + echo "-----> System ${dep_name} available, creating empty package..." + ABI_VERSION=$(soname_version /usr/lib/x86_64-linux-gnu/libmemcached.so) + # we don't want this dummy package to end up in the Composer repository + type="heroku-sys-package" fi echo diff --git a/support/build/libraries/librdkafka b/support/build/libraries/librdkafka index 26af40eeb..4dfedefa0 100755 --- a/support/build/libraries/librdkafka +++ b/support/build/libraries/librdkafka @@ -22,8 +22,8 @@ dep_manifest=${dep_package}.composer.json needed=( libsasl2-dev ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi echo "-----> Building ${dep_package}..." diff --git a/support/build/nginx b/support/build/nginx index 35051d7e4..c9152f273 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -27,18 +27,18 @@ pushd ${dep_dirname} ETC=${OUT_PREFIX}/etc VAR=${OUT_PREFIX}/var ./configure \ - --prefix=${OUT_PREFIX} \ - --conf-path=${ETC}/nginx/nginx.conf \ - --pid-path=${VAR}/run/nginx.pid \ - --lock-path=${VAR}/run/nginx.lock \ - --http-client-body-temp-path=${VAR}/run/nginx/client_body_temp \ - --http-proxy-temp-path=${VAR}/run/nginx/proxy_temp \ - --http-fastcgi-temp-path=${VAR}/run/nginx/fastcgi_temp \ - --http-uwsgi-temp-path=${VAR}/run/nginx/uwsgi_temp \ - --http-scgi-temp-path=${VAR}/run/nginx/scgi_temp \ - --http-log-path=${VAR}/log/nginx/access.log \ - --error-log-path=${VAR}/log/nginx/error.log \ - --with-http_realip_module + --prefix=${OUT_PREFIX} \ + --conf-path=${ETC}/nginx/nginx.conf \ + --pid-path=${VAR}/run/nginx.pid \ + --lock-path=${VAR}/run/nginx.lock \ + --http-client-body-temp-path=${VAR}/run/nginx/client_body_temp \ + --http-proxy-temp-path=${VAR}/run/nginx/proxy_temp \ + --http-fastcgi-temp-path=${VAR}/run/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=${VAR}/run/nginx/uwsgi_temp \ + --http-scgi-temp-path=${VAR}/run/nginx/scgi_temp \ + --http-log-path=${VAR}/log/nginx/access.log \ + --error-log-path=${VAR}/log/nginx/error.log \ + --with-http_realip_module make -s -j 9 make install -s find ${OUT_PREFIX} -type f \( -executable -o -name '*.a' \) -exec sh -c "file -i '{}' | grep -Eq 'application/x-(archive|executable|sharedlib); charset=binary'" \; -print | xargs strip --strip-unneeded diff --git a/support/build/php b/support/build/php index 7a0c8a361..f5e24cbf6 100755 --- a/support/build/php +++ b/support/build/php @@ -17,19 +17,19 @@ dep_package=${dep_name}-${dep_version} dep_dirname=php-${dep_version} dep_archive_name=${dep_dirname}.tar.gz if [[ $dep_version == *alpha* ]] || [[ $dep_version == *beta* ]] || [[ $dep_version == *RC* ]]; then - if [[ $dep_version == 5.5.* ]]; then - dep_url=https://downloads.php.net/~jpauli/${dep_archive_name} - elif [[ $dep_version == 5.6.* ]]; then - dep_url=https://downloads.php.net/~tyrael/${dep_archive_name} - elif [[ $dep_version == 7.0.* ]]; then - dep_url=https://downloads.php.net/~ab/${dep_archive_name} - elif [[ $dep_version == 7.1.* ]]; then - dep_url=https://downloads.php.net/~krakjoe/${dep_archive_name} - elif [[ $dep_version == 7.2.* ]]; then - dep_url=https://downloads.php.net/~pollita/${dep_archive_name} - fi + if [[ $dep_version == 5.5.* ]]; then + dep_url=https://downloads.php.net/~jpauli/${dep_archive_name} + elif [[ $dep_version == 5.6.* ]]; then + dep_url=https://downloads.php.net/~tyrael/${dep_archive_name} + elif [[ $dep_version == 7.0.* ]]; then + dep_url=https://downloads.php.net/~ab/${dep_archive_name} + elif [[ $dep_version == 7.1.* ]]; then + dep_url=https://downloads.php.net/~krakjoe/${dep_archive_name} + elif [[ $dep_version == 7.2.* ]]; then + dep_url=https://downloads.php.net/~pollita/${dep_archive_name} + fi else - dep_url=https://php.net/get/${dep_archive_name}/from/this/mirror + dep_url=https://php.net/get/${dep_archive_name}/from/this/mirror fi dep_manifest=${dep_package}.composer.json @@ -41,78 +41,78 @@ pushd ${dep_dirname} libicu="libicu55" if [[ $STACK == "cedar-14" ]]; then - libicu="libicu52" + libicu="libicu52" fi # we need libgmp for GMP, libpam0g for IMAP, libicu for intl, libsasl2/krb/ldap for LDAP needed=( libgmp10 libpam0g $libicu libsasl2-2 libkrb5-3 libldap-2.4-2 ) if [[ $STACK != "cedar-14" ]]; then - needed+=( libsodium18 ) + needed+=( libsodium18 ) fi missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "Error! Missing libraries: $missing" - exit 1 + echo "Error! Missing libraries: $missing" + exit 1 fi # we need libgmp-dev for GMP, libpam0g-dev for IMAP, libicu-dev for intl, libsasl2/krb5/ldap2-dev for LDAP needed=( libgmp-dev libpam0g-dev libicu-dev libsasl2-dev libkrb5-dev libldap2-dev ) if [[ $STACK != "cedar-14" ]]; then - needed+=( libsodium-dev ) + needed+=( libsodium-dev ) fi missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing fi if dpkg --compare-versions "$dep_version" "lt" 7.0.16 || dpkg --compare-versions "$dep_version" "eq" 7.1.0 || dpkg --compare-versions "$dep_version" "eq" 7.1.1; 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 + # 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 if dpkg --compare-versions "$dep_version" "lt" 7.1.15 || dpkg --compare-versions "$dep_version" "eq" 7.2.0 || dpkg --compare-versions "$dep_version" "eq" 7.2.1 || dpkg --compare-versions "$dep_version" "eq" 7.2.2; then - # 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 - sed -i 's/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure + # 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 + sed -i 's/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR/LDAP_SASL_LIBDIR=$LDAP_SASL_DIR\/$PHP_LIBDIR\/x86_64-linux-gnu/' configure fi # let's see if mcrypt is there, if not then we have to use the vendored one needed=( libmcrypt4 ) missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then - echo "Using vendored libmcrypt..." - # use vendored libmcrypt - mcrypt_prefix="${OUT_PREFIX}" + echo "Using vendored libmcrypt..." + # use vendored libmcrypt + mcrypt_prefix="${OUT_PREFIX}" else - echo "Using system libmcrypt..." - # use system libmcrypt - mcrypt_prefix= - # but do we need headers? - needed=( libmcrypt-dev ) - missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) - if [[ "$missing" ]]; then - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing - fi + echo "Using system libmcrypt..." + # use system libmcrypt + mcrypt_prefix= + # but do we need headers? + needed=( libmcrypt-dev ) + missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) + if [[ "$missing" ]]; then + apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } + apt-get install -q -y $missing + fi fi configureopts= if [[ $dep_version == 7.* ]]; then - configureopts="\ + configureopts="\ --enable-opcache-file\ " - if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then - configureopts="\ + if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then + configureopts="\ --with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix} \ " - elif [[ $STACK != "cedar-14" ]]; then - configureopts="\ + elif [[ $STACK != "cedar-14" ]]; then + configureopts="\ --with-sodium=shared \ " - fi + fi else - configureopts="\ + configureopts="\ --with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix} \ --with-mysql=shared \ " @@ -122,47 +122,47 @@ export PATH=${OUT_PREFIX}/bin:$PATH # cannot be built shared: date, ereg, opcache (always), pcre, reflection, sockets (?), spl, standard, # sqlite3 and pdo_sqlite are on by default but we're building them shared on purpose ./configure \ - --prefix=${OUT_PREFIX} \ - --with-config-file-path=/app/.heroku/php/etc/php \ - --with-config-file-scan-dir=/app/.heroku/php/etc/php/conf.d \ - --disable-phpdbg \ - --enable-fpm \ - --with-bz2 \ - --with-curl \ - --with-pdo-mysql \ - --with-mysqli \ - --with-openssl \ - --with-kerberos \ - --with-pgsql \ - --with-pdo-pgsql \ - --with-readline \ - --enable-sockets \ - --enable-zip \ - --with-zlib \ - --enable-bcmath=shared \ - --enable-calendar=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --with-gd=shared \ - --with-freetype-dir=/usr \ - --with-jpeg-dir=/usr \ - --with-png-dir=/usr \ - --with-gettext=shared \ - --with-gmp=shared \ - --with-imap=shared,${OUT_PREFIX}/opt/imap-2007f \ - --with-imap-ssl \ - --enable-intl=shared \ - --with-ldap=shared \ - --with-ldap-sasl \ - --enable-mbstring=shared \ - --enable-pcntl=shared \ - --enable-shmop=shared \ - --enable-soap=shared \ - --with-sqlite3=shared \ - --with-pdo-sqlite=shared \ - --with-xmlrpc=shared \ - --with-xsl=shared \ - $configureopts + --prefix=${OUT_PREFIX} \ + --with-config-file-path=/app/.heroku/php/etc/php \ + --with-config-file-scan-dir=/app/.heroku/php/etc/php/conf.d \ + --disable-phpdbg \ + --enable-fpm \ + --with-bz2 \ + --with-curl \ + --with-pdo-mysql \ + --with-mysqli \ + --with-openssl \ + --with-kerberos \ + --with-pgsql \ + --with-pdo-pgsql \ + --with-readline \ + --enable-sockets \ + --enable-zip \ + --with-zlib \ + --enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --with-gd=shared \ + --with-freetype-dir=/usr \ + --with-jpeg-dir=/usr \ + --with-png-dir=/usr \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-imap=shared,${OUT_PREFIX}/opt/imap-2007f \ + --with-imap-ssl \ + --enable-intl=shared \ + --with-ldap=shared \ + --with-ldap-sasl \ + --enable-mbstring=shared \ + --enable-pcntl=shared \ + --enable-shmop=shared \ + --enable-soap=shared \ + --with-sqlite3=shared \ + --with-pdo-sqlite=shared \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + $configureopts make -s -j 9 make install -s rm -rf ${OUT_PREFIX}/opt/imap-2007f # c-client.a got linked statically @@ -180,14 +180,14 @@ curl -sS https://getcomposer.org/installer | php mkdir -p ${OUT_PREFIX}/etc/php/conf.d shared=() for f in ${OUT_PREFIX}/lib/php/extensions/*/*.so; do - if [[ $(basename $f) == "opcache.so" ]]; then - # opcache needs to be loaded using zend_extension - echo -n "zend_" >> ${OUT_PREFIX}/etc/php/php.ini - else - # do not record opcache.so as shared; always on via php.ini - shared+=("heroku-sys/ext-$(basename $f .so)") - fi - echo "extension=$(basename $f)" >> ${OUT_PREFIX}/etc/php/php.ini + if [[ $(basename $f) == "opcache.so" ]]; then + # opcache needs to be loaded using zend_extension + echo -n "zend_" >> ${OUT_PREFIX}/etc/php/php.ini + else + # do not record opcache.so as shared; always on via php.ini + shared+=("heroku-sys/ext-$(basename $f .so)") + fi + echo "extension=$(basename $f)" >> ${OUT_PREFIX}/etc/php/php.ini done extra=$(echo "${shared[@]}" | python -c 'import sys, json; json.dump({"shared": dict([item.split(":") if ":" in item else (item, True) for item in sys.stdin.read().split()]), "export": "bin/export.php.sh", "profile": "bin/profile.php.sh"}, sys.stdout)') diff --git a/support/build/php-min b/support/build/php-min index b31456d22..bc2447642 100755 --- a/support/build/php-min +++ b/support/build/php-min @@ -29,30 +29,30 @@ export PATH=${OUT_PREFIX}/bin:$PATH # cannot be built shared: date, ereg, opcache (always), pcre, reflection, sockets (?), spl, standard, # sqlite3 and pdo_sqlite are on by default but we're building them shared on purpose ./configure \ - --prefix=${OUT_PREFIX} \ - --with-config-file-path=/app/.heroku/php-min/etc/php \ - --with-config-file-scan-dir=/app/.heroku/php-min/etc/php/conf.d \ - --enable-static \ - --disable-phpdbg \ - --disable-cgi \ - --enable-cli\ - --with-bz2 \ - --disable-dom \ - --disable-libxml \ - --with-openssl \ - --without-pear \ - --disable-pdo \ - --without-pdo-sqlite \ - --with-readline \ - --disable-session \ - --disable-simplexml \ - --without-sqlite3 \ - --enable-sockets \ - --disable-xml \ - --disable-xmlreader \ - --disable-xmlwriter \ - --enable-zip \ - --with-zlib + --prefix=${OUT_PREFIX} \ + --with-config-file-path=/app/.heroku/php-min/etc/php \ + --with-config-file-scan-dir=/app/.heroku/php-min/etc/php/conf.d \ + --enable-static \ + --disable-phpdbg \ + --disable-cgi \ + --enable-cli\ + --with-bz2 \ + --disable-dom \ + --disable-libxml \ + --with-openssl \ + --without-pear \ + --disable-pdo \ + --without-pdo-sqlite \ + --with-readline \ + --disable-session \ + --disable-simplexml \ + --without-sqlite3 \ + --enable-sockets \ + --disable-xml \ + --disable-xmlreader \ + --disable-xmlwriter \ + --enable-zip \ + --with-zlib make -s -j 9 mkdir -p ${OUT_PREFIX}/bin From d95be98a0c04a63cc5013e4e075a70063a06d795 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 28 Nov 2017 07:06:48 +0100 Subject: [PATCH 112/553] use heredocs for multiline messages --- bin/compile | 150 ++++++++++++++++++++-------------- bin/heroku-hhvm-apache2 | 104 +++++++++++------------ bin/heroku-hhvm-nginx | 106 ++++++++++++------------ bin/heroku-php-apache2 | 112 +++++++++++++------------ bin/heroku-php-nginx | 114 +++++++++++++------------- bin/util/common.sh | 42 ++++++++-- bin/util/newrelic.sh | 6 +- support/build/_util/deploy.sh | 12 +-- support/build/_util/mkrepo.sh | 18 ++-- support/build/_util/remove.sh | 46 ++++++----- support/build/_util/sync.sh | 56 +++++++------ 11 files changed, 427 insertions(+), 339 deletions(-) diff --git a/bin/compile b/bin/compile index 55dc3a054..70d4e282d 100755 --- a/bin/compile +++ b/bin/compile @@ -40,28 +40,36 @@ export COMPOSER_LOCK=$(basename "$COMPOSER" ".json")".lock" # replace .json with if [[ -s "$COMPOSER" ]]; then cat "$COMPOSER" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER'; make sure it's valid!" if [[ ! -f "$COMPOSER_LOCK" ]]; then - cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || error "Your '$COMPOSER' lists dependencies inside 'require', -but no '$COMPOSER_LOCK' was found. Please run 'composer update' to -re-generate '$COMPOSER_LOCK' if necessary, and commit it into your -repository. For more information, please refer to the docs at -https://devcenter.heroku.com/articles/php-support#activation" + cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || error <<-EOF + Your '$COMPOSER' lists dependencies inside 'require', + but no '$COMPOSER_LOCK' was found. Please run 'composer update' to + re-generate '$COMPOSER_LOCK' if necessary, and commit it into your + repository. For more information, please refer to the docs at + https://devcenter.heroku.com/articles/php-support#activation + EOF else cat "$COMPOSER_LOCK" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER_LOCK'; make sure it's valid!" - cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || warning "Your '$COMPOSER' contains a non-'stable' setting -for 'minimum-stability'. This may cause the installation of -unstable versions of runtimes and extensions during this deploy. -It is recommended that you always use stability flags instead, -even if you have 'prefer-stable' enabled. For more information, -see https://getcomposer.org/doc/01-basic-usage.md#stability" + cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || warning <<-EOF + Your '$COMPOSER' contains a non-'stable' setting + for 'minimum-stability'. This may cause the installation of + unstable versions of runtimes and extensions during this deploy. + It is recommended that you always use stability flags instead, + even if you have 'prefer-stable' enabled. For more information, + see https://getcomposer.org/doc/01-basic-usage.md#stability + EOF fi else if [[ ! -f "$COMPOSER" ]]; then - warning "No '$COMPOSER' found. -Using 'index.php' to declare app type as PHP is considered legacy -functionality and may lead to unexpected behavior." + warning <<-EOF + No '$COMPOSER' found. + Using 'index.php' to declare app type as PHP is considered legacy + functionality and may lead to unexpected behavior. + EOF else - notice "Your '$COMPOSER' is completely empty. -Please change its contents to at least '{}' so it is valid JSON." + notice <<-EOF + Your '$COMPOSER' is completely empty. + Please change its contents to at least '{}' so it is valid JSON. + EOF fi echo "{}" > $COMPOSER fi @@ -97,12 +105,17 @@ 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.28.tar.gz" || error "Failed to download minimal PHP for bootstrapping. -Please try again, or contact support if this problem persists." +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.28.tar.gz" || error <<-EOF + Failed to download minimal PHP for bootstrapping. + Please try again, or contact support if this problem persists. +EOF 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.6.3.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.6.3.tar.gz" || error <<-EOF + Failed to download Composer. + Please try again, or contact support if this problem persists. +EOF tar xzf $build_dir/.heroku/composer.tar.gz -C $build_dir/.heroku/php rm $build_dir/.heroku/composer.tar.gz @@ -126,10 +139,12 @@ echo "export PATH=\$HOME/.heroku/php/bin:\$PATH:\$HOME/$composer_bindir" > $buil status "Installing platform packages..." # extract requirements from composer.lock -/app/.heroku/php-min/bin/php $bp_dir/bin/util/platform.php "$bp_dir/support/installer/" $HEROKU_PHP_PLATFORM_REPOSITORIES 2>&1 >$build_dir/.heroku/php/composer.json | indent || error "Couldn't load '$COMPOSER_LOCK'; it must be a valid lock -file generated by Composer and be in a consistent state. -Check above for any parse errors and address them if necessary. -Run 'composer update', add/commit the change, then push again." +/app/.heroku/php-min/bin/php $bp_dir/bin/util/platform.php "$bp_dir/support/installer/" $HEROKU_PHP_PLATFORM_REPOSITORIES 2>&1 >$build_dir/.heroku/php/composer.json | indent || error <<-EOF + Couldn't load '$COMPOSER_LOCK'; it must be a valid lock + file generated by Composer and be in a consistent state. + Check above for any parse errors and address them if necessary. + Run 'composer update', add/commit the change, then push again. +EOF # reset COMPOSER for the platform install step COMPOSER_bak="$COMPOSER" @@ -142,27 +157,29 @@ export profile_dir_path=$build_dir/.profile.d if composer install -d "$build_dir/.heroku/php" ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} 2>&1 | tee $build_dir/.heroku/php/install.log | grep --line-buffered -E '^ - (Instal|Enab)ling heroku-sys/' | sed -u -E -e 's/^ - (Instal|Enab)ling /- /' -e 's/heroku-sys\///g' | indent; then : else - error "Failed to install system packages. - -Your platform requirements (for runtimes and extensions) could -not be resolved to an installable set of dependencies, or a -repository was unreachable. - -Full error information from installation attempt: - -$(cat $build_dir/.heroku/php/install.log | sed -e 's/heroku-sys\///g' -e 's/^Loading composer repositories with package information/Loading repositories with available runtimes and extensions/' -e 's/^Installing dependencies.*//' -e '/^Potential causes:/,$d' -e 's/^/> /') - -Please verify that all requirements for runtime versions in -'$COMPOSER_LOCK' are compatible with the list below, and ensure -all required extensions are available for the desired runtimes. - -For reference, the following runtimes are currently available: - -PHP: $(composer show -d "$build_dir/.heroku/php" --available heroku-sys/php 2>&1 | sed -n 's/^versions : //p' | fold -s -w 58 || true) -HHVM: $(composer show -d "$build_dir/.heroku/php" --available heroku-sys/hhvm 2>&1 | sed -n 's/^versions : //p' | fold -s -w 58 || true) - -For a list of supported runtimes & extensions on Heroku, please -refer to: https://devcenter.heroku.com/articles/php-support" + error <<-EOF + Failed to install system packages. + + Your platform requirements (for runtimes and extensions) could + not be resolved to an installable set of dependencies, or a + repository was unreachable. + + Full error information from installation attempt: + + $(cat $build_dir/.heroku/php/install.log | sed -e 's/heroku-sys\///g' -e 's/^Loading composer repositories with package information/Loading repositories with available runtimes and extensions/' -e 's/^Installing dependencies.*//' -e '/^Potential causes:/,$d' -e 's/^/> /') + + Please verify that all requirements for runtime versions in + '$COMPOSER_LOCK' are compatible with the list below, and ensure + all required extensions are available for the desired runtimes. + + For reference, the following runtimes are currently available: + + PHP: $(composer show -d "$build_dir/.heroku/php" --available heroku-sys/php 2>&1 | sed -n 's/^versions : //p' | fold -s -w 58 || true) + HHVM: $(composer show -d "$build_dir/.heroku/php" --available heroku-sys/hhvm 2>&1 | sed -n 's/^versions : //p' | fold -s -w 58 || true) + + For a list of supported runtimes & extensions on Heroku, please + refer to: https://devcenter.heroku.com/articles/php-support + EOF fi if composer show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/php 2>/dev/null; then @@ -177,10 +194,12 @@ fi export COMPOSER="$COMPOSER_bak" unset COMPOSER_bak -composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || warning "Your '$COMPOSER_LOCK' is not up to date with the latest -changes in '$COMPOSER'. To ensure you are not getting stale -dependencies, run 'composer update' on your machine and commit -any changes to Git before pushing again." +composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || warning <<-EOF + Your '$COMPOSER_LOCK' is not up to date with the latest + changes in '$COMPOSER'. To ensure you are not getting stale + dependencies, run 'composer update' on your machine and commit + any changes to Git before pushing again. +EOF # clean up rm -rf /app/.heroku/php-min $build_dir/.heroku/php-min @@ -216,19 +235,24 @@ if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" # we should not do this check separately; there is no reliable way of telling whether or not it really is the real Composer bin dir or if it comes from somewhere else composer_warn_bindir="" if [[ ! "$composer_bindir/" == "$composer_vendordir"/* && -d "$composer_bindir" ]]; then - composer_warn_bindir=" -Your Composer bin dir is configured to reside outside of vendor -dir, so please repeat the two steps above for '$composer_bindir/'." + composer_warn_bindir=$(cat <<-EOF + + Your Composer bin dir is configured to reside outside of vendor + dir, so please repeat the two steps above for '$composer_bindir/'. + EOF + ) fi - warning "Your Composer vendor dir is part of your Git repository. -This directory should not be under version control; only your -'$COMPOSER' and '$COMPOSER_LOCK' files should be added, which -will let Composer handle installation of dependencies on deploy. -To suppress this notice, first remove the folder from your index -by running 'git rm -r --cached $composer_vendordir/'. -Next, edit your project's '.gitignore' file and add the folder -'/$composer_vendordir/' to the list.$composer_warn_bindir -For more info, refer to the Composer FAQ: http://bit.ly/1rlCSZU" + warning <<-EOF + Your Composer vendor dir is part of your Git repository. + This directory should not be under version control; only your + '$COMPOSER' and '$COMPOSER_LOCK' files should be added, which + will let Composer handle installation of dependencies on deploy. + To suppress this notice, first remove the folder from your index + by running 'git rm -r --cached $composer_vendordir/'. + Next, edit your project's '.gitignore' file and add the folder + '/$composer_vendordir/' to the list.$composer_warn_bindir + For more info, refer to the Composer FAQ: http://bit.ly/1rlCSZU + EOF fi # handle custom oauth keys @@ -254,8 +278,10 @@ cat "$COMPOSER" | python -c 'import sys,json; sys.exit(not json.load(sys.stdin)) # only perform the check for buildpack package if we're not running in Heroku CI if [[ -z "${HEROKU_PHP_INSTALL_DEV+are-we-running-in-ci}" ]]; then - 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'!" + composer show --installed heroku/heroku-buildpack-php &> /dev/null && error <<-EOF + Your '$COMPOSER' requires 'heroku/heroku-buildpack-php'. + This package may only be used as a dependency in 'require-dev'! + EOF fi if cat "$COMPOSER" | python -c 'import sys,json; sys.exit("compile" not in json.load(sys.stdin).get("scripts", {}));'; then diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2 index 4e346f305..6ffcd3f80 100755 --- a/bin/heroku-hhvm-apache2 +++ b/bin/heroku-hhvm-apache2 @@ -39,54 +39,55 @@ touch_log() { } print_help() { -echo "\ -${1:-Boots HHVM together with Apache2 on Heroku and for local development.} - -Usage: - heroku-hhvm-apache2 [options] [] - -Options: - -C The path to the configuration file to include inside - the Apache2 VHost config (see option -c below). Will - be included inside the '' section just - after the '' & 'ProxyPassMatch' directives. - Recommended approach when customizing Apache2's config - in most cases, unless you need to set fundamental - server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf] - -c The path to the full VHost configuration file that is - included after Heroku's (or your local) Apache2 config - is loaded. Must contain a 'Listen \${PORT}' directive - and should have a '' and likely also a - '' section (see option -C above). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf] - -h, --help Display this help screen and exit. - -I The path to an extra php.ini to use in addition to the - default HHVM php.ini (see option -i below). - -i The path to the php.ini file to use. It is highly - recommended to use the -I option (see above) instead. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php] - -l Path to additional log file to tail to STDERR so its - contents appear in 'heroku logs'. If the file does not - exist, it will be created. Wildcards are allowed, but - must be quoted and must match already existing files. - Note: this option can be repeated multiple times. - -p Port to listen on for HTTP traffic. If this argument - is not given, then the port number to use is read from - the \$PORT environment variable, or a random port is - chosen if that variable does not exist. - -v, --verbose Be more verbose during startup. - -All file paths must be relative to '$HEROKU_APP_DIR'. - -Any file name that ends in '.php' will be run through the PHP interpreter first. -You may use this for templating although this is less useful than e.g. for Nginx -where unlike in Apache2, you cannot reference environment variables in config -files using a '\${VARNAME}' syntax. - -If you would like to use the -C and -c options together, make sure you retain -the appropriate include mechanisms (see default configs for details). -" >&2 + cat >&2 <<-EOF + + ${1:-Boots HHVM together with Apache2 on Heroku and for local development.} + + Usage: + heroku-hhvm-apache2 [options] [] + + Options: + -C The path to the configuration file to include inside + the Apache2 VHost config (see option -c below). Will + be included inside the '' section just + after the '' & 'ProxyPassMatch' directives. + Recommended approach when customizing Apache2's config + in most cases, unless you need to set fundamental + server level options. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf] + -c The path to the full VHost configuration file that is + included after Heroku's (or your local) Apache2 config + is loaded. Must contain a 'Listen \${PORT}' directive + and should have a '' and likely also a + '' section (see option -C above). + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf] + -h, --help Display this help screen and exit. + -I The path to an extra php.ini to use in addition to the + default HHVM php.ini (see option -i below). + -i The path to the php.ini file to use. It is highly + recommended to use the -I option (see above) instead. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php] + -l Path to additional log file to tail to STDERR so its + contents appear in 'heroku logs'. If the file does not + exist, it will be created. Wildcards are allowed, but + must be quoted and must match already existing files. + Note: this option can be repeated multiple times. + -p Port to listen on for HTTP traffic. If this argument + is not given, then the port number to use is read from + the \$PORT environment variable, or a random port is + chosen if that variable does not exist. + -v, --verbose Be more verbose during startup. + + All file paths must be relative to '$HEROKU_APP_DIR'. + + Any file name that ends in '.php' will be run through the PHP interpreter first. + You may use this for templating although this is less useful than e.g. for Nginx + where unlike in Apache2, you cannot reference environment variables in config + files using a '\${VARNAME}' syntax. + + If you would like to use the -C and -c options together, make sure you retain + the appropriate include mechanisms (see default configs for details). + EOF } # we need this in configs @@ -176,8 +177,11 @@ done shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, -make sure to list them before any document root argument you're providing." + print_help "$(cat <<-EOF + $(basename $0): too many arguments. If you're using options, + make sure to list them before any document root argument you're providing. + EOF + )" exit 2 fi diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index 3d6bb7570..865fa25a9 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -39,55 +39,56 @@ touch_log() { } print_help() { -echo "\ -${1:-Boots HHVM together with Nginx on Heroku and for local development.} - -Usage: - heroku-hhvm-nginx [options] [] - -Options: - -C The path to the configuration file to include inside - the Nginx server config (see option -c below). Will - be included inside the 'server { ... }' block just - after the 'listen', 'root' etc directives. - Recommended approach when customizing Nginx's config - in most cases, unless you need to set http or - fundamental server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php] - -c The path to the full configuration file that is - included after Heroku's (or your local) Nginx config - is loaded. It must contain an 'http { ... }' block - with a 'server { ... }' inside that contains 'listen' - and 'root' (see option -C above), but no global, - directives (globals are read from the system's default - Nginx configuration files). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php] - -h, --help Display this help screen and exit. - -I The path to an extra php.ini to use in addition to the - default HHVM php.ini (see option -i below). - -i The path to the php.ini file to use. It is highly - recommended to use the -I option (see above) instead. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php] - -l Path to additional log file to tail to STDERR so its - contents appear in 'heroku logs'. If the file does not - exist, it will be created. Wildcards are allowed, but - must be quoted and must match already existing files. - Note: this option can be repeated multiple times. - -p Port to listen on for HTTP traffic. If this argument - is not given, then the port number to use is read from - the \$PORT environment variable, or a random port is - chosen if that variable does not exist. - -v, --verbose Be more verbose during startup. - -All file paths must be relative to '$HEROKU_APP_DIR'. - -Any file name that ends in '.php' will be run through the PHP interpreter first. -You may use this for templating; this is, for instance, necessary for Nginx, -where environment variables cannot be referenced in configuration files. - -If you would like to use the -C and -c options together, make sure you retain -the appropriate include mechanisms (see default configs for details). -" >&2 + cat >&2 <<-EOF + + ${1:-Boots HHVM together with Nginx on Heroku and for local development.} + + Usage: + heroku-hhvm-nginx [options] [] + + Options: + -C The path to the configuration file to include inside + the Nginx server config (see option -c below). Will + be included inside the 'server { ... }' block just + after the 'listen', 'root' etc directives. + Recommended approach when customizing Nginx's config + in most cases, unless you need to set http or + fundamental server level options. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php] + -c The path to the full configuration file that is + included after Heroku's (or your local) Nginx config + is loaded. It must contain an 'http { ... }' block + with a 'server { ... }' inside that contains 'listen' + and 'root' (see option -C above), but no global, + directives (globals are read from the system's default + Nginx configuration files). + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php] + -h, --help Display this help screen and exit. + -I The path to an extra php.ini to use in addition to the + default HHVM php.ini (see option -i below). + -i The path to the php.ini file to use. It is highly + recommended to use the -I option (see above) instead. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php] + -l Path to additional log file to tail to STDERR so its + contents appear in 'heroku logs'. If the file does not + exist, it will be created. Wildcards are allowed, but + must be quoted and must match already existing files. + Note: this option can be repeated multiple times. + -p Port to listen on for HTTP traffic. If this argument + is not given, then the port number to use is read from + the \$PORT environment variable, or a random port is + chosen if that variable does not exist. + -v, --verbose Be more verbose during startup. + + All file paths must be relative to '$HEROKU_APP_DIR'. + + Any file name that ends in '.php' will be run through the PHP interpreter first. + You may use this for templating; this is, for instance, necessary for Nginx, + where environment variables cannot be referenced in configuration files. + + If you would like to use the -C and -c options together, make sure you retain + the appropriate include mechanisms (see default configs for details). + EOF } # we need this in configs @@ -177,8 +178,11 @@ done shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, -make sure to list them before any document root argument you're providing." + print_help "$(cat <<-EOF + $(basename $0): too many arguments. If you're using options, + make sure to list them before any document root argument you're providing. + EOF + )" exit 2 fi diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index 24e80f8dd..7ce29349e 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -39,58 +39,59 @@ touch_log() { } print_help() { -echo "\ -${1:-Boots PHP-FPM together with Apache2 on Heroku and for local development.} - -Usage: - heroku-php-apache2 [options] [] - -Options: - -C The path to the configuration file to include inside - the Apache2 VHost config (see option -c below). Will - be included inside the '' section just - after the '' & 'ProxyPassMatch' directives. - Recommended approach when customizing Apache2's config - in most cases, unless you need to set fundamental - server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf] - -c The path to the full VHost configuration file that is - included after Heroku's (or your local) Apache2 config - is loaded. Must contain a 'Listen \${PORT}' directive - and should have a '' and likely also a - '' section (see option -C above). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf] - -F The path to the configuration file to include at the - end of php-fpm.conf (see option -f below), in the - '[www]' pool section. Recommended approach when - customizing PHP-FPM's configuration in most cases, - unless you need to set global options. - -f The path to the full PHP-FPM configuration file. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf] - -h, --help Display this help screen and exit. - -i The path to the php.ini file to use. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php.ini] - -l Path to additional log file to tail to STDERR so its - contents appear in 'heroku logs'. If the file does not - exist, it will be created. Wildcards are allowed, but - must be quoted and must match already existing files. - Note: this option can be repeated multiple times. - -p Port to listen on for HTTP traffic. If this argument - is not given, then the port number to use is read from - the \$PORT environment variable, or a random port is - chosen if that variable does not exist. - -v, --verbose Be more verbose during startup. - -All file paths must be relative to '$HEROKU_APP_DIR'. - -Any file name that ends in '.php' will be run through the PHP interpreter first. -You may use this for templating although this is less useful than e.g. for Nginx -where unlike in Apache2, you cannot reference environment variables in config -files using a '\${VARNAME}' syntax. - -If you would like to use the -C and -c or -F and -f options together, make sure -you retain the appropriate include mechanisms (see default configs for details). -" >&2 + cat >&2 <<-EOF + + ${1:-Boots PHP-FPM together with Apache2 on Heroku and for local development.} + + Usage: + heroku-php-apache2 [options] [] + + Options: + -C The path to the configuration file to include inside + the Apache2 VHost config (see option -c below). Will + be included inside the '' section just + after the '' & 'ProxyPassMatch' directives. + Recommended approach when customizing Apache2's config + in most cases, unless you need to set fundamental + server level options. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf] + -c The path to the full VHost configuration file that is + included after Heroku's (or your local) Apache2 config + is loaded. Must contain a 'Listen \${PORT}' directive + and should have a '' and likely also a + '' section (see option -C above). + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf] + -F The path to the configuration file to include at the + end of php-fpm.conf (see option -f below), in the + '[www]' pool section. Recommended approach when + customizing PHP-FPM's configuration in most cases, + unless you need to set global options. + -f The path to the full PHP-FPM configuration file. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf] + -h, --help Display this help screen and exit. + -i The path to the php.ini file to use. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php.ini] + -l Path to additional log file to tail to STDERR so its + contents appear in 'heroku logs'. If the file does not + exist, it will be created. Wildcards are allowed, but + must be quoted and must match already existing files. + Note: this option can be repeated multiple times. + -p Port to listen on for HTTP traffic. If this argument + is not given, then the port number to use is read from + the \$PORT environment variable, or a random port is + chosen if that variable does not exist. + -v, --verbose Be more verbose during startup. + + All file paths must be relative to '$HEROKU_APP_DIR'. + + Any file name that ends in '.php' will be run through the PHP interpreter first. + You may use this for templating although this is less useful than e.g. for Nginx + where unlike in Apache2, you cannot reference environment variables in config + files using a '\${VARNAME}' syntax. + + If you would like to use the -C and -c or -F and -f options together, make sure + you retain the appropriate include mechanisms (see default configs for details). + EOF } # we need this in configs @@ -183,8 +184,11 @@ done shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, -make sure to list them before any document root argument you're providing." + print_help "$(cat <<-EOF + $(basename $0): too many arguments. If you're using options, + make sure to list them before any document root argument you're providing. + EOF + )" exit 2 fi diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index a9115e633..969a1bf52 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -39,59 +39,60 @@ touch_log() { } print_help() { -echo "\ -${1:-Boots PHP-FPM together with Nginx on Heroku and for local development.} - -Usage: - heroku-php-nginx [options] [] - -Options: - -C The path to the configuration file to include inside - the Nginx server config (see option -c below). Will - be included inside the 'server { ... }' block just - after the 'listen', 'root' etc directives. - Recommended approach when customizing Nginx's config - in most cases, unless you need to set http or - fundamental server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php] - -c The path to the full configuration file that is - included after Heroku's (or your local) Nginx config - is loaded. It must contain an 'http { ... }' block - with a 'server { ... }' inside that contains 'listen' - and 'root' (see option -C above), but no global, - directives (globals are read from the system's default - Nginx configuration files). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php] - -F The path to the configuration file to include at the - end of php-fpm.conf (see option -f below), in the - '[www]' pool section. Recommended approach when - customizing PHP-FPM's configuration in most cases, - unless you need to set global options. - -f The path to the full PHP-FPM configuration file. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf] - -h, --help Display this help screen and exit. - -i The path to the php.ini file to use. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php.ini] - -l Path to additional log file to tail to STDERR so its - contents appear in 'heroku logs'. If the file does not - exist, it will be created. Wildcards are allowed, but - must be quoted and must match already existing files. - Note: this option can be repeated multiple times. - -p Port to listen on for HTTP traffic. If this argument - is not given, then the port number to use is read from - the \$PORT environment variable, or a random port is - chosen if that variable does not exist. - -v, --verbose Be more verbose during startup. - -All file paths must be relative to '$HEROKU_APP_DIR'. - -Any file name that ends in '.php' will be run through the PHP interpreter first. -You may use this for templating; this is, for instance, necessary for Nginx, -where environment variables cannot be referenced in configuration files. - -If you would like to use the -C and -c or -F and -f options together, make sure -you retain the appropriate include mechanisms (see default configs for details). -" >&2 + cat >&2 <<-EOF + + ${1:-Boots PHP-FPM together with Nginx on Heroku and for local development.} + + Usage: + heroku-php-nginx [options] [] + + Options: + -C The path to the configuration file to include inside + the Nginx server config (see option -c below). Will + be included inside the 'server { ... }' block just + after the 'listen', 'root' etc directives. + Recommended approach when customizing Nginx's config + in most cases, unless you need to set http or + fundamental server level options. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php] + -c The path to the full configuration file that is + included after Heroku's (or your local) Nginx config + is loaded. It must contain an 'http { ... }' block + with a 'server { ... }' inside that contains 'listen' + and 'root' (see option -C above), but no global, + directives (globals are read from the system's default + Nginx configuration files). + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php] + -F The path to the configuration file to include at the + end of php-fpm.conf (see option -f below), in the + '[www]' pool section. Recommended approach when + customizing PHP-FPM's configuration in most cases, + unless you need to set global options. + -f The path to the full PHP-FPM configuration file. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf] + -h, --help Display this help screen and exit. + -i The path to the php.ini file to use. + [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php.ini] + -l Path to additional log file to tail to STDERR so its + contents appear in 'heroku logs'. If the file does not + exist, it will be created. Wildcards are allowed, but + must be quoted and must match already existing files. + Note: this option can be repeated multiple times. + -p Port to listen on for HTTP traffic. If this argument + is not given, then the port number to use is read from + the \$PORT environment variable, or a random port is + chosen if that variable does not exist. + -v, --verbose Be more verbose during startup. + + All file paths must be relative to '$HEROKU_APP_DIR'. + + Any file name that ends in '.php' will be run through the PHP interpreter first. + You may use this for templating; this is, for instance, necessary for Nginx, + where environment variables cannot be referenced in configuration files. + + If you would like to use the -C and -c or -F and -f options together, make sure + you retain the appropriate include mechanisms (see default configs for details). + EOF } # we need this in configs @@ -184,8 +185,11 @@ done shift $((OPTIND-1)) if [[ "$#" -gt "1" ]]; then - print_help "$0: too many arguments. If you're using options, -make sure to list them before any document root argument you're providing." + print_help "$(cat <<-EOF + $(basename $0): too many arguments. If you're using options, + make sure to list them before any document root argument you're providing. + EOF + )" exit 2 fi diff --git a/bin/util/common.sh b/bin/util/common.sh index b0490e3a9..c6bf664f8 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -1,32 +1,62 @@ error() { + # if arguments are given, redirect them to stdin + # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF + (( $# )) && exec <<< "$@" echo - echo " ! ERROR: $*" | indent no_first_line_indent + echo -n " ! ERROR: " + # this will be fed from stdin + indent no_first_line_indent echo exit 1 } warning() { + # if arguments are given, redirect them to stdin + # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF + (( $# )) && exec <<< "$@" echo - echo " ! WARNING: $*" | indent no_first_line_indent + echo -n " ! WARNING: " + # this will be fed from stdin + indent no_first_line_indent echo } warning_inline() { - echo " ! WARNING: $*" | indent no_first_line_indent + # if arguments are given, redirect them to stdin + # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF + (( $# )) && exec <<< "$@" + echo -n " ! WARNING: " + # this will be fed from stdin + indent no_first_line_indent } status() { - echo "-----> $*" + # if arguments are given, redirect them to stdin + # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF + (( $# )) && exec <<< "$@" + echo -n "-----> " + # this will be fed from stdin + cat } notice() { + # if arguments are given, redirect them to stdin + # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF + (( $# )) && exec <<< "$@" echo - echo "NOTICE: $*" | indent + echo -n " NOTICE: " + # this will be fed from stdin + indent no_first_line_indent echo } notice_inline() { - echo "NOTICE: $*" | indent + # if arguments are given, redirect them to stdin + # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF + (( $# )) && exec <<< "$@" + echo -n " NOTICE: " + # this will be fed from stdin + indent no_first_line_indent } # sed -l basically makes sed replace and buffer through stdin to stdout diff --git a/bin/util/newrelic.sh b/bin/util/newrelic.sh index d664051f4..a8036a660 100755 --- a/bin/util/newrelic.sh +++ b/bin/util/newrelic.sh @@ -16,8 +16,10 @@ install_newrelic_ext() { install_newrelic_userini() { if [[ "$engine" == "php" && -n "${NEW_RELIC_CONFIG_FILE:-}" ]]; then if [[ ! -f "${NEW_RELIC_CONFIG_FILE}" ]]; then - error "Config var 'NEW_RELIC_CONFIG_FILE' points to non existing file -'${NEW_RELIC_CONFIG_FILE}'" + error <<-EOF + Config var 'NEW_RELIC_CONFIG_FILE' points to non existing file + '${NEW_RELIC_CONFIG_FILE}' + EOF fi notice_inline "Using custom New Relic config '${NEW_RELIC_CONFIG_FILE}'" ( cd $build_dir/.heroku/php/etc/php/conf.d; ln -s "../../../../../${NEW_RELIC_CONFIG_FILE}" "ext-newrelic.user.ini" ) diff --git a/support/build/_util/deploy.sh b/support/build/_util/deploy.sh index 0acbd182e..79d3f2050 100755 --- a/support/build/_util/deploy.sh +++ b/support/build/_util/deploy.sh @@ -28,11 +28,13 @@ done shift $((OPTIND-1)) if [[ $# -lt 1 ]]; then - echo "Usage: $(basename $0) [--publish] FORMULA-VERSION [--overwrite]" >&2 - echo " If --publish is given, mkrepo.sh will be invoked after a successful deploy to" >&2 - echo " re-generate the repo. CAUTION: this will cause all manifests in the bucket to" >&2 - echo " be included in the repo, including potentially currently unpublished ones." >&2 - echo " All additional arguments, including --overwrite, are passed through to 'bob'." >&2 + cat >&2 <<-EOF + Usage: $(basename $0) [--publish] FORMULA-VERSION [--overwrite] + If --publish is given, mkrepo.sh will be invoked after a successful deploy to + re-generate the repo. CAUTION: this will cause all manifests in the bucket to + be included in the repo, including potentially currently unpublished ones. + All additional arguments, including --overwrite, are passed through to 'bob'. + EOF exit 2 fi diff --git a/support/build/_util/mkrepo.sh b/support/build/_util/mkrepo.sh index 1fae7b401..362bc595d 100755 --- a/support/build/_util/mkrepo.sh +++ b/support/build/_util/mkrepo.sh @@ -40,14 +40,16 @@ done shift $((OPTIND-1)) if [[ $# == "1" ]]; then - echo "Usage: $(basename $0) [--upload] [S3_BUCKET S3_PREFIX [MANIFEST...]]" >&2 - echo " S3_BUCKET: S3 bucket name for packages.json upload; default: '\$S3_BUCKET'." >&2 - echo " S3_PREFIX: S3 prefix, e.g. '' or 'dist-stable/'; default: '\${S3_PREFIX}'." >&2 - echo " If MANIFEST arguments are given, those are used to build the repo; otherwise," >&2 - echo " all manifests from given or default S3_BUCKET+S3_PREFIX are downloaded." >&2 - echo " A --upload flag triggers immediate upload, otherwise instructions are printed." >&2 - echo " If --upload, or if stdout is a terminal, packages.json will be written to cwd." >&2 - echo " If no --upload, and if stdout is a pipe, repo JSON will be echo'd to stdout." >&2 + cat >&2 <<-EOF + Usage: $(basename $0) [--upload] [S3_BUCKET S3_PREFIX [MANIFEST...]] + S3_BUCKET: S3 bucket name for packages.json upload; default: '\$S3_BUCKET'. + S3_PREFIX: S3 prefix, e.g. '' or 'dist-stable/'; default: '\${S3_PREFIX}'. + If MANIFEST arguments are given, those are used to build the repo; otherwise, + all manifests from given or default S3_BUCKET+S3_PREFIX are downloaded. + A --upload flag triggers immediate upload, otherwise instructions are printed. + If --upload, or if stdout is a terminal, packages.json will be written to cwd. + If no --upload, and if stdout is a pipe, repo JSON will be echo'd to stdout. + EOF exit 2 fi diff --git a/support/build/_util/remove.sh b/support/build/_util/remove.sh index 004e291c0..d55fb1979 100755 --- a/support/build/_util/remove.sh +++ b/support/build/_util/remove.sh @@ -27,15 +27,17 @@ done shift $((OPTIND-1)) if [[ $# -lt "1" ]]; then - echo "Usage: $(basename $0) [--no-publish] MANIFEST..." >&2 - echo " MANIFEST: name of manifest file, e.g. 'ext-event-2.0.0_php-5.6.composer.json'" >&2 - echo " If --no-publish is given, mkrepo.sh will NOT be invoked after removal to" >&2 - echo " re-generate the repo." >&2 - echo " CAUTION: re-generating the repo will cause all manifests in the bucket" >&2 - echo " to be included in the repo, including potentially currently unpublished ones." >&2 - echo " CAUTION: using --no-publish means the repo will point to non-existing packages" >&2 - echo " until 'mkrepo.sh --upload' is run!" >&2 - echo " Bucket name and prefix will be read from '\$S3_BUCKET' and '\$S3_PREFIX'." >&2 + cat >&2 <<-EOF + Usage: $(basename $0) [--no-publish] MANIFEST... + MANIFEST: name of manifest file, e.g. 'ext-event-2.0.0_php-5.6.composer.json' + If --no-publish is given, mkrepo.sh will NOT be invoked after removal to + re-generate the repo. + CAUTION: re-generating the repo will cause all manifests in the bucket + to be included in the repo, including potentially currently unpublished ones. + CAUTION: using --no-publish means the repo will point to non-existing packages + until 'mkrepo.sh --upload' is run! + Bucket name and prefix will be read from '\$S3_BUCKET' and '\$S3_PREFIX'. + EOF exit 2 fi @@ -58,22 +60,26 @@ echo "-----> Fetching manifests..." >&2 s3cmd --ssl get "${manifests[@]}" 1>&2 ) -echo " -WARNING: POTENTIALLY DESTRUCTIVE ACTION! - -The following packages will be REMOVED - from s3://${S3_BUCKET}/${S3_PREFIX}: -$(IFS=$'\n'; echo "${manifests[*]:-(none)}" | xargs -n1 basename | sed -e 's/^/ - /' -e 's/.composer.json$//') -" >&2 +cat >&2 <<-EOF + WARNING: POTENTIALLY DESTRUCTIVE ACTION! + + The following packages will be REMOVED + from s3://${S3_BUCKET}/${S3_PREFIX}: + $(IFS=$'\n'; echo "${manifests[*]:-(none)}" | xargs -n1 basename | sed -e 's/^/ - /' -e 's/.composer.json$//') +EOF if $publish; then - echo "NOTICE: You have selected to publish the repo after removal of packages." >&2 - echo "This means the repo will be re-generated based on the current bucket contents!" >&2 + cat >&2 <<-EOF + NOTICE: You have selected to publish the repo after removal of packages. + This means the repo will be re-generated based on the current bucket contents! + EOF regenmsg="& regenerate packages.json" else regenmsg="without updating the repo" - echo "WARNING: You have selected to NOT publish the repo after removal of packages." >&2 - echo "This means the repo will point to non-existing packages until mkrepo.sh is run!" >&2 + cat >&2 <<-EOF + WARNING: You have selected to NOT publish the repo after removal of packages. + This means the repo will point to non-existing packages until mkrepo.sh is run! + EOF fi echo "" >&2 diff --git a/support/build/_util/sync.sh b/support/build/_util/sync.sh index ffe3d4e5c..a6f145e91 100755 --- a/support/build/_util/sync.sh +++ b/support/build/_util/sync.sh @@ -38,14 +38,16 @@ done shift $((OPTIND-1)) if [[ $# -lt "2" || $# -gt "6" ]]; then - echo "Usage: $(basename $0) [--no-remove] DEST_BUCKET DEST_PREFIX [DEST_REGION [SOURCE_BUCKET SOURCE_PREFIX [SOURCE_REGION]]]" >&2 - echo " DEST_BUCKET: destination S3 bucket name." >&2 - echo " DEST_REGION: destination bucket region, e.g. us-west-1; default: 's3'." >&2 - echo " DEST_PREFIX: destination prefix, e.g. '' or 'dist-stable/'." >&2 - echo " SOURCE_BUCKET: source S3 bucket name; default: '\$S3_BUCKET'." >&2 - echo " SOURCE_REGION: source bucket region; default: '\$S3_REGION' or 's3'." >&2 - echo " SOURCE_PREFIX: source prefix; default: '\${S3_PREFIX}'." >&2 - echo " --no-remove: no removal of destination packages that are not in source bucket." >&2 + cat >&2 <<-EOF + Usage: $(basename $0) [--no-remove] DEST_BUCKET DEST_PREFIX [DEST_REGION [SOURCE_BUCKET SOURCE_PREFIX [SOURCE_REGION]]] + DEST_BUCKET: destination S3 bucket name. + DEST_REGION: destination bucket region, e.g. us-west-1; default: 's3'. + DEST_PREFIX: destination prefix, e.g. '' or 'dist-stable/'. + SOURCE_BUCKET: source S3 bucket name; default: '\$S3_BUCKET'. + SOURCE_REGION: source bucket region; default: '\$S3_REGION' or 's3'. + SOURCE_PREFIX: source prefix; default: '\${S3_PREFIX}'. + --no-remove: no removal of destination packages that are not in source bucket. + EOF exit 2 fi @@ -87,8 +89,10 @@ echo "" >&2 # this mkrepo.sh call won't actually download, but use the given *.composer.json, and echo a generated packages.json # we use this to compare to the downloaded packages.json $here/mkrepo.sh $src_bucket $src_prefix ${src_tmp}/*.composer.json 2>/dev/null | python -c 'import sys, json; sys.exit(json.load(open(sys.argv[1])) != json.load(sys.stdin))' ${src_tmp}/packages.json || { - echo "WARNING: packages.json from source does not match its list of manifests!" >&2 - echo " You should run 'mkrepo.sh' to update, or ask the bucket maintainers to do so." >&2 + cat >&2 <<-EOF + WARNING: packages.json from source does not match its list of manifests! + You should run 'mkrepo.sh' to update, or ask the bucket maintainers to do so. + EOF read -p "Would you like to abort this operation? [Yn] " proceed [[ ! $proceed =~ [nN]o* ]] && exit 1 # yes is the default so doing yes | sync.sh won't do something stupid } @@ -162,26 +166,26 @@ for filename in $common; do fi done -echo " -WARNING: POTENTIALLY DESTRUCTIVE ACTION! +cat >&2 <<-EOF + WARNING: POTENTIALLY DESTRUCTIVE ACTION! -The following packages will be IGNORED: -$(IFS=$'\n'; echo "${ignore_manifests[*]:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json//') + The following packages will be IGNORED: + $(IFS=$'\n'; echo "${ignore_manifests[*]:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json//') -The following packages will be ADDED - from s3://${src_bucket}/${src_prefix} - to s3://${dst_bucket}/${dst_prefix}: -$(echo "${add_manifests:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json$//') + The following packages will be ADDED + from s3://${src_bucket}/${src_prefix} + to s3://${dst_bucket}/${dst_prefix}: + $(echo "${add_manifests:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json$//') -The following packages will be UPDATED (source manifest is newer) - from s3://${src_bucket}/${src_prefix} - to s3://${dst_bucket}/${dst_prefix}: -$(IFS=$'\n'; echo "${update_manifests[*]:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json$//') + The following packages will be UPDATED (source manifest is newer) + from s3://${src_bucket}/${src_prefix} + to s3://${dst_bucket}/${dst_prefix}: + $(IFS=$'\n'; echo "${update_manifests[*]:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json$//') -The following packages will $($remove || echo -n "NOT ")be REMOVED - from s3://${dst_bucket}/${dst_prefix}$($remove && echo -n ":")$($remove || echo -ne "\n because '--no-remove' was given:") -$(echo "${remove_manifests:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json$//') -" >&2 + The following packages will $($remove || echo -n "NOT ")be REMOVED + from s3://${dst_bucket}/${dst_prefix}$($remove && echo -n ":")$($remove || echo -ne "\n because '--no-remove' was given:") + $(echo "${remove_manifests:-(none)}" | sed -e 's/^/ - /' -e 's/.composer.json$//') +EOF # clear remove_manifests if --no-remove given $remove || remove_manifests= From c0d3f8a632fa975e1043ade2b6a60f1a21e72c39 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 19 Mar 2018 21:56:06 +0100 Subject: [PATCH 113/553] log failure and warning counts --- bin/compile | 178 ++++++++++++++++++++++++++++++------------ bin/util/blackfire.sh | 1 + bin/util/failures.sh | 130 ++++++++++++++++++++++++++++++ bin/util/newrelic.sh | 2 + 4 files changed, 262 insertions(+), 49 deletions(-) create mode 100755 bin/util/failures.sh diff --git a/bin/compile b/bin/compile index 70d4e282d..5e226921b 100755 --- a/bin/compile +++ b/bin/compile @@ -16,9 +16,18 @@ mkdir -p "$cache_dir" env_dir=${3:-} # Anvil has none bp_dir=$(cd $(dirname $0); cd ..; pwd) +export BPLOG_PREFIX="buildpack.php" +export BUILDPACK_LOG_FILE=${BUILDPACK_LOG_FILE:-/dev/null} + # convenience functions source $bp_dir/bin/util/common.sh +# stdlib +source /dev/stdin <<< "$(curl_retry_on_18 --silent https://lang-common.s3.amazonaws.com/buildpack-stdlib/v8/stdlib.sh)" + +# failure counting +source $bp_dir/bin/util/failures.sh + # for extensions that need special treatment source $bp_dir/bin/util/newrelic.sh source $bp_dir/bin/util/blackfire.sh @@ -38,34 +47,48 @@ export COMPOSER_LOCK=$(basename "$COMPOSER" ".json")".lock" # replace .json with # a bunch of sanity checks first if [[ -s "$COMPOSER" ]]; then - cat "$COMPOSER" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER'; make sure it's valid!" + cat "$COMPOSER" | python -mjson.tool &> /dev/null || { + mcount "failures.composer_json.lint" + error "Could not parse '$COMPOSER'; make sure it's valid!" + } if [[ ! -f "$COMPOSER_LOCK" ]]; then - cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || error <<-EOF - Your '$COMPOSER' lists dependencies inside 'require', - but no '$COMPOSER_LOCK' was found. Please run 'composer update' to - re-generate '$COMPOSER_LOCK' if necessary, and commit it into your - repository. For more information, please refer to the docs at - https://devcenter.heroku.com/articles/php-support#activation - EOF + cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || { + mcount "failures.composer_lock.missing" + error <<-EOF + Your '$COMPOSER' lists dependencies inside 'require', + but no '$COMPOSER_LOCK' was found. Please run 'composer update' to + re-generate '$COMPOSER_LOCK' if necessary, and commit it into your + repository. For more information, please refer to the docs at + https://devcenter.heroku.com/articles/php-support#activation + EOF + } else - cat "$COMPOSER_LOCK" | python -mjson.tool &> /dev/null || error "Could not parse '$COMPOSER_LOCK'; make sure it's valid!" - cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || warning <<-EOF - Your '$COMPOSER' contains a non-'stable' setting - for 'minimum-stability'. This may cause the installation of - unstable versions of runtimes and extensions during this deploy. - It is recommended that you always use stability flags instead, - even if you have 'prefer-stable' enabled. For more information, - see https://getcomposer.org/doc/01-basic-usage.md#stability - EOF + cat "$COMPOSER_LOCK" | python -mjson.tool &> /dev/null || { + mcount "failures.composer_lock.lint" + error "Could not parse '$COMPOSER_LOCK'; make sure it's valid!" + } + cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || { + mcount "warnings.composer_lock.minimum_stability" + warning <<-EOF + Your '$COMPOSER' contains a non-'stable' setting + for 'minimum-stability'. This may cause the installation of + unstable versions of runtimes and extensions during this deploy. + It is recommended that you always use stability flags instead, + even if you have 'prefer-stable' enabled. For more information, + see https://getcomposer.org/doc/01-basic-usage.md#stability + EOF + } fi else if [[ ! -f "$COMPOSER" ]]; then + mcount "warnings.composer_json.missing" warning <<-EOF No '$COMPOSER' found. Using 'index.php' to declare app type as PHP is considered legacy functionality and may lead to unexpected behavior. EOF else + mcount "warnings.composer_json.empty" notice <<-EOF Your '$COMPOSER' is completely empty. Please change its contents to at least '{}' so it is valid JSON. @@ -105,17 +128,23 @@ 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.28.tar.gz" || error <<-EOF - Failed to download minimal PHP for bootstrapping. - Please try again, or contact support if this problem persists. -EOF +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.28.tar.gz" || { + mcount "failures.bootstrap.download.php-min" + error <<-EOF + Failed to download minimal PHP for bootstrapping. + Please try again, or contact support if this problem persists. + EOF +} 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.6.3.tar.gz" || error <<-EOF - Failed to download Composer. - Please try again, or contact support if this problem persists. -EOF +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.6.3.tar.gz" || { + mcount "failures.bootstrap.download.composer" + error <<-EOF + Failed to download Composer. + Please try again, or contact support if this problem persists. + EOF +} tar xzf $build_dir/.heroku/composer.tar.gz -C $build_dir/.heroku/php rm $build_dir/.heroku/composer.tar.gz @@ -139,12 +168,20 @@ echo "export PATH=\$HOME/.heroku/php/bin:\$PATH:\$HOME/$composer_bindir" > $buil status "Installing platform packages..." # extract requirements from composer.lock -/app/.heroku/php-min/bin/php $bp_dir/bin/util/platform.php "$bp_dir/support/installer/" $HEROKU_PHP_PLATFORM_REPOSITORIES 2>&1 >$build_dir/.heroku/php/composer.json | indent || error <<-EOF - Couldn't load '$COMPOSER_LOCK'; it must be a valid lock - file generated by Composer and be in a consistent state. - Check above for any parse errors and address them if necessary. - Run 'composer update', add/commit the change, then push again. -EOF +/app/.heroku/php-min/bin/php $bp_dir/bin/util/platform.php "$bp_dir/support/installer/" $HEROKU_PHP_PLATFORM_REPOSITORIES 2>&1 >$build_dir/.heroku/php/composer.json | indent || { + code=$? + if [[ $code -eq 3 ]]; then + mcount "failures.platform.composer_lock.runtime_only_in_dev" + else + mcount "failures.platform.composer_lock.parse" + fi + error <<-EOF + Couldn't load '$COMPOSER_LOCK'; it must be a valid lock + file generated by Composer and be in a consistent state. + Check above for any parse errors and address them if necessary. + Run 'composer update', add/commit the change, then push again. + EOF +} # reset COMPOSER for the platform install step COMPOSER_bak="$COMPOSER" @@ -154,9 +191,19 @@ export COMPOSER=composer.json # they are also used in later install attempts for add-on extensions (blackfire, newrelic, ...) export export_file_path=$bp_dir/export export profile_dir_path=$build_dir/.profile.d -if composer install -d "$build_dir/.heroku/php" ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} 2>&1 | tee $build_dir/.heroku/php/install.log | grep --line-buffered -E '^ - (Instal|Enab)ling heroku-sys/' | sed -u -E -e 's/^ - (Instal|Enab)ling /- /' -e 's/heroku-sys\///g' | indent; then +# grep and sed in a subshell with || true, or a failing grep match will cause the exit code to be 1 if "composer install" fails with code 2 +if composer install -d "$build_dir/.heroku/php" ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} 2>&1 | tee $build_dir/.heroku/php/install.log | ( grep --line-buffered -E '^ - (Instal|Enab)ling heroku-sys/' | sed -u -E -e 's/^ - (Instal|Enab)ling /- /' -e 's/heroku-sys\///g' || true ) | indent; then : else + code=$? + install_log=$(cat $build_dir/.heroku/php/install.log | sed -e 's/heroku-sys\///g' -e 's/^Loading composer repositories with package information/Loading repositories with available runtimes and extensions/' -e 's/^Installing dependencies.*//' -e '/^Potential causes:/,$d' -e 's/^/> /') + if [[ $code -eq 2 ]]; then + # dependency solving failed + mcount "failures.platform.solving.$(detect_platform_solving_failures <<< "$install_log")" + else + # something else + mcount "failures.platform.install.$(detect_platform_install_failures <<< "$install_log")" + fi error <<-EOF Failed to install system packages. @@ -166,7 +213,7 @@ else Full error information from installation attempt: - $(cat $build_dir/.heroku/php/install.log | sed -e 's/heroku-sys\///g' -e 's/^Loading composer repositories with package information/Loading repositories with available runtimes and extensions/' -e 's/^Installing dependencies.*//' -e '/^Potential causes:/,$d' -e 's/^/> /') + $install_log Please verify that all requirements for runtime versions in '$COMPOSER_LOCK' are compatible with the list below, and ensure @@ -194,12 +241,15 @@ fi export COMPOSER="$COMPOSER_bak" unset COMPOSER_bak -composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || warning <<-EOF - Your '$COMPOSER_LOCK' is not up to date with the latest - changes in '$COMPOSER'. To ensure you are not getting stale - dependencies, run 'composer update' on your machine and commit - any changes to Git before pushing again. -EOF +composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || { + mcount "warnings.composer_lock.outdated" + warning <<-EOF + Your '$COMPOSER_LOCK' is not up to date with the latest + changes in '$COMPOSER'. To ensure you are not getting stale + dependencies, run 'composer update' on your machine and commit + any changes to Git before pushing again. + EOF +} # clean up rm -rf /app/.heroku/php-min $build_dir/.heroku/php-min @@ -217,13 +267,22 @@ status "Installing dependencies..." # check if we should use a composer.phar version bundled with the project if [[ -f "composer.phar" ]]; then - [[ -x "composer.phar" ]] || error "File '/composer.phar' isn't executable; please 'chmod +x'!" - $engine_r 'new Phar("composer.phar");' &> /dev/null || error "File '/composer.phar' is not a valid PHAR archive!" + [[ -x "composer.phar" ]] || { + mcount "failures.composer_phar.not_executable" + error "File '/composer.phar' isn't executable; please 'chmod +x'!" + } + $engine_r 'new Phar("composer.phar");' &> /dev/null || { + mcount "failures.composer_phar.invalid_phar" + error "File '/composer.phar' is not a valid PHAR archive!" + } composer() { $engine composer.phar "$@" } export -f composer - composer --version 2>&1 | grep "^Composer version" > /dev/null || error "File '/composer.phar' is not a Composer executable!" + composer --version 2>&1 | grep "^Composer version" > /dev/null || { + mcount "failures.composer_phar.not_composer" + error "File '/composer.phar' is not a Composer executable!" + } notice_inline "Using '/composer.phar' to install dependencies." fi # echo composer version for info purposes @@ -242,6 +301,7 @@ if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" EOF ) fi + mcount "warnings.vendor_dir" warning <<-EOF Your Composer vendor dir is part of your Git repository. This directory should not be under version control; only your @@ -263,6 +323,7 @@ if [[ -n "$COMPOSER_GITHUB_OAUTH_TOKEN" ]]; then composer config -g github-oauth.github.com "$COMPOSER_GITHUB_OAUTH_TOKEN" &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) notice_inline 'Using $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth.' else + mcount "failures.dependencies.auth.COMPOSER_GITHUB_OAUTH_TOKEN" error 'Invalid $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth!' fi else @@ -273,20 +334,39 @@ fi 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 2>&1 | indent +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|BPLOG_PREFIX|BUILDPACK_LOG_FILE)$' +if cat "$COMPOSER" | python -c 'import sys,json; sys.exit(not json.load(sys.stdin));'; then + install_log=$(mktemp -t heroku-buildpack-php-composer-install-log-XXXX) + composer install ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --prefer-dist --optimize-autoloader --no-interaction 2>&1 | tee "$install_log" | indent || { + code=$? + if [[ $code -eq 2 ]]; then + # dependency solving failed, which should only ever happen if people have platform overrides in their config + mcount "failures.dependencies.solving.$(detect_dependencies_solving_failures < "$install_log")" + else + mcount "failures.dependencies.install.$(detect_dependencies_install_failures < "$install_log")" + fi + exit $code + } +fi # only perform the check for buildpack package if we're not running in Heroku CI if [[ -z "${HEROKU_PHP_INSTALL_DEV+are-we-running-in-ci}" ]]; then - composer show --installed heroku/heroku-buildpack-php &> /dev/null && error <<-EOF - Your '$COMPOSER' requires 'heroku/heroku-buildpack-php'. - This package may only be used as a dependency in 'require-dev'! - EOF + composer show --installed heroku/heroku-buildpack-php &> /dev/null && { + mcount "failures.dependencies.buildpack_as_dependency" + error <<-EOF + Your '$COMPOSER' requires 'heroku/heroku-buildpack-php'. + This package may only be used as a dependency in 'require-dev'! + EOF + } fi if cat "$COMPOSER" | python -c 'import sys,json; sys.exit("compile" not in json.load(sys.stdin).get("scripts", {}));'; then status "Running 'composer compile'..." - composer run-script ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --no-interaction compile 2>&1 | indent + composer run-script ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --no-interaction compile 2>&1 | indent || { + code=$? + mcount "failures.compile_step" + exit $code + } fi status "Preparing runtime environment..." diff --git a/bin/util/blackfire.sh b/bin/util/blackfire.sh index 5a15d7895..4b7c44ad2 100755 --- a/bin/util/blackfire.sh +++ b/bin/util/blackfire.sh @@ -9,6 +9,7 @@ install_blackfire_ext() { if $engine -n $(which composer) require --update-no-dev -d "$build_dir/.heroku/php" -- "heroku-sys/ext-blackfire:*" >> $build_dir/.heroku/php/install.log 2>&1; then echo "- Blackfire detected, installed ext-blackfire" | indent else + mcount "warnings.addons.blackfire.extension_missing" warning_inline "Blackfire detected, but no suitable extension available" fi fi diff --git a/bin/util/failures.sh b/bin/util/failures.sh new file mode 100755 index 000000000..ca585ea0e --- /dev/null +++ b/bin/util/failures.sh @@ -0,0 +1,130 @@ +detect_platform_solving_failures() { + # we can't use an associative array, as those are pure hashes in Bash 4+, so they don't preserve an order, but we need that + local failures=() + local regexes=() + + regexes+=("requires php \S+ -> no matching package found") + failures+=("requirements.php") + regexes+=("requires php-64bit \S+ -> no matching package found") + failures+=("requirements.php-64bit") + regexes+=("requires hhvm \S+ -> no matching package found") + failures+=("requirements.hhvm") + regexes+=("requires ext-\S+ \S+ -> no matching package found") + failures+=("requirements.extension") + + regexes+=("requires ext-mcrypt \S+ -> satisfiable by php") + failures+=("requirements.extension.mcrypt") + regexes+=("requires ext-mongo \S+ -> satisfiable by ext-mongo") + failures+=("requirements.extension.mongo") + regexes+=("requires ext-mysql \S+ -> satisfiable by php") + failures+=("requirements.extension.mysql") + + # FIXME: detect multiple conflicing requirements (e.g. from require and require-dev)? + + # regex_failures expects variable names, not values, as it dereferences the arrays + regex_failures regexes failures || echo "unknown" +} + +detect_platform_install_failures() { + # we can't use an associative array, as those are pure hashes in Bash 4+, so they don't preserve an order, but we need that + local failures=() + local regexes=() + + regexes+=("Your configuration does not allow connections to") + failures+=("download.insecure") + regexes+=('.json" file could not be downloaded \(HTTP/\S+ 404') + failures+=("download.not_found") + regexes+=('Composer\\Downloader\\TransportException') + failures+=("download.unknown") + # FIXME: all these probably apply to repositories and file downloads, can we differentiate? + # FIXME: repository errors occur right after "Loading repositories with available runtimes and extensions" + # FIXME: package downloads have "Updating dependencies" and "Package operations: 33 installs, 0 updates, 0 removals" before + + # regex_failures expects variable names, not values, as it dereferences the arrays + regex_failures regexes failures || echo "unknown" +} + +detect_dependencies_solving_failures() { + # we can't use an associative array, as those are pure hashes in Bash 4+, so they don't preserve an order, but we need that + local failures=() + local regexes=() + + regexes+=('overridden by "config.platform.[^"]+" version \([^)]+\) does not satisfy that requirement') + failures+=("platform_override") + + # regex_failures expects variable names, not values, as it dereferences the arrays + regex_failures regexes failures || echo "unknown" +} + +detect_dependencies_install_failures() { + # we can't use an associative array, as those are pure hashes in Bash 4+, so they don't preserve an order, but we need that + local failures=() + local regexes=() + + regexes+=("Your configuration does not allow connections to") + failures+=("download.insecure") + regexes+=("Failed to download \S+ from dist: Could not authenticate against") + failures+=("download.authentication.failed") + regexes+=("No bitbucket authentication configured") + failures+=("download.authentication.bitbucket.missing") + + regexes+=('Failed to clone \S+ via \S+(, \S+)* protocols, aborting.') + failures+=("download.clone") + # FIXME: may be followed first by "remote: Invalid username or password" and then "Host key verification failed." + regexes+=("Failed to execute git clone") + failures+=("download.clone") + # FIXME: "Host key verification failed." may show up a few lines later + # FIXME: or "fatal: unable to access 'https://foo:***@bitbucket.org/foo/bar.git/': The requested URL returned error: 403" + + regexes+=('Failed to download \S+ from dist: The "[^"]+" file could not be downloaded \(HTTP/\S+ 404') + failures+=("download.not_found") + + regexes+=("Parse error: syntax error") + failures+=("scripts.any.parse_error") + regexes+=("(ClassNotFoundException|Class '[^']+' not found)") + failures+=("scripts.any.class_not_found") + regexes+=('Symfony\\Component\\Process\\Exception\\ProcessTimedOutException') + failures+=("scripts.any.timeout") + regexes+=('(SQLSTATE|PDOException|Doctrine\\DBAL\\Exception)') + failures+=("scripts.any.database") + + regexes+=("handling the post-install-cmd event terminated with an exception") + failures+=("scripts.post-install-cmd.exception") + regexes+=("handling the post-install-cmd event returned with error code") + failures+=("scripts.post-install-cmd.error") + regexes+=("handling the post-autoload-dump event terminated with an exception") + failures+=("scripts.post-autoload-dump.exception") + regexes+=("handling the post-autoload-dump event returned with error code") + failures+=("scripts.post-autoload-dump.error") + regexes+=("handling the \S+ event terminated with an exception") + failures+=("scripts.unknown.exception") + regexes+=("handling the \S+ event returned with error code") + failures+=("scripts.unknown.error") + + regexes+=("(APP_ENV environment variable is not defined|Environment variable not found)") + failures+=("symfony.env_var_missing") + + # regex_failures expects variable names, not values, as it dereferences the arrays + regex_failures regexes failures || echo "unknown" +} + +regex_failures() { + # dereference argument names into variables + local name=$1[@] + local regexes=("${!name}") + local name=$2[@] + local failures=("${!name}") + + # buffer input, as we have to read it many times + local input=$(> $build_dir/.heroku/php/install.log 2>&1; then echo "- New Relic detected, installed ext-newrelic" | indent else + mcount "warnings.addons.newrelic.extension_missing" warning_inline "New Relic detected, but no suitable extension available" fi fi @@ -16,6 +17,7 @@ install_newrelic_ext() { install_newrelic_userini() { if [[ "$engine" == "php" && -n "${NEW_RELIC_CONFIG_FILE:-}" ]]; then if [[ ! -f "${NEW_RELIC_CONFIG_FILE}" ]]; then + mcount "failures.addons.newrelic.NEW_RELIC_CONFIG_FILE" error <<-EOF Config var 'NEW_RELIC_CONFIG_FILE' points to non existing file '${NEW_RELIC_CONFIG_FILE}' From ae196597227f625e6e59538c19b0e829a1e4ff57 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 21 Mar 2018 14:19:48 +0100 Subject: [PATCH 114/553] CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..25f6404da --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @heroku/languages From a3c508cb9bacc27911c41d8aa0a94f69d830d1ce Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 21 Mar 2018 18:38:10 +0100 Subject: [PATCH 115/553] measure platform and dependencies package count, and log runtime versions --- bin/compile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bin/compile b/bin/compile index 5e226921b..917c0d96b 100755 --- a/bin/compile +++ b/bin/compile @@ -237,6 +237,9 @@ elif composer show -d "$build_dir/.heroku/php" --installed --quiet heroku-sys/hh engine_r="hhvm --php -r" fi +# log number of installed platform packages +mmeasure "platform.count" $(composer show -d "$build_dir/.heroku/php" --installed "heroku-sys/*" 2> /dev/null | wc -l) + # done with platform installs; restore COMPOSER from previous value export COMPOSER="$COMPOSER_bak" unset COMPOSER_bak @@ -263,6 +266,9 @@ composer() { } export -f composer +# log runtime version +mcount "platform.packages.php.$($engine_r "echo ${engine^^}_VERSION;")" + status "Installing dependencies..." # check if we should use a composer.phar version bundled with the project @@ -360,6 +366,9 @@ if [[ -z "${HEROKU_PHP_INSTALL_DEV+are-we-running-in-ci}" ]]; then } fi +# log number of installed dependencies +mmeasure "dependencies.count" $(composer show --installed 2> /dev/null | wc -l) + if cat "$COMPOSER" | python -c 'import sys,json; sys.exit("compile" not in json.load(sys.stdin).get("scripts", {}));'; then status "Running 'composer compile'..." composer run-script ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --no-interaction compile 2>&1 | indent || { From 8695faad643cb19a260c0a08fda27321f4f0a6aa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 21 Mar 2018 18:51:40 +0100 Subject: [PATCH 116/553] v133 release info --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf5a1e496..925f4caa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v133 (2018-03-21) + +### CHG + +- Internal changes only [David Zuelke] + ## v132 (2018-03-02) ### ADD From d34e40c90b08b2c938a3c4e5e2154d6c0a086d00 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:02:07 -0700 Subject: [PATCH 117/553] apache/2.4.33 --- CHANGELOG.md | 6 ++++++ support/build/{apache-2.4.29 => apache-2.4.33} | 0 2 files changed, 6 insertions(+) rename support/build/{apache-2.4.29 => apache-2.4.33} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 925f4caa7..5846759ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v134 (2018-03-29) + +### ADD + +- Apache/2.3.44 [David Zuelke] + ## v133 (2018-03-21) ### CHG diff --git a/support/build/apache-2.4.29 b/support/build/apache-2.4.33 similarity index 100% rename from support/build/apache-2.4.29 rename to support/build/apache-2.4.33 From a72cb90530922011ec859600be9e191bf5f5ca37 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:04:01 -0700 Subject: [PATCH 118/553] ext-newrelic/8.0.0.204 --- CHANGELOG.md | 1 + .../{newrelic-7.7.0.203 => newrelic-8.0.0.204} | 0 .../{newrelic-7.7.0.203 => newrelic-8.0.0.204} | 0 .../{newrelic-7.7.0.203 => newrelic-8.0.0.204} | 0 .../{newrelic-7.7.0.203 => newrelic-8.0.0.204} | 0 .../{newrelic-7.7.0.203 => newrelic-8.0.0.204} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-7.7.0.203 => newrelic-8.0.0.204} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-7.7.0.203 => newrelic-8.0.0.204} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-7.7.0.203 => newrelic-8.0.0.204} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-7.7.0.203 => newrelic-8.0.0.204} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-7.7.0.203 => newrelic-8.0.0.204} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5846759ef..2e364de28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - Apache/2.3.44 [David Zuelke] +- ext-newrelic/8.0.0.204 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-7.7.0.203 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.0.0.204 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-7.7.0.203 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.0.0.204 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-7.7.0.203 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.0.0.204 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-7.7.0.203 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.0.0.204 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-7.7.0.203 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.0.0.204 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-7.7.0.203 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.0.0.204 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-7.7.0.203 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.0.0.204 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-7.7.0.203 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.0.0.204 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.0.0.204 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-7.7.0.203 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.0.0.204 From 37ef471c6febcc076d21625e2a04dd062ed78819 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:06:13 -0700 Subject: [PATCH 119/553] ext-apcu/5.1.11 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20151012/{apcu-5.1.10 => apcu-5.1.11} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.10 => apcu-5.1.11} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.10 => apcu-5.1.11} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.10 => apcu-5.1.11} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.10 => apcu-5.1.11} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.10 => apcu-5.1.11} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e364de28..40009fea6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Apache/2.3.44 [David Zuelke] - ext-newrelic/8.0.0.204 [David Zuelke] +- ext-apcu/5.1.11 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.10 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.10 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.10 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.10 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.10 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.10 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 From f413c6c6e3f323eaca8574200a082d0ab9608151 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:07:09 -0700 Subject: [PATCH 120/553] ext-mongodb/1.4.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.4.1 => mongodb-1.4.2} | 0 .../no-debug-non-zts-20131226/{mongodb-1.4.1 => mongodb-1.4.2} | 0 .../no-debug-non-zts-20151012/{mongodb-1.4.1 => mongodb-1.4.2} | 0 .../no-debug-non-zts-20160303/{mongodb-1.4.1 => mongodb-1.4.2} | 0 .../no-debug-non-zts-20170718/{mongodb-1.4.1 => mongodb-1.4.2} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.4.1 => mongodb-1.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.4.1 => mongodb-1.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.4.1 => mongodb-1.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.4.1 => mongodb-1.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.4.1 => mongodb-1.4.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40009fea6..2896fbb49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Apache/2.3.44 [David Zuelke] - ext-newrelic/8.0.0.204 [David Zuelke] - ext-apcu/5.1.11 [David Zuelke] +- ext-mongodb/1.4.2 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.1 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.1 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.1 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.1 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.1 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.1 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.1 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.1 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.1 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.1 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 From 23b8fca6a32e39a82387c0d2f6112a5bb92b945d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:09:46 -0700 Subject: [PATCH 121/553] PHP/7.0.29 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.6.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/{php-7.0.28 => php-7.0.29} | 0 support/build/{php-min-7.0.28 => php-min-7.0.29} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.28 => php-7.0.29} (100%) rename support/build/{php-min-7.0.28 => php-min-7.0.29} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2896fbb49..677d36f73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - ext-newrelic/8.0.0.204 [David Zuelke] - ext-apcu/5.1.11 [David Zuelke] - ext-mongodb/1.4.2 [David Zuelke] +- PHP/7.0.29 [David Zuelke] ## v133 (2018-03-21) diff --git a/bin/compile b/bin/compile index 917c0d96b..bcbec7185 100755 --- a/bin/compile +++ b/bin/compile @@ -128,7 +128,7 @@ 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.28.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.29.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping. diff --git a/support/build/composer-1.6.3 b/support/build/composer-1.6.3 index bde1af4bf..10191738e 100755 --- a/support/build/composer-1.6.3 +++ b/support/build/composer-1.6.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.28 +# Build Deps: php-min-7.0.29 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index a3405c5d4..43bde21a0 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 index 6c6ac5508..f02a2f305 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28 +# Build Deps: php-7.0.29 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 743ffa314..1fab0fcb0 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.28, libraries/libcassandra-2.8.1 +# Build Deps: php-7.0.29, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index f0684f45d..06a12f8c1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 5f573e335..7ff34014e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 4fc6791ef..bd5c3b817 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index caec4ac91..3c3382dda 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.29, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 index 64c2a0884..6a86219ea 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index b1872a8d6..d2f212531 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 index ce5cb4f8e..4825413cb 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 index e681e1cad..d547233c0 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.29, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 7529584a5..d534c70d6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 65736453d..93657589d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28, libraries/librdkafka-0.11.3 +# Build Deps: php-7.0.29, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index 21f21c274..4c2b25a16 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.28 +# Build Deps: php-7.0.29 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.28 b/support/build/php-7.0.29 similarity index 100% rename from support/build/php-7.0.28 rename to support/build/php-7.0.29 diff --git a/support/build/php-min-7.0.28 b/support/build/php-min-7.0.29 similarity index 100% rename from support/build/php-min-7.0.28 rename to support/build/php-min-7.0.29 From f98db30bc8d68c23f3be30bb5188920c3728d863 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:20:13 -0700 Subject: [PATCH 122/553] PHP/7.1.16 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/{php-7.1.15 => php-7.1.16} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.15 => php-7.1.16} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 677d36f73..468cbb177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - ext-apcu/5.1.11 [David Zuelke] - ext-mongodb/1.4.2 [David Zuelke] - PHP/7.0.29 [David Zuelke] +- PHP/7.1.16 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index c4126c1dc..29ecb9037 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 index 5c976a1ca..fe63c2c7a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 439bb5606..459ebc779 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.15, libraries/libcassandra-2.8.1 +# Build Deps: php-7.1.16, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index fc02d1c45..81b6b4944 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index fb36e5472..0194d5b9c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 093942c98..705d5f552 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index a61fadc60..0191e3c92 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.16, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 index e6e8f34d4..70b1a6eef 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index d453e430f..60a0599f3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 index 1b133c929..f16b9d702 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 index 030f42825..2aad875f5 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.16, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 43140932c..766a9f4f6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index c27e5fca6..680c7624f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15, libraries/librdkafka-0.11.3 +# Build Deps: php-7.1.16, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 72754e838..f0f00a785 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.15 +# Build Deps: php-7.1.16 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.15 b/support/build/php-7.1.16 similarity index 100% rename from support/build/php-7.1.15 rename to support/build/php-7.1.16 From 1c906b4936bb686727c96b0a974f54894507ddab Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:21:10 -0700 Subject: [PATCH 123/553] PHP/7.2.4 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/{php-7.2.3 => php-7.2.4} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.2.3 => php-7.2.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 468cbb177..69e027cea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - ext-mongodb/1.4.2 [David Zuelke] - PHP/7.0.29 [David Zuelke] - PHP/7.1.16 [David Zuelke] +- PHP/7.2.4 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 46fff288d..3a522449e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 index 3eb9ee101..b7fc201ed 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index abe46b427..130f81fd2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3, libraries/libcassandra-2.8.1 +# Build Deps: php-7.2.4, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index da3309073..e7aa19613 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index ea3e9b5b7..9d0047627 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 7957ce402..f6792e463 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index 325536b0d..a5b9dc464 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.4, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 index b125604b7..8ef45655b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 4480f988f..3a53f2862 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 index d29f4120a..50204f65e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 index bd68dc617..18cb1b896 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.4, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 8cee5e7b8..3e5375fbd 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 29d691fe3..dffef6460 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3, libraries/librdkafka-0.11.3 +# Build Deps: php-7.2.4, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 4f442aa1d..b2d8e8118 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.3 +# Build Deps: php-7.2.4 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.3 b/support/build/php-7.2.4 similarity index 100% rename from support/build/php-7.2.3 rename to support/build/php-7.2.4 From 648a1ccd15cdc47d1ffdeb611c8052501daa47ca Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 16:41:35 -0700 Subject: [PATCH 124/553] ext-phalcon/3.3.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.3.1 => phalcon-3.3.2} | 0 .../no-debug-non-zts-20131226/{phalcon-3.3.1 => phalcon-3.3.2} | 0 .../no-debug-non-zts-20151012/{phalcon-3.3.1 => phalcon-3.3.2} | 0 .../no-debug-non-zts-20160303/{phalcon-3.3.1 => phalcon-3.3.2} | 0 .../no-debug-non-zts-20170718/{phalcon-3.3.1 => phalcon-3.3.2} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.3.1 => phalcon-3.3.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.3.1 => phalcon-3.3.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.3.1 => phalcon-3.3.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.3.1 => phalcon-3.3.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.3.1 => phalcon-3.3.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69e027cea..6aa9ccc44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - PHP/7.0.29 [David Zuelke] - PHP/7.1.16 [David Zuelke] - PHP/7.2.4 [David Zuelke] +- ext-phalcon/3.3.2 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.1 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.1 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.1 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.1 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.1 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 From 7938033686205234caf6b7f91a3a2f256a73ed04 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 17:06:22 -0700 Subject: [PATCH 125/553] PHP/5.6.35 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- support/build/{php-5.6.34 => php-5.6.35} | 0 18 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-5.6.34 => php-5.6.35} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aa9ccc44..a99fca941 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - PHP/7.1.16 [David Zuelke] - PHP/7.2.4 [David Zuelke] - ext-phalcon/3.3.2 [David Zuelke] +- PHP/5.6.35 [David Zuelke] ## v133 (2018-03-21) diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index 6eedf295f..586c33d78 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 8a2d8f87d..64198f074 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index bb886c659..eb4a93604 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34, libraries/libcassandra-2.8.1 +# Build Deps: php-5.6.35, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 210ee2d3c..11942c7f7 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index c95114f68..21c6c3983 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index b51ccf3bd..1805469a1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 94601fc6a..86c45d1b0 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.35, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index 57efaa767..373391fea 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 index 47cd2ea4f..ef6e346cd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 9ce7d8bfa..2cc5015b0 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index bcf6be24a..8035e3a05 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 index bcf6be24a..8035e3a05 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index b4c63e0e4..295c303a7 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.35, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 81d770241..de8a6e43f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 5f64d1f2d..336cd2f70 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34, libraries/librdkafka-0.11.3 +# Build Deps: php-5.6.35, libraries/librdkafka-0.11.3 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index 3c3315be8..2efca28f2 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.34 +# Build Deps: php-5.6.35 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.34 b/support/build/php-5.6.35 similarity index 100% rename from support/build/php-5.6.34 rename to support/build/php-5.6.35 From 558ad5f4abff6949b8bb8f6275b50c09e8e7cf25 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 17:08:03 -0700 Subject: [PATCH 126/553] librdkafka/0.11.4 --- CHANGELOG.md | 4 ++++ .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../build/libraries/{librdkafka-0.11.3 => librdkafka-0.11.4} | 0 7 files changed, 9 insertions(+), 5 deletions(-) rename support/build/libraries/{librdkafka-0.11.3 => librdkafka-0.11.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a99fca941..4bfac7f8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ - ext-phalcon/3.3.2 [David Zuelke] - PHP/5.6.35 [David Zuelke] +### CHG + +- librdkafka/0.11.4 [David Zuelke] + ## v133 (2018-03-21) ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index a60e0ac73..b548b2063 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.11.3 +# Build Deps: php-5.5.38, libraries/librdkafka-0.11.4 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 336cd2f70..2224a026d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35, libraries/librdkafka-0.11.3 +# Build Deps: php-5.6.35, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 93657589d..7de0cfb3f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29, libraries/librdkafka-0.11.3 +# Build Deps: php-7.0.29, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 680c7624f..dfeb7b476 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16, libraries/librdkafka-0.11.3 +# Build Deps: php-7.1.16, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index dffef6460..a3c1fc66a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4, libraries/librdkafka-0.11.3 +# Build Deps: php-7.2.4, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.11.3 b/support/build/libraries/librdkafka-0.11.4 similarity index 100% rename from support/build/libraries/librdkafka-0.11.3 rename to support/build/libraries/librdkafka-0.11.4 From c802d107152f888b4da512cb922c775ca8abfb8b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 29 Mar 2018 17:38:29 -0700 Subject: [PATCH 127/553] v134 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bfac7f8a..97b844259 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v134 (2018-03-29) +## v134 (2018-03-30) ### ADD From 97dc2c3ca91f3faa5000dd73d77fb1aedee1243e Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 30 Mar 2018 13:42:33 -0700 Subject: [PATCH 128/553] fix v134 apache version number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97b844259..6c734021d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### ADD -- Apache/2.3.44 [David Zuelke] +- Apache/2.4.33 [David Zuelke] - ext-newrelic/8.0.0.204 [David Zuelke] - ext-apcu/5.1.11 [David Zuelke] - ext-mongodb/1.4.2 [David Zuelke] From dfc5777b67440e69d3edbd7f53cfcb2a940925c3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:27:15 -0400 Subject: [PATCH 129/553] PHP/5.6.36 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../extensions/no-debug-non-zts-20131226/mongodb-1.4.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- support/build/{php-5.6.35 => php-5.6.36} | 0 18 files changed, 22 insertions(+), 16 deletions(-) rename support/build/{php-5.6.35 => php-5.6.36} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c734021d..2b4bac2d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v135 (2018-04-??) + +### ADD + +- PHP/5.6.36 [David Zuelke] + ## v134 (2018-03-30) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index 586c33d78..9cd8dbea1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 64198f074..ffeffa2b0 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index eb4a93604..01ab46315 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35, libraries/libcassandra-2.8.1 +# Build Deps: php-5.6.36, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 11942c7f7..5b572f2d4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index 21c6c3983..794ec1de1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 1805469a1..38fd0984f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 86c45d1b0..013d91e68 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.36, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index 373391fea..b201ba73a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 index ef6e346cd..96e72c6e7 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 2cc5015b0..94dd15e6d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 8035e3a05..4295b6cdc 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 index 8035e3a05..4295b6cdc 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 295c303a7..a07abfa7b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.36, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index de8a6e43f..7d4c862d5 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 2224a026d..0fd7ce284 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35, libraries/librdkafka-0.11.4 +# Build Deps: php-5.6.36, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index 2efca28f2..1baf50e71 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.35 +# Build Deps: php-5.6.36 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.35 b/support/build/php-5.6.36 similarity index 100% rename from support/build/php-5.6.35 rename to support/build/php-5.6.36 From 772b7cf0bfa92df8e2e5d64c6ad6a6858960e86c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:28:52 -0400 Subject: [PATCH 130/553] PHP/7.0.30 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.6.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/{php-7.0.29 => php-7.0.30} | 0 support/build/{php-min-7.0.29 => php-min-7.0.30} | 0 19 files changed, 17 insertions(+), 16 deletions(-) rename support/build/{php-7.0.29 => php-7.0.30} (100%) rename support/build/{php-min-7.0.29 => php-min-7.0.30} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4bac2d1..08cebcead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/5.6.36 [David Zuelke] +- PHP/7.0.30 [David Zuelke] ## v134 (2018-03-30) diff --git a/bin/compile b/bin/compile index bcbec7185..b87107e59 100755 --- a/bin/compile +++ b/bin/compile @@ -128,7 +128,7 @@ 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.29.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.30.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping. diff --git a/support/build/composer-1.6.3 b/support/build/composer-1.6.3 index 10191738e..22fed9b6a 100755 --- a/support/build/composer-1.6.3 +++ b/support/build/composer-1.6.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.29 +# Build Deps: php-min-7.0.30 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index 43bde21a0..a799e815c 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 index f02a2f305..df56e2447 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29 +# Build Deps: php-7.0.30 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 1fab0fcb0..b62e88dd9 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.29, libraries/libcassandra-2.8.1 +# Build Deps: php-7.0.30, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 06a12f8c1..f771531ee 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 7ff34014e..4c987d500 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index bd5c3b817..9c3b2139f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 3c3382dda..2050dd0f1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.30, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 index 6a86219ea..efc90d523 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index d2f212531..6f1062d70 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 index 4825413cb..d0d35c325 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 index d547233c0..fc93398dc 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.30, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index d534c70d6..8495570f1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 7de0cfb3f..b59f97c33 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29, libraries/librdkafka-0.11.4 +# Build Deps: php-7.0.30, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index 4c2b25a16..abbfaece7 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.29 +# Build Deps: php-7.0.30 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.29 b/support/build/php-7.0.30 similarity index 100% rename from support/build/php-7.0.29 rename to support/build/php-7.0.30 diff --git a/support/build/php-min-7.0.29 b/support/build/php-min-7.0.30 similarity index 100% rename from support/build/php-min-7.0.29 rename to support/build/php-min-7.0.30 From 27579ede852e0b5715759b3da5e8a9d1ebf78589 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:29:36 -0400 Subject: [PATCH 131/553] PHP/7.1.17 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/{php-7.1.16 => php-7.1.17} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.1.16 => php-7.1.17} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08cebcead..1545bc6a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/5.6.36 [David Zuelke] - PHP/7.0.30 [David Zuelke] +- PHP/7.1.17 [David Zuelke] ## v134 (2018-03-30) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 29ecb9037..90b1f57f9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 index fe63c2c7a..b531c9747 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 459ebc779..4dee8f3c0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.16, libraries/libcassandra-2.8.1 +# Build Deps: php-7.1.17, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 81b6b4944..e7690d914 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 0194d5b9c..e6ba3de76 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 705d5f552..7463f0051 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 0191e3c92..2070bca1f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.17, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 index 70b1a6eef..9fdb68455 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 60a0599f3..cd2571bff 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 index f16b9d702..b32b9d82f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 index 2aad875f5..5cde11dbb 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.17, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 766a9f4f6..2fbde5262 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index dfeb7b476..ba08bb3a7 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16, libraries/librdkafka-0.11.4 +# Build Deps: php-7.1.17, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index f0f00a785..472dfcda0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.16 +# Build Deps: php-7.1.17 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.16 b/support/build/php-7.1.17 similarity index 100% rename from support/build/php-7.1.16 rename to support/build/php-7.1.17 From ac8ac1aa4479fa0cdc5c94f5b2585ceb11af5fe5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:30:15 -0400 Subject: [PATCH 132/553] PHP/7.2.5 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/{php-7.2.4 => php-7.2.5} | 0 16 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.2.4 => php-7.2.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1545bc6a8..250f9c717 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/5.6.36 [David Zuelke] - PHP/7.0.30 [David Zuelke] - PHP/7.1.17 [David Zuelke] +- PHP/7.2.5 [David Zuelke] ## v134 (2018-03-30) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 3a522449e..e190707a4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 index b7fc201ed..c66312f2b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 130f81fd2..286cf4ea9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4, libraries/libcassandra-2.8.1 +# Build Deps: php-7.2.5, libraries/libcassandra-2.8.1 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index e7aa19613..3e98667e3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index 9d0047627..b5720d760 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index f6792e463..c8866fed9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index a5b9dc464..d572aaa18 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.5, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 index 8ef45655b..3d018d632 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 3a53f2862..f1898cc7c 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 index 50204f65e..5df18461c 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 index 18cb1b896..1ffa49f17 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.5, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 3e5375fbd..5754283a8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index a3c1fc66a..1a0c58c63 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4, libraries/librdkafka-0.11.4 +# Build Deps: php-7.2.5, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index b2d8e8118..957f03da1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.4 +# Build Deps: php-7.2.5 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.4 b/support/build/php-7.2.5 similarity index 100% rename from support/build/php-7.2.4 rename to support/build/php-7.2.5 From 3bf666966237e28a1c173e992b7273bf20193e43 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:32:42 -0400 Subject: [PATCH 133/553] ext-mongodb/1.4.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.4.2 => mongodb-1.4.3} | 0 .../no-debug-non-zts-20131226/{mongodb-1.4.2 => mongodb-1.4.3} | 0 .../no-debug-non-zts-20151012/{mongodb-1.4.2 => mongodb-1.4.3} | 0 .../no-debug-non-zts-20160303/{mongodb-1.4.2 => mongodb-1.4.3} | 0 .../no-debug-non-zts-20170718/{mongodb-1.4.2 => mongodb-1.4.3} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.4.2 => mongodb-1.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.4.2 => mongodb-1.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.4.2 => mongodb-1.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.4.2 => mongodb-1.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.4.2 => mongodb-1.4.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 250f9c717..4e3ba6de0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.30 [David Zuelke] - PHP/7.1.17 [David Zuelke] - PHP/7.2.5 [David Zuelke] +- ext-mongodb/1.4.3 [David Zuelke] ## v134 (2018-03-30) diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.2 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.2 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.2 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.2 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.2 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 From 8ae92c644884aed4a9e67347f3d1675c4469fa37 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:34:07 -0400 Subject: [PATCH 134/553] Composer/1.6.4 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.6.3 => composer-1.6.4} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.6.3 => composer-1.6.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e3ba6de0..76cd9e033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ - PHP/7.2.5 [David Zuelke] - ext-mongodb/1.4.3 [David Zuelke] +### CHG + +- Composer/1.6.4 [David Zuelke] + ## v134 (2018-03-30) ### ADD diff --git a/bin/compile b/bin/compile index b87107e59..a0c4739bb 100755 --- a/bin/compile +++ b/bin/compile @@ -138,7 +138,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.6.3.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.6.4.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer. diff --git a/support/build/composer-1.6.3 b/support/build/composer-1.6.4 similarity index 100% rename from support/build/composer-1.6.3 rename to support/build/composer-1.6.4 From 6bf21b76938ba711e760f6535a90bc0d31165a14 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 24 Apr 2018 22:38:47 -0400 Subject: [PATCH 135/553] libcassandra/2.9.0 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- .../build/libraries/{libcassandra-2.8.1 => libcassandra-2.9.0} | 0 7 files changed, 6 insertions(+), 5 deletions(-) rename support/build/libraries/{libcassandra-2.8.1 => libcassandra-2.9.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76cd9e033..736077cd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ### CHG - Composer/1.6.4 [David Zuelke] +- libcassandra/2.9.0 [David Zuelke] ## v134 (2018-03-30) diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index 7c11ba884..278db04a7 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.8.1 +# Build Deps: php-5.5.38, libraries/libcassandra-2.9.0 source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 01ab46315..39abb2a1f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36, libraries/libcassandra-2.8.1 +# Build Deps: php-5.6.36, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index b62e88dd9..2c46ad47f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.30, libraries/libcassandra-2.8.1 +# Build Deps: php-7.0.30, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 4dee8f3c0..26c96722d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.17, libraries/libcassandra-2.8.1 +# Build Deps: php-7.1.17, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 286cf4ea9..4c1942fc1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5, libraries/libcassandra-2.8.1 +# Build Deps: php-7.2.5, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/libraries/libcassandra-2.8.1 b/support/build/libraries/libcassandra-2.9.0 similarity index 100% rename from support/build/libraries/libcassandra-2.8.1 rename to support/build/libraries/libcassandra-2.9.0 From dbc37b9571c0b8df3d0ca9857bcebddc677ac038 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 25 Apr 2018 13:27:45 -0400 Subject: [PATCH 136/553] ext-redis/4.0.2 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/redis-4.0.2 | 5 +++++ .../build/extensions/no-debug-non-zts-20131226/redis-4.0.2 | 5 +++++ .../build/extensions/no-debug-non-zts-20151012/redis-4.0.2 | 5 +++++ .../build/extensions/no-debug-non-zts-20160303/redis-4.0.2 | 5 +++++ .../build/extensions/no-debug-non-zts-20170718/redis-4.0.2 | 5 +++++ 6 files changed, 26 insertions(+) create mode 100755 support/build/extensions/no-debug-non-zts-20121212/redis-4.0.2 create mode 100755 support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 create mode 100755 support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 create mode 100755 support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 736077cd3..7ce027a7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.17 [David Zuelke] - PHP/7.2.5 [David Zuelke] - ext-mongodb/1.4.3 [David Zuelke] +- ext-redis/4.0.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.0.2 new file mode 100755 index 000000000..5148c25cc --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20121212/redis-4.0.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-5.5.38 + +source $(dirname $0)/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 new file mode 100755 index 000000000..1baf50e71 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-5.6.36 + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 new file mode 100755 index 000000000..abbfaece7 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.0.30 + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 new file mode 100755 index 000000000..472dfcda0 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.1.17 + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 new file mode 100755 index 000000000..957f03da1 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.2.5 + +source $(dirname $0)/../no-debug-non-zts-20121212/redis From 3564f9d2ef8ef93a1f1cd415025b5f1aa09dc9cc Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 26 Apr 2018 09:10:48 -0400 Subject: [PATCH 137/553] v135 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ce027a7d..ef23d05a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v135 (2018-04-??) +## v135 (2018-04-26) ### ADD From 7f892250e38d316a8a622d500dd0652487cb668a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 17 Apr 2018 01:43:00 +0200 Subject: [PATCH 138/553] heroku-18 compat --- support/build/_docker/heroku-18.Dockerfile | 13 +++++++ support/build/libraries/libc-client | 45 +++++++++++++++++----- support/build/nginx | 4 ++ support/build/php | 14 ++++--- 4 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 support/build/_docker/heroku-18.Dockerfile diff --git a/support/build/_docker/heroku-18.Dockerfile b/support/build/_docker/heroku-18.Dockerfile new file mode 100644 index 000000000..d610df68a --- /dev/null +++ b/support/build/_docker/heroku-18.Dockerfile @@ -0,0 +1,13 @@ +FROM heroku/heroku:18-build + +WORKDIR /app +ENV WORKSPACE_DIR=/app/support/build +ENV PATH=/app/support/build/_util:$PATH + +RUN apt-get update && apt-get install -y python-pip + +COPY requirements.txt /app/requirements.txt + +RUN pip install -r /app/requirements.txt + +COPY . /app diff --git a/support/build/libraries/libc-client b/support/build/libraries/libc-client index 66ff63d1d..1fdc8465a 100755 --- a/support/build/libraries/libc-client +++ b/support/build/libraries/libc-client @@ -14,31 +14,58 @@ dep_formula=${0#$WORKSPACE_DIR/} dep_name=$(basename $BASH_SOURCE) dep_version=${dep_formula##*"/${dep_name}-"} dep_package=pkg-${dep_name}-${dep_version} -dep_dirname=imap-${dep_version} -dep_archive_name=${dep_dirname}.tar.gz -dep_url=ftp://ftp.cac.washington.edu/imap/${dep_archive_name} +dep_dirname=uw-imap-${dep_version}~dfsg +dep_urls=( + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg.orig.tar.gz +) +if [[ $STACK == "cedar-14" ]]; then + dep_urls+=( + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg-2.debian.tar.gz + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg-2.dsc + ) +elif [[ $STACK == "heroku-16" ]]; then + dep_urls+=( + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg-4.debian.tar.xz + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg-4.dsc + ) +elif [[ $STACK == "heroku-18" ]]; then + dep_urls+=( + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg-5build1.debian.tar.xz + http://archive.ubuntu.com/ubuntu/pool/universe/u/uw-imap/uw-imap_${dep_version}~dfsg-5build1.dsc + ) +fi +dep_destname=imap-${dep_version} dep_manifest=${dep_package}.composer.json echo "-----> Building ${dep_package}..." # we need that for IMAP needed=( libpam0g-dev ) +if [[ $STACK == "cedar-14" ]]; then + gpg --keyserver keyserver.ubuntu.com --recv-keys 7D61E3E6 + gpg --no-default-keyring -a --export 7D61E3E6 | gpg --no-default-keyring --keyring ~/.gnupg/trustedkeys.gpg --import - +else + needed+=( debian-keyring ) +fi missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } apt-get install -q -y $missing fi -curl -L ${dep_url} | tar xz +curl -L --remote-name-all "${dep_urls[@]}" + +dpkg-source --require-valid-signature -x $(basename ${dep_urls[-1]}) pushd ${dep_dirname} + touch ip6 # so we do not get prompted make ldb EXTRACFLAGS=-fPIC # need PIC so relocations work in the shared imap.so ext later -mkdir -p ${OUT_PREFIX}/opt/${dep_dirname}/include ${OUT_PREFIX}/opt/${dep_dirname}/lib -cp c-client/*.h ${OUT_PREFIX}/opt/${dep_dirname}/include -cp c-client/*.c ${OUT_PREFIX}/opt/${dep_dirname}/lib -cp c-client/*.a ${OUT_PREFIX}/opt/${dep_dirname}/lib -strip --strip-unneeded ${OUT_PREFIX}/opt/${dep_dirname}/lib/*.a +mkdir -p ${OUT_PREFIX}/opt/${dep_destname}/include ${OUT_PREFIX}/opt/${dep_destname}/lib +cp c-client/*.h ${OUT_PREFIX}/opt/${dep_destname}/include +cp c-client/*.c ${OUT_PREFIX}/opt/${dep_destname}/lib +cp c-client/*.a ${OUT_PREFIX}/opt/${dep_destname}/lib +strip --strip-unneeded ${OUT_PREFIX}/opt/${dep_destname}/lib/*.a popd python $(dirname $BASH_SOURCE)/../_util/include/manifest.py "heroku-sys-package" "heroku-sys/pkg-${dep_name}" "$dep_version" "${dep_formula}.tar.gz" > $dep_manifest diff --git a/support/build/nginx b/support/build/nginx index c9152f273..21201ea2f 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -24,6 +24,10 @@ echo "-----> Building ${dep_package}..." curl -L ${dep_url} | tar xz pushd ${dep_dirname} + +# patch a bunch of fallthrough cases with missing comments, which would error on GCC7 +curl -L https://github.com/nginx/nginx/commit/8449f750e62cd229026e9df3bd023ec7e073a7d4.patch | patch -p1 + ETC=${OUT_PREFIX}/etc VAR=${OUT_PREFIX}/var ./configure \ diff --git a/support/build/php b/support/build/php index f5e24cbf6..56b8d00af 100755 --- a/support/build/php +++ b/support/build/php @@ -39,14 +39,16 @@ curl -L ${dep_url} | tar xz pushd ${dep_dirname} -libicu="libicu55" -if [[ $STACK == "cedar-14" ]]; then - libicu="libicu52" -fi # we need libgmp for GMP, libpam0g for IMAP, libicu for intl, libsasl2/krb/ldap for LDAP -needed=( libgmp10 libpam0g $libicu libsasl2-2 libkrb5-3 libldap-2.4-2 ) -if [[ $STACK != "cedar-14" ]]; then +needed=( libgmp10 libpam0g libsasl2-2 libkrb5-3 libldap-2.4-2 ) +if [[ $STACK == "cedar-14" ]]; then + needed+=( libicu52 ) +elif [[ $STACK == "heroku-16" ]]; then + needed+=( libicu55 ) needed+=( libsodium18 ) +elif [[ $STACK != "heroku-18" ]]; then + needed+=( libicu60 ) + needed+=( libsodium23 ) fi missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) if [[ "$missing" ]]; then From 6faa297bbdb67d79745fbf2e94566d46e94fe81c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Apr 2018 03:54:05 +0200 Subject: [PATCH 139/553] default to PHP 7 for heroku-18 and later --- CHANGELOG.md | 6 ++++++ bin/compile | 6 ++++++ bin/util/platform.php | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef23d05a1..f3bdbe728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v136 (2018-05-??) + +### CHG + +- Default to PHP 7 for heroku-18 and later [David Zuelke] + ## v135 (2018-04-26) ### ADD diff --git a/bin/compile b/bin/compile index a0c4739bb..d2fa8846b 100755 --- a/bin/compile +++ b/bin/compile @@ -167,6 +167,12 @@ echo "export PATH=\$HOME/.heroku/php/bin:\$PATH:\$HOME/$composer_bindir" > $buil status "Installing platform packages..." +if [[ $STACK == "cedar-14" || $STACK == "heroku-16" ]]; then + HEROKU_PHP_DEFAULT_RUNTIME_VERSION="^5.5.17" +else + HEROKU_PHP_DEFAULT_RUNTIME_VERSION="^7.0.0" +fi +export HEROKU_PHP_DEFAULT_RUNTIME_VERSION # extract requirements from composer.lock /app/.heroku/php-min/bin/php $bp_dir/bin/util/platform.php "$bp_dir/support/installer/" $HEROKU_PHP_PLATFORM_REPOSITORIES 2>&1 >$build_dir/.heroku/php/composer.json | indent || { code=$? diff --git a/bin/util/platform.php b/bin/util/platform.php index edde26996..a034fec6c 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -158,7 +158,7 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { file_put_contents("php://stderr", "ERROR: neither your $COMPOSER 'require' section nor any\ndependency therein requires a runtime version, but 'require-dev'\nor a dependency therein does. Heroku cannot automatically select\na default runtime version in this case.\nPlease add a version requirement for 'php' to section 'require'\nin $COMPOSER, 'composer update', commit, and deploy again."); exit(3); } - file_put_contents("php://stderr", "NOTICE: No runtime required in $COMPOSER_LOCK; using PHP ". ($require["heroku-sys/php"] = "^5.5.17") . "\n"); + file_put_contents("php://stderr", "NOTICE: No runtime required in $COMPOSER_LOCK; using PHP ". ($require["heroku-sys/php"] = getenv("HEROKU_PHP_DEFAULT_RUNTIME_VERSION") ?? "^7.0.0") . "\n"); } elseif(!isset($root["require"]["php"]) && !isset($root["require"]["hhvm"])) { file_put_contents("php://stderr", "NOTICE: No runtime required in $COMPOSER; requirements\nfrom dependencies in $COMPOSER_LOCK will be used for selection\n"); } From 996829d5606236021110beb71fddc57e765d3c95 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 May 2018 15:54:01 +0100 Subject: [PATCH 140/553] ext-blackfire/1.20.0 --- CHANGELOG.md | 4 ++++ .../{blackfire-1.18.2 => blackfire-1.20.0} | 0 .../{blackfire-1.18.2 => blackfire-1.20.0} | 0 .../{blackfire-1.18.2 => blackfire-1.20.0} | 0 .../{blackfire-1.18.2 => blackfire-1.20.0} | 0 .../{blackfire-1.18.2 => blackfire-1.20.0} | 0 6 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.18.2 => blackfire-1.20.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.18.2 => blackfire-1.20.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.18.2 => blackfire-1.20.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.18.2 => blackfire-1.20.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.18.2 => blackfire-1.20.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3bdbe728..7fa74a1f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v136 (2018-05-??) +### ADD + +- ext-blackfire/1.20.0 [David Zuelke] + ### CHG - Default to PHP 7 for heroku-18 and later [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.2 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.18.2 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.2 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.18.2 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.2 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.18.2 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.2 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.18.2 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.2 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.18.2 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.0 From fc1b3315922426508159b5d4bbd0fb007fe8c3fa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 May 2018 15:56:04 +0100 Subject: [PATCH 141/553] ext-newrelic/8.1.0.209 --- CHANGELOG.md | 1 + .../{newrelic-8.0.0.204 => newrelic-8.1.0.209} | 0 .../{newrelic-8.0.0.204 => newrelic-8.1.0.209} | 0 .../{newrelic-8.0.0.204 => newrelic-8.1.0.209} | 0 .../{newrelic-8.0.0.204 => newrelic-8.1.0.209} | 0 .../{newrelic-8.0.0.204 => newrelic-8.1.0.209} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.0.0.204 => newrelic-8.1.0.209} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.0.0.204 => newrelic-8.1.0.209} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.0.0.204 => newrelic-8.1.0.209} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.0.0.204 => newrelic-8.1.0.209} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.0.0.204 => newrelic-8.1.0.209} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa74a1f4..3160a083e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-blackfire/1.20.0 [David Zuelke] +- ext-newrelic/8.1.0.209 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.0.0.204 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.1.0.209 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.0.0.204 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.1.0.209 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.0.0.204 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.1.0.209 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.0.0.204 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.1.0.209 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.0.0.204 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.1.0.209 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.0.0.204 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.1.0.209 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.0.0.204 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.1.0.209 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.0.0.204 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.1.0.209 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.0.0.204 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.1.0.209 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.0.0.204 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.1.0.209 From fc26033f2a2adfd5f341c9f7a7a01a25fa826bea Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 May 2018 19:50:59 +0100 Subject: [PATCH 142/553] Composer/1.6.5 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{composer-1.6.4 => composer-1.6.5} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{composer-1.6.4 => composer-1.6.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3160a083e..a9aac7bf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### CHG - Default to PHP 7 for heroku-18 and later [David Zuelke] +- Composer/1.6.5 [David Zuelke] ## v135 (2018-04-26) diff --git a/bin/compile b/bin/compile index d2fa8846b..dd5fc463e 100755 --- a/bin/compile +++ b/bin/compile @@ -138,7 +138,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.6.4.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.6.5.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer. diff --git a/support/build/composer-1.6.4 b/support/build/composer-1.6.5 similarity index 100% rename from support/build/composer-1.6.4 rename to support/build/composer-1.6.5 From 261b476622d0a00bd4fbd436a855af10d746adc0 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 24 May 2018 13:35:48 +0200 Subject: [PATCH 143/553] PHP/7.1.18 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 | 2 +- support/build/{php-7.1.17 => php-7.1.18} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.17 => php-7.1.18} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9aac7bf8..4d9d796ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-blackfire/1.20.0 [David Zuelke] - ext-newrelic/8.1.0.209 [David Zuelke] +- PHP/7.1.18 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 90b1f57f9..b304f658b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 index b531c9747..5c1d3e4ce 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 26c96722d..58b4b0a9b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.17, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.18, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index e7690d914..303757604 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index e6ba3de76..5a95d7fbe 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 7463f0051..04d047b1c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 2070bca1f..bbc51273e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.18, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 index 9fdb68455..f6bfb0531 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index cd2571bff..6b1e5aa01 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 index b32b9d82f..734c8c5d7 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 index 5cde11dbb..a19746b25 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.18, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 2fbde5262..db25d0834 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index ba08bb3a7..16e44a012 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17, libraries/librdkafka-0.11.4 +# Build Deps: php-7.1.18, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 472dfcda0..ffe69a5e6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 index 472dfcda0..ffe69a5e6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.17 +# Build Deps: php-7.1.18 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.17 b/support/build/php-7.1.18 similarity index 100% rename from support/build/php-7.1.17 rename to support/build/php-7.1.18 From feb72e324eb896919719b71e46fdf8227410b8c9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 24 May 2018 13:36:28 +0200 Subject: [PATCH 144/553] PHP/7.2.6 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 | 2 +- support/build/{php-7.2.5 => php-7.2.6} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.5 => php-7.2.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d9d796ff..13f36754b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-blackfire/1.20.0 [David Zuelke] - ext-newrelic/8.1.0.209 [David Zuelke] - PHP/7.1.18 [David Zuelke] +- PHP/7.2.6 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index e190707a4..87779ee1f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 index c66312f2b..ce7851c4a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 4c1942fc1..99d3c54f9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.6, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 3e98667e3..8f4d81b92 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index b5720d760..4a52edeb8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index c8866fed9..612a9d224 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index d572aaa18..e970953f6 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.6, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 index 3d018d632..78cb07652 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index f1898cc7c..2aad95500 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 index 5df18461c..4b533715b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 index 1ffa49f17..c377b6aef 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.6, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 5754283a8..579fc9753 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 1a0c58c63..ec8e987a3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5, libraries/librdkafka-0.11.4 +# Build Deps: php-7.2.6, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 957f03da1..2810653af 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 index 957f03da1..2810653af 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.5 +# Build Deps: php-7.2.6 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.5 b/support/build/php-7.2.6 similarity index 100% rename from support/build/php-7.2.5 rename to support/build/php-7.2.6 From b18e17561d91f98df0c6541fb9ae133926846bc3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 24 May 2018 21:23:10 +0200 Subject: [PATCH 145/553] use docker build --pull in instructions to ensure that base image is always up to date --- support/build/_docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/build/_docker/README.md b/support/build/_docker/README.md index 73944475a..3b7337347 100644 --- a/support/build/_docker/README.md +++ b/support/build/_docker/README.md @@ -4,7 +4,7 @@ **After every change to your formulae, perform the following** from the root of the Git repository (not from `support/build/_docker/`): - $ docker build --tag heroku-php-build-cedar-14 --file $(pwd)/support/build/_docker/cedar-14.Dockerfile . + $ docker build --pull --tag heroku-php-build-cedar-14 --file $(pwd)/support/build/_docker/cedar-14.Dockerfile . ## Configuration From dff52c5b6557ed0075b1b18b76cf0ad3a9d8732b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 24 May 2018 21:23:38 +0200 Subject: [PATCH 146/553] v136 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13f36754b..b7a183130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v136 (2018-05-??) +## v136 (2018-05-24) ### ADD From 2dd2ce30f841ca4d60cc49b2d9f7a36e0ee3feab Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 24 May 2018 22:35:36 +0200 Subject: [PATCH 147/553] buildpack.toml --- buildpack.toml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 buildpack.toml diff --git a/buildpack.toml b/buildpack.toml new file mode 100644 index 000000000..a8c3acf29 --- /dev/null +++ b/buildpack.toml @@ -0,0 +1,8 @@ +[buildpack] +name = "PHP" + + [publish.Ignore] + files = [ + ".gitignore", + ".github/" + ] \ No newline at end of file From 89db09e3bf555d5f59d71795033f4df343c087b5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 03:07:52 +0200 Subject: [PATCH 148/553] fix newrelic.daemon.location broken in 8cf8199 doesn't affect regular cases as daemon is started externally --- CHANGELOG.md | 6 ++++++ support/build/extensions/no-debug-non-zts-20121212/newrelic | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7a183130..e52235ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v137 (2018-06-??) + +### FIX + +- New Relic daemon location is broken in PHP INI [David Zuelke] + ## v136 (2018-05-24) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 471c53ac7..3c5a4450d 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -84,7 +84,7 @@ mkdir -p ${OUT_PREFIX}/etc/php/conf.d cat > ${OUT_PREFIX}/etc/php/conf.d/newrelic.ini-dist <<'EOF' extension = newrelic.so -newrelic.daemon.location = /app/.heroku/php/bin/newrelic- +newrelic.daemon.location = /app/.heroku/php/bin/newrelic-daemon newrelic.daemon.port = @newrelic-daemon newrelic.loglevel = ${NEW_RELIC_LOG_LEVEL} From 37b0a91dd54947cce99b748c7e30021bff290ef8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 03:09:25 +0200 Subject: [PATCH 149/553] PHP/7.1.19 --- CHANGELOG.md | 4 ++++ support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-4.0.2 | 2 +- support/build/{php-7.1.18 => php-7.1.19} | 0 17 files changed, 19 insertions(+), 15 deletions(-) rename support/build/{php-7.1.18 => php-7.1.19} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e52235ca9..140a20397 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v137 (2018-06-??) +### ADD + +- PHP/7.1.19 [David Zuelke] + ### FIX - New Relic daemon location is broken in PHP INI [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index b304f658b..b7321ef40 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 index 5c1d3e4ce..c88ae0787 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 58b4b0a9b..5c1dd53e0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.18, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.19, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 303757604..567eb9d6b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 5a95d7fbe..25fb7e255 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 04d047b1c..be0c7cacf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index bbc51273e..f0346d1bb 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.19, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 index f6bfb0531..43087d2e4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 6b1e5aa01..bb5758bfb 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 index 734c8c5d7..f3d38bb67 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 index a19746b25..fa68c32bf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.19, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index db25d0834..7b3a5ff14 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 16e44a012..d231b00a3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18, libraries/librdkafka-0.11.4 +# Build Deps: php-7.1.19, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index ffe69a5e6..02a60cc1f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 index ffe69a5e6..02a60cc1f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.18 +# Build Deps: php-7.1.19 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.18 b/support/build/php-7.1.19 similarity index 100% rename from support/build/php-7.1.18 rename to support/build/php-7.1.19 From dd1fec5950f62de32616c4823add93a912871a40 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 03:10:03 +0200 Subject: [PATCH 150/553] PHP/7.2.7 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 | 2 +- support/build/{php-7.2.6 => php-7.2.7} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.6 => php-7.2.7} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 140a20397..a51a9faee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.1.19 [David Zuelke] +- PHP/7.2.7 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 87779ee1f..8c09023f9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 index ce7851c4a..e8a7182a5 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 99d3c54f9..ef80c888c 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.7, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 8f4d81b92..3e643f727 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index 4a52edeb8..d967cfe4d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 612a9d224..bf16db5ab 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index e970953f6..e82f0eed5 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.7, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 index 78cb07652..018f66ca0 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 2aad95500..9b345700b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 index 4b533715b..437f9fbab 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 index c377b6aef..b06786723 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.7, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 579fc9753..1de3a0f96 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index ec8e987a3..e004bbbd2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6, libraries/librdkafka-0.11.4 +# Build Deps: php-7.2.7, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 2810653af..7b9a312c1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 index 2810653af..7b9a312c1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.6 +# Build Deps: php-7.2.7 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.6 b/support/build/php-7.2.7 similarity index 100% rename from support/build/php-7.2.6 rename to support/build/php-7.2.7 From bc124cbe6318ba299dcf80bf9c58f42ab67de161 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 03:15:12 +0200 Subject: [PATCH 151/553] ext-mongodb/1.4.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.4.3 => mongodb-1.4.4} | 0 .../no-debug-non-zts-20131226/{mongodb-1.4.3 => mongodb-1.4.4} | 0 .../no-debug-non-zts-20151012/{mongodb-1.4.3 => mongodb-1.4.4} | 0 .../no-debug-non-zts-20160303/{mongodb-1.4.3 => mongodb-1.4.4} | 0 .../no-debug-non-zts-20170718/{mongodb-1.4.3 => mongodb-1.4.4} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.4.3 => mongodb-1.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.4.3 => mongodb-1.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.4.3 => mongodb-1.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.4.3 => mongodb-1.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.4.3 => mongodb-1.4.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a51a9faee..5ae0fd9f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.1.19 [David Zuelke] - PHP/7.2.7 [David Zuelke] +- ext-mongodb/1.4.4 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.3 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.3 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.3 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.3 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.3 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.4 From da6b3afb3c358bf78aa950a6b602d9b2140274d9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 03:15:53 +0200 Subject: [PATCH 152/553] ext-blackfire/1.20.1 --- CHANGELOG.md | 1 + .../{blackfire-1.20.0 => blackfire-1.20.1} | 0 .../{blackfire-1.20.0 => blackfire-1.20.1} | 0 .../{blackfire-1.20.0 => blackfire-1.20.1} | 0 .../{blackfire-1.20.0 => blackfire-1.20.1} | 0 .../{blackfire-1.20.0 => blackfire-1.20.1} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.20.0 => blackfire-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.20.0 => blackfire-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.20.0 => blackfire-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.20.0 => blackfire-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.20.0 => blackfire-1.20.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ae0fd9f9..812dce43e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.1.19 [David Zuelke] - PHP/7.2.7 [David Zuelke] - ext-mongodb/1.4.4 [David Zuelke] +- ext-blackfire/1.20.1 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.0 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.0 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.0 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.0 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.0 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.0 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.0 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.0 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.0 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.0 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.1 From 530c02f525c55acfc7c5f1da2da923313949107f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 03:17:13 +0200 Subject: [PATCH 153/553] ext-phalcon/3.4.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.3.2 => phalcon-3.4.0} | 0 .../no-debug-non-zts-20131226/{phalcon-3.3.2 => phalcon-3.4.0} | 0 .../no-debug-non-zts-20151012/{phalcon-3.3.2 => phalcon-3.4.0} | 0 .../no-debug-non-zts-20160303/{phalcon-3.3.2 => phalcon-3.4.0} | 0 .../no-debug-non-zts-20170718/{phalcon-3.3.2 => phalcon-3.4.0} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.3.2 => phalcon-3.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.3.2 => phalcon-3.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.3.2 => phalcon-3.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.3.2 => phalcon-3.4.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.3.2 => phalcon-3.4.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 812dce43e..e0177c714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.2.7 [David Zuelke] - ext-mongodb/1.4.4 [David Zuelke] - ext-blackfire/1.20.1 [David Zuelke] +- ext-phalcon/3.4.0 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.3.2 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.3.2 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.3.2 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.3.2 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.3.2 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 From 80b8bcc454bfdb92d1dc537b57f5295c8038e902 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 16:27:56 +0200 Subject: [PATCH 154/553] ext-pq/2.1.4 --- CHANGELOG.md | 3 ++- .../no-debug-non-zts-20151012/{pq-2.1.3 => pq-2.1.4} | 0 .../no-debug-non-zts-20160303/{pq-2.1.3 => pq-2.1.4} | 0 .../no-debug-non-zts-20170718/{pq-2.1.3 => pq-2.1.4} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20151012/{pq-2.1.3 => pq-2.1.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{pq-2.1.3 => pq-2.1.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{pq-2.1.3 => pq-2.1.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0177c714..e10144cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v137 (2018-06-??) +## v137 (2018-06-26) ### ADD @@ -9,6 +9,7 @@ - ext-mongodb/1.4.4 [David Zuelke] - ext-blackfire/1.20.1 [David Zuelke] - ext-phalcon/3.4.0 [David Zuelke] +- ext-pq/2.1.4 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/pq-2.1.3 rename to support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/pq-2.1.3 rename to support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/pq-2.1.3 rename to support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 From c538fa68602827db9ee5193d2ebb9396c77605e6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Jun 2018 20:46:29 +0200 Subject: [PATCH 155/553] ext-mongodb/1.5.0 --- CHANGELOG.md | 2 +- .../no-debug-non-zts-20121212/{mongodb-1.4.4 => mongodb-1.5.0} | 0 .../no-debug-non-zts-20131226/{mongodb-1.4.4 => mongodb-1.5.0} | 0 .../no-debug-non-zts-20151012/{mongodb-1.4.4 => mongodb-1.5.0} | 0 .../no-debug-non-zts-20160303/{mongodb-1.4.4 => mongodb-1.5.0} | 0 .../no-debug-non-zts-20170718/{mongodb-1.4.4 => mongodb-1.5.0} | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.4.4 => mongodb-1.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.4.4 => mongodb-1.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.4.4 => mongodb-1.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.4.4 => mongodb-1.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.4.4 => mongodb-1.5.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e10144cf0..771de5f55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,10 @@ - PHP/7.1.19 [David Zuelke] - PHP/7.2.7 [David Zuelke] -- ext-mongodb/1.4.4 [David Zuelke] - ext-blackfire/1.20.1 [David Zuelke] - ext-phalcon/3.4.0 [David Zuelke] - ext-pq/2.1.4 [David Zuelke] +- ext-mongodb/1.5.0 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.4 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.4.4 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.4 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.4.4 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.4 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.4.4 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.4 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.4.4 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.4 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.4.4 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.0 From 585bd7a9040873dc4a07badd72e015a5ef8e67ec Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 4 Jul 2018 17:29:24 +0200 Subject: [PATCH 156/553] ext-blackfire/1.22.0 --- CHANGELOG.md | 6 ++++++ .../{blackfire-1.20.1 => blackfire-1.22.0} | 0 .../{blackfire-1.20.1 => blackfire-1.22.0} | 0 .../{blackfire-1.20.1 => blackfire-1.22.0} | 0 .../{blackfire-1.20.1 => blackfire-1.22.0} | 0 .../{blackfire-1.20.1 => blackfire-1.22.0} | 0 6 files changed, 6 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.20.1 => blackfire-1.22.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.20.1 => blackfire-1.22.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.20.1 => blackfire-1.22.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.20.1 => blackfire-1.22.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.20.1 => blackfire-1.22.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 771de5f55..962c3a24e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v138 (2018-07-??) + +### ADD + +- ext-blackfire/1.22.0 [David Zuelke] + ## v137 (2018-06-26) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.1 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.22.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.20.1 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.22.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.1 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.22.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.20.1 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.22.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.1 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.22.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.20.1 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.22.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.1 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.22.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.20.1 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.22.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.1 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.22.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.20.1 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.22.0 From ba38755320d3d19e2fce4a45ef2b4f9a08da2ed4 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 4 Jul 2018 17:59:02 +0200 Subject: [PATCH 157/553] no need for bin dir in Nginx profile path setting --- support/build/nginx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/build/nginx b/support/build/nginx index 21201ea2f..4ecac24c1 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -63,11 +63,11 @@ cp $(dirname $BASH_SOURCE)/_conf/nginx/nginx.conf ${OUT_PREFIX}/etc/nginx/nginx. mkdir -p ${OUT_PREFIX}/bin # this gets sourced after package install, so that the buildpack and following buildpacks can invoke cat > ${OUT_PREFIX}/bin/export.nginx.sh <<'EOF' -export PATH="/app/.heroku/php/bin:/app/.heroku/php/sbin:$PATH" +export PATH="/app/.heroku/php/sbin:$PATH" EOF # this gets sourced on dyno boot cat > ${OUT_PREFIX}/bin/profile.nginx.sh <<'EOF' -export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" +export PATH="$HOME/.heroku/php/sbin:$PATH" EOF python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-webserver" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest From 46a623b88f9f71fb0c662aa10ea846e71b93039b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 9 Jul 2018 19:38:38 +0200 Subject: [PATCH 158/553] fix PHP 7 built with --enable-opcache-file only on cedar-14 --- CHANGELOG.md | 4 ++++ support/build/php | 22 +++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 962c3a24e..9c33b85a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - ext-blackfire/1.22.0 [David Zuelke] +### FIX + +- PHP 7 built with --enable-opcache-file only on cedar-14 [David Zuelke] + ## v137 (2018-06-26) ### ADD diff --git a/support/build/php b/support/build/php index 56b8d00af..fa42952ce 100755 --- a/support/build/php +++ b/support/build/php @@ -99,25 +99,17 @@ else fi fi -configureopts= +configureopts=() if [[ $dep_version == 7.* ]]; then - configureopts="\ ---enable-opcache-file\ -" + configureopts+=("--enable-opcache-file") + if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then - configureopts="\ ---with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix} \ -" + configureopts+=("--with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix}") elif [[ $STACK != "cedar-14" ]]; then - configureopts="\ ---with-sodium=shared \ -" + configureopts+=("--with-sodium=shared") fi else - configureopts="\ ---with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix} \ ---with-mysql=shared \ -" + configureopts+=("--with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix}" "--with-mysql=shared") fi export PATH=${OUT_PREFIX}/bin:$PATH @@ -164,7 +156,7 @@ export PATH=${OUT_PREFIX}/bin:$PATH --with-pdo-sqlite=shared \ --with-xmlrpc=shared \ --with-xsl=shared \ - $configureopts + "${configureopts[@]}" make -s -j 9 make install -s rm -rf ${OUT_PREFIX}/opt/imap-2007f # c-client.a got linked statically From 5f0ecf1b4ffa79d89f87e18c651199a18fbd9816 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 9 Jul 2018 19:41:20 +0200 Subject: [PATCH 159/553] argon2 support for 7.2 on heroku-18 --- CHANGELOG.md | 1 + support/build/php | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c33b85a7..9ca034fe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-blackfire/1.22.0 [David Zuelke] +- Argon2 support for PHP 7.2 and heroku-18 [David Zuelke] ### FIX diff --git a/support/build/php b/support/build/php index fa42952ce..f54741b59 100755 --- a/support/build/php +++ b/support/build/php @@ -105,8 +105,13 @@ if [[ $dep_version == 7.* ]]; then if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then configureopts+=("--with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix}") - elif [[ $STACK != "cedar-14" ]]; then - configureopts+=("--with-sodium=shared") + else + if [[ $STACK != "cedar-14" ]]; then + configureopts+=("--with-sodium=shared") + fi + if [[ $STACK != "cedar-14" && $STACK != "heroku-16" ]]; then + configureopts+=("--with-password-argon2") + fi fi else configureopts+=("--with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix}" "--with-mysql=shared") From b6be3896bd9963c49a6c7a02852b82338650ad01 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 9 Jul 2018 19:49:06 +0200 Subject: [PATCH 160/553] ext-apcu/5.1.12 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20151012/{apcu-5.1.11 => apcu-5.1.12} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.11 => apcu-5.1.12} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.11 => apcu-5.1.12} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.11 => apcu-5.1.12} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.11 => apcu-5.1.12} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.11 => apcu-5.1.12} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ca034fe9..66fa481a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-blackfire/1.22.0 [David Zuelke] - Argon2 support for PHP 7.2 and heroku-18 [David Zuelke] +- ext-apcu/5.1.12 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.11 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.11 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.11 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 From d57662f246664f80b2660d74982738117e92a88d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 9 Jul 2018 20:41:56 +0200 Subject: [PATCH 161/553] ext-mongodb/1.5.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.5.0 => mongodb-1.5.1} | 0 .../no-debug-non-zts-20131226/{mongodb-1.5.0 => mongodb-1.5.1} | 0 .../no-debug-non-zts-20151012/{mongodb-1.5.0 => mongodb-1.5.1} | 0 .../no-debug-non-zts-20160303/{mongodb-1.5.0 => mongodb-1.5.1} | 0 .../no-debug-non-zts-20170718/{mongodb-1.5.0 => mongodb-1.5.1} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.5.0 => mongodb-1.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.5.0 => mongodb-1.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.5.0 => mongodb-1.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.5.0 => mongodb-1.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.5.0 => mongodb-1.5.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66fa481a4..13fb27324 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-blackfire/1.22.0 [David Zuelke] - Argon2 support for PHP 7.2 and heroku-18 [David Zuelke] - ext-apcu/5.1.12 [David Zuelke] +- ext-mongodb/1.5.1 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.0 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.0 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.0 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.0 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.0 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.0 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.0 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.0 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.0 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.0 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 From 47aed202e76b426d8647b6e07861941bed771438 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 10 Jul 2018 16:14:45 +0200 Subject: [PATCH 162/553] v138 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13fb27324..51188b036 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v138 (2018-07-??) +## v138 (2018-07-10) ### ADD From a5731271779c0716130b2101e7fc89f3c4e1fc27 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:15:32 +0200 Subject: [PATCH 163/553] PHP/5.6.37 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../extensions/no-debug-non-zts-20131226/mongodb-1.5.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-4.0.2 | 2 +- support/build/{php-5.6.36 => php-5.6.37} | 0 19 files changed, 23 insertions(+), 17 deletions(-) rename support/build/{php-5.6.36 => php-5.6.37} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51188b036..18b7c6872 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v139 (2018-07-20) + +### ADD + +- PHP/5.6.37 [David Zuelke] + ## v138 (2018-07-10) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index 9cd8dbea1..f10689a86 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index ffeffa2b0..1a9253021 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 39abb2a1f..200cad1df 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36, libraries/libcassandra-2.9.0 +# Build Deps: php-5.6.37, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 5b572f2d4..31713411e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 index 794ec1de1..e259f7058 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 38fd0984f..2fd988cb1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 013d91e68..2d5758e7f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.37, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index b201ba73a..886493844 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 index 96e72c6e7..0f0513d1e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 94dd15e6d..eec5ba1ef 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 4295b6cdc..8b7fe11d0 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 index 4295b6cdc..8b7fe11d0 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index a07abfa7b..543cc47d8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.37, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 7d4c862d5..4f214f008 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 0fd7ce284..2115996ba 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36, libraries/librdkafka-0.11.4 +# Build Deps: php-5.6.37, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index 1baf50e71..eeff9a5f4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 index 1baf50e71..eeff9a5f4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.36 +# Build Deps: php-5.6.37 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.36 b/support/build/php-5.6.37 similarity index 100% rename from support/build/php-5.6.36 rename to support/build/php-5.6.37 From f117227ce0ec4078ae7212560ed4f9cfd2bf8d65 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:16:21 +0200 Subject: [PATCH 164/553] PHP/7.0.31 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.6.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 | 2 +- support/build/{php-7.0.30 => php-7.0.31} | 0 support/build/{php-min-7.0.30 => php-min-7.0.31} | 0 20 files changed, 18 insertions(+), 17 deletions(-) rename support/build/{php-7.0.30 => php-7.0.31} (100%) rename support/build/{php-min-7.0.30 => php-min-7.0.31} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18b7c6872..836fbc495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/5.6.37 [David Zuelke] +- PHP/7.0.31 [David Zuelke] ## v138 (2018-07-10) diff --git a/bin/compile b/bin/compile index dd5fc463e..298a70bd0 100755 --- a/bin/compile +++ b/bin/compile @@ -128,7 +128,7 @@ 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.30.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.31.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping. diff --git a/support/build/composer-1.6.5 b/support/build/composer-1.6.5 index 22fed9b6a..f1267d7c1 100755 --- a/support/build/composer-1.6.5 +++ b/support/build/composer-1.6.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.30 +# Build Deps: php-min-7.0.31 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index a799e815c..398ba3c63 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 index df56e2447..06ec59ef2 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30 +# Build Deps: php-7.0.31 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 2c46ad47f..049c45eca 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.30, libraries/libcassandra-2.9.0 +# Build Deps: php-7.0.31, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index f771531ee..0d4a3cf45 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 index 4c987d500..9ad2b576d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 +++ b/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.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 9c3b2139f..dd8f79495 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 2050dd0f1..144b6f0b4 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.31, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 index efc90d523..ca763fb76 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 6f1062d70..423e1eeab 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 index d0d35c325..59800df34 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 index fc93398dc..8a2b75e20 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.31, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 8495570f1..7955cf702 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index b59f97c33..a4e61f308 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30, libraries/librdkafka-0.11.4 +# Build Deps: php-7.0.31, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index abbfaece7..e3b69103c 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 index abbfaece7..e3b69103c 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.30 +# Build Deps: php-7.0.31 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.30 b/support/build/php-7.0.31 similarity index 100% rename from support/build/php-7.0.30 rename to support/build/php-7.0.31 diff --git a/support/build/php-min-7.0.30 b/support/build/php-min-7.0.31 similarity index 100% rename from support/build/php-min-7.0.30 rename to support/build/php-min-7.0.31 From 19d05a88da14e9d113c40000ac4f157d32f1721c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:16:57 +0200 Subject: [PATCH 165/553] PHP/7.1.20 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 | 2 +- support/build/{php-7.1.19 => php-7.1.20} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.19 => php-7.1.20} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 836fbc495..6795377e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/5.6.37 [David Zuelke] - PHP/7.0.31 [David Zuelke] +- PHP/7.1.20 [David Zuelke] ## v138 (2018-07-10) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index b7321ef40..05f90b1d1 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 index c88ae0787..90ef89156 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 5c1dd53e0..823633995 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.19, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.20, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 567eb9d6b..2d53df386 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index 25fb7e255..f9f4ca2ca 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index be0c7cacf..2280c6ef7 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index f0346d1bb..f5f24b6cc 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.20, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 index 43087d2e4..632216359 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index bb5758bfb..412da824b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 index f3d38bb67..6483a5640 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index fa68c32bf..dbf19e5c4 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.20, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 7b3a5ff14..eb00da368 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index d231b00a3..5f31dec3a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19, libraries/librdkafka-0.11.4 +# Build Deps: php-7.1.20, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 02a60cc1f..5b473c0f8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 index 02a60cc1f..5b473c0f8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.19 +# Build Deps: php-7.1.20 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.19 b/support/build/php-7.1.20 similarity index 100% rename from support/build/php-7.1.19 rename to support/build/php-7.1.20 From 2c0abea41fa33035d41792b31788f46720015f24 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:17:34 +0200 Subject: [PATCH 166/553] PHP/7.2.8 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 | 2 +- support/build/{php-7.2.7 => php-7.2.8} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.7 => php-7.2.8} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6795377e4..8b984f000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/5.6.37 [David Zuelke] - PHP/7.0.31 [David Zuelke] - PHP/7.1.20 [David Zuelke] +- PHP/7.2.8 [David Zuelke] ## v138 (2018-07-10) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 8c09023f9..c8fab8899 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 index e8a7182a5..f27df9ca6 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index ef80c888c..6bb29baed 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.8, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 3e643f727..3f8710ee3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index d967cfe4d..863cd9262 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index bf16db5ab..b5ffcaab5 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index e82f0eed5..bb6d88043 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.8, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 index 018f66ca0..bf4407ab1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 9b345700b..910e1ecf2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 index 437f9fbab..61bc258e9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index b06786723..bd1456d7d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.8, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 1de3a0f96..cf3f5d708 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index e004bbbd2..fba9c93fb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7, libraries/librdkafka-0.11.4 +# Build Deps: php-7.2.8, libraries/librdkafka-0.11.4 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 7b9a312c1..5d757dd9b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 index 7b9a312c1..5d757dd9b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.7 +# Build Deps: php-7.2.8 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.7 b/support/build/php-7.2.8 similarity index 100% rename from support/build/php-7.2.7 rename to support/build/php-7.2.8 From e34188d2f825adf8a56312b7d378791c1035d6d4 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:21:39 +0200 Subject: [PATCH 167/553] librdkafka/0.11.5 --- CHANGELOG.md | 4 ++++ .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../build/libraries/{librdkafka-0.11.4 => librdkafka-0.11.5} | 0 7 files changed, 9 insertions(+), 5 deletions(-) rename support/build/libraries/{librdkafka-0.11.4 => librdkafka-0.11.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b984f000..239fb8aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ - PHP/7.1.20 [David Zuelke] - PHP/7.2.8 [David Zuelke] +### CHG + +- librdkafka/0.11.5 [David Zuelke] + ## v138 (2018-07-10) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index b548b2063..5e38f84c1 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.11.4 +# Build Deps: php-5.5.38, libraries/librdkafka-0.11.5 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 2115996ba..9307fbb1d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37, libraries/librdkafka-0.11.4 +# Build Deps: php-5.6.37, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index a4e61f308..6b08399a4 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31, libraries/librdkafka-0.11.4 +# Build Deps: php-7.0.31, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 5f31dec3a..f909e7508 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20, libraries/librdkafka-0.11.4 +# Build Deps: php-7.1.20, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index fba9c93fb..028dda88a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8, libraries/librdkafka-0.11.4 +# Build Deps: php-7.2.8, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.11.4 b/support/build/libraries/librdkafka-0.11.5 similarity index 100% rename from support/build/libraries/librdkafka-0.11.4 rename to support/build/libraries/librdkafka-0.11.5 From aedfdf6430ebe4a4c74018d72200523994e36232 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:24:59 +0200 Subject: [PATCH 168/553] Apache/2.4.34 --- CHANGELOG.md | 1 + support/build/{apache-2.4.33 => apache-2.4.34} | 0 2 files changed, 1 insertion(+) rename support/build/{apache-2.4.33 => apache-2.4.34} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 239fb8aab..2f6db3225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.31 [David Zuelke] - PHP/7.1.20 [David Zuelke] - PHP/7.2.8 [David Zuelke] +- Apache/2.4.34 [David Zuelke] ### CHG diff --git a/support/build/apache-2.4.33 b/support/build/apache-2.4.34 similarity index 100% rename from support/build/apache-2.4.33 rename to support/build/apache-2.4.34 From afd6efdac5c0e9bec4315c1cb0ee7f747cab8328 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 20 Jul 2018 14:26:49 +0200 Subject: [PATCH 169/553] ext-redis/4.1.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{redis-4.0.2 => redis-4.1.0} | 0 .../no-debug-non-zts-20131226/{redis-4.0.2 => redis-4.1.0} | 0 .../no-debug-non-zts-20151012/{redis-4.0.2 => redis-4.1.0} | 0 .../no-debug-non-zts-20160303/{redis-4.0.2 => redis-4.1.0} | 0 .../no-debug-non-zts-20170718/{redis-4.0.2 => redis-4.1.0} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-4.0.2 => redis-4.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-4.0.2 => redis-4.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-4.0.2 => redis-4.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-4.0.2 => redis-4.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{redis-4.0.2 => redis-4.1.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f6db3225..8715ff830 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.20 [David Zuelke] - PHP/7.2.8 [David Zuelke] - Apache/2.4.34 [David Zuelke] +- ext-redis/4.1.0 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-4.0.2 rename to support/build/extensions/no-debug-non-zts-20121212/redis-4.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-4.0.2 rename to support/build/extensions/no-debug-non-zts-20131226/redis-4.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-4.0.2 rename to support/build/extensions/no-debug-non-zts-20151012/redis-4.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-4.0.2 rename to support/build/extensions/no-debug-non-zts-20160303/redis-4.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/redis-4.0.2 rename to support/build/extensions/no-debug-non-zts-20170718/redis-4.1.0 From fa784d4827c5be3888325ce97b08029faec32682 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 20 Mar 2018 01:47:12 +0100 Subject: [PATCH 170/553] Better error messages Longer messages, with additional context and remediation steps. Also "dynamically" offers possible reasons where feasible. Moved a few warnings around so that if they may be the cause of a later error (e.g. outdated lock file), they get shown before. --- CHANGELOG.md | 6 + bin/compile | 345 ++++++++++++++++++++++++++++++++++-------- bin/util/platform.php | 1 - 3 files changed, 288 insertions(+), 64 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8715ff830..295661732 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v140 (2018-07-25) + +### CHG + +- Improved build error messages [David Zuelke] + ## v139 (2018-07-20) ### ADD diff --git a/bin/compile b/bin/compile index 298a70bd0..60685226c 100755 --- a/bin/compile +++ b/bin/compile @@ -45,37 +45,110 @@ else fi export COMPOSER_LOCK=$(basename "$COMPOSER" ".json")".lock" # replace .json with .lock if it exists, append .lock otherwise +# we're using this error message in two places +composer_lock_parse_error=$( + cat <<-EOF + Failed to parse '$COMPOSER_LOCK'! + + There was an error parsing '$COMPOSER_LOCK'; it must be a valid + file generated by Composer and be in an up-to-date state. + + Look above for any parse errors and address them if necessary. + + You most likely created or edited the file by hand, or a merge + conflict was not resolved properly, resulting in a syntax error + in the file. Refer to the docs for information on re-generating + the lock file: https://getcomposer.org/doc/01-basic-usage.md + + Please perform the following steps locally on your computer to + resolve this issue before attempting another deploy: + 1) Run 'composer update' to re-generate the lock file + 2) stage the lock file changes using 'git add $COMPOSER_LOCK' + 3) commit the change using 'git commit' + + You can run 'composer validate' locally on your computer for + further diagnosis. Remember to also always keep your lock file + up to date with any changes according to the instructions at + https://getcomposer.org/doc/01-basic-usage.md + + Please remember to always keep your '$COMPOSER_LOCK' updated in + lockstep with '$COMPOSER' to avoid common problems related + to dependencies during collaboration and deployment. + EOF +) + # a bunch of sanity checks first if [[ -s "$COMPOSER" ]]; then cat "$COMPOSER" | python -mjson.tool &> /dev/null || { mcount "failures.composer_json.lint" - error "Could not parse '$COMPOSER'; make sure it's valid!" + error <<-EOF + Basic validation for '$COMPOSER' failed! + + It must be a valid JSON document compatible with Composer. + + You most likely created or edited the file by hand, and it now + contains a syntax error. Please refer to the documentation at + https://getcomposer.org/doc/ for information on the format. + + You can run 'composer validate' locally on your computer for + further diagnosis. Remember to also always keep your lock file + up to date with any changes according to the instructions at + https://getcomposer.org/doc/01-basic-usage.md + EOF } if [[ ! -f "$COMPOSER_LOCK" ]]; then cat "$COMPOSER" | python -c 'import sys, json; sys.exit(bool(json.load(sys.stdin).get("require", {})))' 2> /dev/null || { mcount "failures.composer_lock.missing" error <<-EOF - Your '$COMPOSER' lists dependencies inside 'require', - but no '$COMPOSER_LOCK' was found. Please run 'composer update' to - re-generate '$COMPOSER_LOCK' if necessary, and commit it into your - repository. For more information, please refer to the docs at - https://devcenter.heroku.com/articles/php-support#activation + No '$COMPOSER_LOCK' found! + + A '$COMPOSER_LOCK' file was not found in your project, but there + is a '$COMPOSER' file with dependencies inside 'require'. + + The lock file is required in order to guarantee reliable and + reproducible installation of dependencies across platforms and + deploys. You must follow the Composer best practice of having + your lock file under version control in order to deploy. The + lock file must not be in your '.gitignore'. + + Please perform the following steps locally on your computer to + resolve this issue before attempting another deploy: + 1) remove '$COMPOSER_LOCK' from file '.gitignore', if present + 2) if no '$COMPOSER_LOCK' exists, run 'composer update' + 3) stage the lock file changes using 'git add $COMPOSER_LOCK' + 4) if you edited '.gitignore', also run 'git add .gitignore' + 5) commit the change using 'git commit' + + Please remember to always keep your '$COMPOSER_LOCK' updated in + lockstep with '$COMPOSER' to avoid common problems related + to dependencies during collaboration and deployment. + + Please refer to the Composer documentation for further details: + https://getcomposer.org/doc/ + https://getcomposer.org/doc/01-basic-usage.md EOF } else cat "$COMPOSER_LOCK" | python -mjson.tool &> /dev/null || { mcount "failures.composer_lock.lint" - error "Could not parse '$COMPOSER_LOCK'; make sure it's valid!" + error "$composer_lock_parse_error" } cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || { mcount "warnings.composer_lock.minimum_stability" warning <<-EOF - Your '$COMPOSER' contains a non-'stable' setting - for 'minimum-stability'. This may cause the installation of - unstable versions of runtimes and extensions during this deploy. - It is recommended that you always use stability flags instead, - even if you have 'prefer-stable' enabled. For more information, - see https://getcomposer.org/doc/01-basic-usage.md#stability + Non-stable 'minimum-stability'! + + Your '$COMPOSER' contains a non-'stable' value for the + for the 'minimum-stability' setting. + + This setting affects behavior globally and may result in the + installation of unstable versions of PHP and extensions in + addition to your dependencies. + + It is strongly recommended that you always use stability flags + on the specific packages which you want in a non-stable version + instead, even if you have 'prefer-stable' enabled. More info: + https://getcomposer.org/doc/04-schema.md#package-links EOF } fi @@ -83,15 +156,35 @@ else if [[ ! -f "$COMPOSER" ]]; then mcount "warnings.composer_json.missing" warning <<-EOF - No '$COMPOSER' found. - Using 'index.php' to declare app type as PHP is considered legacy - functionality and may lead to unexpected behavior. + No '$COMPOSER' found! + + Your project only contains an 'index.php', no '$COMPOSER'. + + Using 'index.php' to declare app type as PHP is deprecated and + may lead to unexpected behavior. + + Please consider updating your codebase to utilize Composer and + modern dependency management in order to benefit from the latest + PHP runtimes and improved application performance, as well as + control over the PHP versions and extensions available. + + For an introduction to dependency management with Composer and + how to get the most out of PHP on Heroku, refer to the docs at + https://getcomposer.org/doc/00-intro.md and + https://devcenter.heroku.com/articles/getting-started-with-php EOF else mcount "warnings.composer_json.empty" notice <<-EOF - Your '$COMPOSER' is completely empty. - Please change its contents to at least '{}' so it is valid JSON. + Your '$COMPOSER' is completely empty! + + A completely empty file is not a valid JSON document. + + Heroku automatically corrected this problem, but it is strongly + recommended you change the contents to at least '{}'. + + For documentation on Composer and dependency management, check + out the introduction at https://getcomposer.org/doc/00-intro.md EOF fi echo "{}" > $COMPOSER @@ -131,8 +224,11 @@ 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.31.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF - Failed to download minimal PHP for bootstrapping. - Please try again, or contact support if this problem persists. + Failed to download minimal PHP for bootstrapping! + + This is most likely a temporary internal error. If the problem + persists, make sure that you are not running a custom or forked + version of the Heroku PHP buildpack which may need updating. EOF } tar xzf $build_dir/.heroku/php-min.tar.gz -C $build_dir/.heroku/php-min @@ -141,8 +237,11 @@ 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.6.5.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF - Failed to download Composer. - Please try again, or contact support if this problem persists. + Failed to download Composer for bootstrapping! + + This is most likely a temporary internal error. If this problem + persists, make sure that you are not running a custom or forked + version of the Heroku PHP buildpack which may need updating. EOF } tar xzf $build_dir/.heroku/composer.tar.gz -C $build_dir/.heroku/php @@ -165,6 +264,41 @@ echo "export PATH=/app/.heroku/php/bin:\$PATH:/app/$composer_bindir" > $bp_dir/e mkdir -p $build_dir/.profile.d echo "export PATH=\$HOME/.heroku/php/bin:\$PATH:\$HOME/$composer_bindir" > $build_dir/.profile.d/100-composer.sh +# we perform this check early so people with stale lock files are reminded why if their lock file errors in the next step +composer_lock_outdated=false +composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || { + mcount "warnings.composer_lock.outdated" + composer_lock_outdated=true + warning <<-EOF + Your '$COMPOSER_LOCK' is out of date! + + The '$COMPOSER_LOCK' file in your project is not up to date with + the main '$COMPOSER' file. This may result in installation + of incorrect packages or package versions. + + The lock file is required in order to guarantee reliable and + reproducible installation of dependencies across systems and + deploys. It must always be kept in sync with '$COMPOSER'. + + Whenever you change '$COMPOSER', ensure that you perform + the following steps locally on your computer: + 1) run 'composer update' + 2) add all changes using 'git add $COMPOSER $COMPOSER_LOCK' + 3) commit using 'git commit' + + Ensure that you updated the lock file correctly, and that you + ran 'git add' on both files, before deploying again. + + Please remember to always keep your '$COMPOSER_LOCK' updated in + lockstep with '$COMPOSER' to avoid common problems related + to dependencies during collaboration and deployment. + + Please refer to the Composer documentation for further details: + https://getcomposer.org/doc/ + https://getcomposer.org/doc/01-basic-usage.md + EOF +} + status "Installing platform packages..." if [[ $STACK == "cedar-14" || $STACK == "heroku-16" ]]; then @@ -178,15 +312,32 @@ export HEROKU_PHP_DEFAULT_RUNTIME_VERSION code=$? if [[ $code -eq 3 ]]; then mcount "failures.platform.composer_lock.runtime_only_in_dev" + error <<-EOF + Runtime specified in 'require-dev' but not in 'require'! + + Your '$COMPOSER' contains a 'require-dev' section which + specifies a PHP runtime version (either directly, or through + a dependency), but no such requirement is present in 'require' + or in any of the packages listed in 'require'. + + Even if dev requirements are not being installed, the entirety + of all dependencies needs to resolve to an installable set. + Heroku cannot select a default runtime version in this case. + + Please perform the following steps locally on your computer to + resolve this issue before attempting another deploy: + 1) add a dependency for 'php' to 'require' in '$COMPOSER' + 2) run 'composer update' to re-generate the lock file + 3) stage changes using 'git add $COMPOSER $COMPOSER_LOCK' + 4) commit changes using 'git commit' + + For more information on selecting PHP runtimes, please refer to + https://devcenter.heroku.com/articles/php-support + EOF else mcount "failures.platform.composer_lock.parse" + error "$composer_lock_parse_error" fi - error <<-EOF - Couldn't load '$COMPOSER_LOCK'; it must be a valid lock - file generated by Composer and be in a consistent state. - Check above for any parse errors and address them if necessary. - Run 'composer update', add/commit the change, then push again. - EOF } # reset COMPOSER for the platform install step @@ -210,26 +361,52 @@ else # something else mcount "failures.platform.install.$(detect_platform_install_failures <<< "$install_log")" fi + error <<-EOF - Failed to install system packages. + Failed to install system packages! Your platform requirements (for runtimes and extensions) could not be resolved to an installable set of dependencies, or a - repository was unreachable. + platform package repository was unreachable. + + This usually means that you (or packages you are using) depend + on a combination of PHP versions and/or extensions that are + currently not available on Heroku. - Full error information from installation attempt: + The following is the full output from the installation attempt: $install_log + $( + $composer_lock_outdated && cat <<-EOF2 + $(echo -e "\033[1;33m") + A possible cause for this error is your '$COMPOSER_LOCK' file, + which is currently out of date, as changes have been made to + your '$COMPOSER' that are not yet reflected in the lock file. - Please verify that all requirements for runtime versions in - '$COMPOSER_LOCK' are compatible with the list below, and ensure - all required extensions are available for the desired runtimes. + In order to guarantee reliable installation of system packages, + Heroku uses information from '$COMPOSER_LOCK'. + If you already attempted to fix the error above by updating the + requirements in '$COMPOSER', remember to also update the + lock file by running 'composer update', followed by a 'git add' + and 'git commit' of the changes. The warning message further + above contains step-by-step instructions. + + Please remember to always keep your '$COMPOSER_LOCK' updated in + lockstep with '$COMPOSER' to avoid common problems related + to dependencies during collaboration and deployment. + $(echo -e "\033[1;31m") + EOF2 + ) For reference, the following runtimes are currently available: PHP: $(composer show -d "$build_dir/.heroku/php" --available heroku-sys/php 2>&1 | sed -n 's/^versions : //p' | fold -s -w 58 || true) HHVM: $(composer show -d "$build_dir/.heroku/php" --available heroku-sys/hhvm 2>&1 | sed -n 's/^versions : //p' | fold -s -w 58 || true) + Please verify that all requirements for runtime versions in + '$COMPOSER_LOCK' are compatible with the list above, and ensure + all required extensions are available for the desired runtimes. + For a list of supported runtimes & extensions on Heroku, please refer to: https://devcenter.heroku.com/articles/php-support EOF @@ -250,16 +427,6 @@ mmeasure "platform.count" $(composer show -d "$build_dir/.heroku/php" --installe export COMPOSER="$COMPOSER_bak" unset COMPOSER_bak -composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || { - mcount "warnings.composer_lock.outdated" - warning <<-EOF - Your '$COMPOSER_LOCK' is not up to date with the latest - changes in '$COMPOSER'. To ensure you are not getting stale - dependencies, run 'composer update' on your machine and commit - any changes to Git before pushing again. - EOF -} - # clean up rm -rf /app/.heroku/php-min $build_dir/.heroku/php-min unset -f composer @@ -304,25 +471,28 @@ composer --version 2> /dev/null | tail -n 1 | indent # throw a notice if people have added their vendor dir to Git; that's bad practice and makes everything slow and cluttered if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" ]]; then # we should not do this check separately; there is no reliable way of telling whether or not it really is the real Composer bin dir or if it comes from somewhere else - composer_warn_bindir="" - if [[ ! "$composer_bindir/" == "$composer_vendordir"/* && -d "$composer_bindir" ]]; then - composer_warn_bindir=$(cat <<-EOF - - Your Composer bin dir is configured to reside outside of vendor - dir, so please repeat the two steps above for '$composer_bindir/'. - EOF - ) - fi mcount "warnings.vendor_dir" warning <<-EOF + Composer vendor dir found in project! + Your Composer vendor dir is part of your Git repository. + This directory should not be under version control; only your - '$COMPOSER' and '$COMPOSER_LOCK' files should be added, which - will let Composer handle installation of dependencies on deploy. - To suppress this notice, first remove the folder from your index + '$COMPOSER' and '$COMPOSER_LOCK' files should be added, because + Composer will handle installation of dependencies on deploy. + + To suppress this notice, first remove the folder from the index by running 'git rm -r --cached $composer_vendordir/'. Next, edit your project's '.gitignore' file and add the folder - '/$composer_vendordir/' to the list.$composer_warn_bindir + '/$composer_vendordir/' to the list. + $( + [[ ! "$composer_bindir/" == "$composer_vendordir"/* && -d "$composer_bindir" ]] && cat <<-EOF2 + + Your Composer bin dir is configured to reside outside of vendor + dir, so please repeat the two steps above for '$composer_bindir/'. + + EOF2 + ) For more info, refer to the Composer FAQ: http://bit.ly/1rlCSZU EOF fi @@ -336,7 +506,14 @@ if [[ -n "$COMPOSER_GITHUB_OAUTH_TOKEN" ]]; then notice_inline 'Using $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth.' else mcount "failures.dependencies.auth.COMPOSER_GITHUB_OAUTH_TOKEN" - error 'Invalid $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth!' + error <<-EOF + Invalid token for GitHub OAuth! + + The OAuth token set in the '\$COMPOSER_GITHUB_OAUTH_TOKEN' + config var is invalid. Please ensure that you obtain a valid + token from https://github.com/settings/tokens and set it on the + app using 'heroku config:set COMPOSER_GITHUB_OAUTH_TOKEN=...'. + EOF fi else # don't forget to remove any stored key if it's gone from the env @@ -357,7 +534,25 @@ if cat "$COMPOSER" | python -c 'import sys,json; sys.exit(not json.load(sys.stdi else mcount "failures.dependencies.install.$(detect_dependencies_install_failures < "$install_log")" fi - exit $code + # FIXME: can we provide more advice depending on the error? + error <<-EOF + Dependency installation failed! + + The 'composer install' process failed with an error. The cause + may be the download or installation of packages, or a pre- or + post-install hook (e.g. a 'post-install-cmd' item in 'scripts') + in your '$COMPOSER'. + + Typical error cases are out-of-date or missing parts of code, + timeouts when making external connections, or memory limits. + + Check the above error output closely to determine the cause of + the problem, ensure the code you're pushing is functioning + properly, and that all local changes are committed correctly. + + For more information on builds for PHP on Heroku, refer to + https://devcenter.heroku.com/articles/php-support + EOF } fi @@ -366,8 +561,20 @@ if [[ -z "${HEROKU_PHP_INSTALL_DEV+are-we-running-in-ci}" ]]; then composer show --installed heroku/heroku-buildpack-php &> /dev/null && { mcount "failures.dependencies.buildpack_as_dependency" error <<-EOF - Your '$COMPOSER' requires 'heroku/heroku-buildpack-php'. - This package may only be used as a dependency in 'require-dev'! + Package 'heroku/heroku-buildpack-php' found! + + Your '$COMPOSER' requires 'heroku/heroku-buildpack-php' in + the 'require' section. This package may only be used as a + dependency in 'require-dev', because Heroku installs the latest + version of the buildpack during builds. + + Please perform the following steps locally on your computer to + resolve this issue before attempting another deploy: + 1) move the requirement for 'heroku/heroku-buildpack-php' from + section 'require' to 'require-dev' in '$COMPOSER' + 2) run 'composer update' to re-generate the lock file + 3) stage changes using 'git add $COMPOSER $COMPOSER_LOCK' + 4) commit changes using 'git commit' EOF } fi @@ -378,9 +585,21 @@ mmeasure "dependencies.count" $(composer show --installed 2> /dev/null | wc -l) if cat "$COMPOSER" | python -c 'import sys,json; sys.exit("compile" not in json.load(sys.stdin).get("scripts", {}));'; then status "Running 'composer compile'..." composer run-script ${HEROKU_PHP_INSTALL_DEV-"--no-dev"} --no-interaction compile 2>&1 | indent || { - code=$? mcount "failures.compile_step" - exit $code + error <<-EOF + Compile step failed! + + Installation of dependencies was successful, but the custom + script you're using to perform actions after 'composer install' + failed with the error above. + + Check that the 'compile' command(s) in the 'scripts' section of + your '$COMPOSER' are working properly and not running into + timeouts or memory limits. + + For more information on the 'composer compile' step, refer to + https://devcenter.heroku.com/articles/php-support + EOF } fi diff --git a/bin/util/platform.php b/bin/util/platform.php index a034fec6c..b8b00ff6d 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -155,7 +155,6 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { // there is no requirement for a PHP or HHVM version in "require", nor in any dependencies therein, but there is one in "require-dev" // that's problematic, because requirements in there may effectively result in a rule like "7.0.*", but we'd next write "^5.5.17" into our "require" to have a sane default, and that'd blow up in CI where dev dependenies are installed // we can't compute a resulting version rule (that's the whole point of the custom installer that uses Composer's solver), so throwing an error is the best thing we can do here - file_put_contents("php://stderr", "ERROR: neither your $COMPOSER 'require' section nor any\ndependency therein requires a runtime version, but 'require-dev'\nor a dependency therein does. Heroku cannot automatically select\na default runtime version in this case.\nPlease add a version requirement for 'php' to section 'require'\nin $COMPOSER, 'composer update', commit, and deploy again."); exit(3); } file_put_contents("php://stderr", "NOTICE: No runtime required in $COMPOSER_LOCK; using PHP ". ($require["heroku-sys/php"] = getenv("HEROKU_PHP_DEFAULT_RUNTIME_VERSION") ?? "^7.0.0") . "\n"); From c05b515fd5e29be90a45eccbc7c13ba7e4e699b8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 16 Jul 2018 23:11:02 +0200 Subject: [PATCH 171/553] colors for errors, warnings and notices --- CHANGELOG.md | 1 + bin/util/common.sh | 14 ++++++++++---- bin/util/platform.php | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 295661732..53ff29402 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### CHG - Improved build error messages [David Zuelke] +- Colors for build errors, warnings and notices [David Zuelke] ## v139 (2018-07-20) diff --git a/bin/util/common.sh b/bin/util/common.sh index c6bf664f8..8826dd5ac 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -2,11 +2,11 @@ error() { # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" - echo + echo -e "\033[1;31m" # bold; red echo -n " ! ERROR: " # this will be fed from stdin indent no_first_line_indent - echo + echo -e "\033[0m" # reset style exit 1 } @@ -14,20 +14,22 @@ warning() { # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" - echo + echo -e "\033[1;33m" # bold; yellow echo -n " ! WARNING: " # this will be fed from stdin indent no_first_line_indent - echo + echo -e "\033[0m" # reset style } warning_inline() { # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" + echo -n -e "\033[1;33m" # bold; yellow echo -n " ! WARNING: " # this will be fed from stdin indent no_first_line_indent + echo -n -e "\033[0m" # reset style } status() { @@ -44,7 +46,9 @@ notice() { # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" echo + echo -n -e "\033[1;33m" # bold; yellow echo -n " NOTICE: " + echo -n -e "\033[0m" # reset style # this will be fed from stdin indent no_first_line_indent echo @@ -54,7 +58,9 @@ notice_inline() { # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" + echo -n -e "\033[1;33m" # bold; yellow echo -n " NOTICE: " + echo -n -e "\033[0m" # reset style # this will be fed from stdin indent no_first_line_indent } diff --git a/bin/util/platform.php b/bin/util/platform.php index b8b00ff6d..1f6d1fe68 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -157,9 +157,9 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { // we can't compute a resulting version rule (that's the whole point of the custom installer that uses Composer's solver), so throwing an error is the best thing we can do here exit(3); } - file_put_contents("php://stderr", "NOTICE: No runtime required in $COMPOSER_LOCK; using PHP ". ($require["heroku-sys/php"] = getenv("HEROKU_PHP_DEFAULT_RUNTIME_VERSION") ?? "^7.0.0") . "\n"); + file_put_contents("php://stderr", "\033[1;33mNOTICE:\033[0m No runtime required in $COMPOSER_LOCK; using PHP ". ($require["heroku-sys/php"] = getenv("HEROKU_PHP_DEFAULT_RUNTIME_VERSION") ?? "^7.0.0") . "\n"); } elseif(!isset($root["require"]["php"]) && !isset($root["require"]["hhvm"])) { - file_put_contents("php://stderr", "NOTICE: No runtime required in $COMPOSER; requirements\nfrom dependencies in $COMPOSER_LOCK will be used for selection\n"); + file_put_contents("php://stderr", "\033[1;33mNOTICE:\033[0m No runtime required in $COMPOSER; requirements\nfrom dependencies in $COMPOSER_LOCK will be used for selection\n"); } $require["heroku-sys/apache"] = "^2.4.10"; From d798ed0192f4dce9000bac863ca5081f499d98fa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 17 Jul 2018 01:58:12 +0200 Subject: [PATCH 172/553] allow overriding of indent prefix in helper --- bin/util/common.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/util/common.sh b/bin/util/common.sh index 8826dd5ac..650d6623b 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -5,7 +5,7 @@ error() { echo -e "\033[1;31m" # bold; red echo -n " ! ERROR: " # this will be fed from stdin - indent no_first_line_indent + indent no_first_line_indent " ! " echo -e "\033[0m" # reset style exit 1 } @@ -17,7 +17,7 @@ warning() { echo -e "\033[1;33m" # bold; yellow echo -n " ! WARNING: " # this will be fed from stdin - indent no_first_line_indent + indent no_first_line_indent " ! " echo -e "\033[0m" # reset style } @@ -28,7 +28,7 @@ warning_inline() { echo -n -e "\033[1;33m" # bold; yellow echo -n " ! WARNING: " # this will be fed from stdin - indent no_first_line_indent + indent no_first_line_indent " ! " echo -n -e "\033[0m" # reset style } @@ -69,8 +69,10 @@ notice_inline() { # so you get updates while the command runs and dont wait for the end # e.g. npm install | indent indent() { - # if an arg is given it's a flag indicating we shouldn't indent the first line, so use :+ to tell SED accordingly if that parameter is set, otherwise null string for no range selector prefix (it selects from line 2 onwards and then every 1st line, meaning all lines) - local c="${1:+"2,999"} s/^/ /" + # if any value (e.g. a non-empty string, or true, or false) is given for the first argument, this will act as a flag indicating we shouldn't indent the first line; we use :+ to tell SED accordingly if that parameter is set, otherwise null string for no range selector prefix (it selects from line 2 onwards and then every 1st line, meaning all lines) + # if the first argument is an empty string, it's the same as no argument (useful if a second argument is passed) + # the second argument is the prefix to use for indenting; defaults to seven space characters, but can be set to e.g. " ! " to decorate each line of an error message + local c="${1:+"2,999"} s/^/${2-" "}/" case $(uname) in Darwin) sed -l "$c";; # mac/bsd sed: -l buffers on line boundaries *) sed -u "$c";; # unix/gnu sed: -u unbuffered (arbitrary) chunks of data From a4cfac21d1be0ce83a8d2d94bfb2b8d80bd16946 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 12 Jul 2018 17:43:22 +0200 Subject: [PATCH 173/553] remove use of root composer.phar instead of global install --- CHANGELOG.md | 1 + bin/compile | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53ff29402..ff5b6df9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Improved build error messages [David Zuelke] - Colors for build errors, warnings and notices [David Zuelke] +- Remove use of composer.phar in project root [David Zuelke] ## v139 (2018-07-20) diff --git a/bin/compile b/bin/compile index 60685226c..64ae33ad3 100755 --- a/bin/compile +++ b/bin/compile @@ -444,26 +444,6 @@ mcount "platform.packages.php.$($engine_r "echo ${engine^^}_VERSION;")" status "Installing dependencies..." -# check if we should use a composer.phar version bundled with the project -if [[ -f "composer.phar" ]]; then - [[ -x "composer.phar" ]] || { - mcount "failures.composer_phar.not_executable" - error "File '/composer.phar' isn't executable; please 'chmod +x'!" - } - $engine_r 'new Phar("composer.phar");' &> /dev/null || { - mcount "failures.composer_phar.invalid_phar" - error "File '/composer.phar' is not a valid PHAR archive!" - } - composer() { - $engine composer.phar "$@" - } - export -f composer - composer --version 2>&1 | grep "^Composer version" > /dev/null || { - mcount "failures.composer_phar.not_composer" - error "File '/composer.phar' is not a Composer executable!" - } - notice_inline "Using '/composer.phar' to install dependencies." -fi # echo composer version for info purposes # tail to get rid of outdated version warnings (Composer sends those to STDOUT instead of STDERR) composer --version 2> /dev/null | tail -n 1 | indent From 3601918b1a17a8bd35861b0372c604ec2cea2e51 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Jul 2018 16:49:19 +0200 Subject: [PATCH 174/553] internal error trap --- CHANGELOG.md | 1 + bin/compile | 4 ++++ bin/util/common.sh | 16 ++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff5b6df9a..dbcabda9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Improved build error messages [David Zuelke] - Colors for build errors, warnings and notices [David Zuelke] - Remove use of composer.phar in project root [David Zuelke] +- Trap unhandled build errors with dedicated message [David Zuelke] ## v139 (2018-07-20) diff --git a/bin/compile b/bin/compile index 64ae33ad3..90271aa2b 100755 --- a/bin/compile +++ b/bin/compile @@ -22,6 +22,10 @@ export BUILDPACK_LOG_FILE=${BUILDPACK_LOG_FILE:-/dev/null} # convenience functions source $bp_dir/bin/util/common.sh +# use err_trap from common.sh on error +# we do not 'set -o errtrace', because that would cause subshell failures to fire the trap twice, e.g. with someval=$(func_that_fails) +trap 'err_trap' ERR + # stdlib source /dev/stdin <<< "$(curl_retry_on_18 --silent https://lang-common.s3.amazonaws.com/buildpack-stdlib/v8/stdlib.sh)" diff --git a/bin/util/common.sh b/bin/util/common.sh index 650d6623b..bed59e5f2 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -102,3 +102,19 @@ curl_retry_on_18() { done return $ec } + +err_trap() { + error <<-EOF + An unknown internal error occurred. + + Contact Heroku Support for assistance if this problem persists. + + Stack trace follows for debugging purposes: + $( + local frame=0 + while caller $frame; do + ((frame++)); + done + ) + EOF +} From 6bbe44aeec289a1a1f25eccdebf1282b07faf126 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 23 Jul 2018 18:01:48 +0200 Subject: [PATCH 175/553] summary of warnings on error --- CHANGELOG.md | 1 + bin/util/common.sh | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbcabda9d..c3061ec96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Colors for build errors, warnings and notices [David Zuelke] - Remove use of composer.phar in project root [David Zuelke] - Trap unhandled build errors with dedicated message [David Zuelke] +- Summarize all emitted warnings if subsequent build error occurs [David Zuelke] ## v139 (2018-07-20) diff --git a/bin/util/common.sh b/bin/util/common.sh index bed59e5f2..617ee6335 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -1,3 +1,7 @@ +# a file to write captured warnings to +# it cannot be a variable, because the warnings function may be used in a pipeline, which causes a subshell, which can't modify parent scope variables +_captured_warnings_file=$(mktemp -t heroku-buildpack-php-captured-warnings-XXXX) + error() { # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF @@ -6,6 +10,12 @@ error() { echo -n " ! ERROR: " # this will be fed from stdin indent no_first_line_indent " ! " + if [[ -s "$_captured_warnings_file" ]]; then + echo "" | indent "" " ! " + echo "REMINDER: the following warnings were emitted during the build;" | indent "" " ! " + echo "check the details above, as they may be related to the error:" | indent "" " ! " + cat "$_captured_warnings_file" | indent "" " ! - " + fi echo -e "\033[0m" # reset style exit 1 } @@ -16,8 +26,10 @@ warning() { (( $# )) && exec <<< "$@" echo -e "\033[1;33m" # bold; yellow echo -n " ! WARNING: " - # this will be fed from stdin - indent no_first_line_indent " ! " + # indent will be fed from stdin + # we tee to FD 5, which is linked to STDOUT, and capture the real stdout into the warnings array + # we must cat in the process substitution to read the remaining lines, because head only reads one line, and then the pipe would close, leading tee to fail + indent no_first_line_indent " ! " | tee >(head -n1 >> "$_captured_warnings_file"; cat > /dev/null) echo -e "\033[0m" # reset style } @@ -27,8 +39,10 @@ warning_inline() { (( $# )) && exec <<< "$@" echo -n -e "\033[1;33m" # bold; yellow echo -n " ! WARNING: " - # this will be fed from stdin - indent no_first_line_indent " ! " + # indent will be fed from stdin + # we tee to FD 5, which is linked to STDOUT, and capture the real stdout into the warnings array + # we must cat in the process substitution to read the remaining lines, because head only reads one line, and then the pipe would close, leading tee to fail + indent no_first_line_indent " ! " | tee >(head -n1 >> "$_captured_warnings_file"; cat > /dev/null) echo -n -e "\033[0m" # reset style } From 0288014c9c0e53c5cade145f3a7cae6dce0e4925 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 23 Jul 2018 19:15:09 +0200 Subject: [PATCH 176/553] remove or simplify confusing composer.json/composer.lock mentions from platform install error log --- bin/compile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 90271aa2b..ac1bd982b 100755 --- a/bin/compile +++ b/bin/compile @@ -357,7 +357,16 @@ if composer install -d "$build_dir/.heroku/php" ${HEROKU_PHP_INSTALL_DEV-"--no-d : else code=$? - install_log=$(cat $build_dir/.heroku/php/install.log | sed -e 's/heroku-sys\///g' -e 's/^Loading composer repositories with package information/Loading repositories with available runtimes and extensions/' -e 's/^Installing dependencies.*//' -e '/^Potential causes:/,$d' -e 's/^/> /') + install_log=$( + cat $build_dir/.heroku/php/install.log | sed -E \ + -e 's/heroku-sys\///g' \ + -e 's/^Loading composer repositories with package information/Loading repositories with available runtimes and extensions/' \ + -e 's/^Installing dependencies.*//' \ + -e '/^Potential causes:/,$d' \ + -e "\#satisfiable by ${COMPOSER}/${COMPOSER_LOCK}#d" \ + -e "s#(${COMPOSER}/${COMPOSER_LOCK}) dev-[0-9a-f]+#\1#" \ + -e 's/^/> /' + ) if [[ $code -eq 2 ]]; then # dependency solving failed mcount "failures.platform.solving.$(detect_platform_solving_failures <<< "$install_log")" From 3df92ff65e7633d6df4da7e8cf7873cfff8538b6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 23 Jul 2018 20:30:58 +0200 Subject: [PATCH 177/553] write errors, warnings and notices to stderr otherwise, when e.g. a $() subshell triggers an error function call (say because of the ERR trap), the output would not be visible --- bin/util/common.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bin/util/common.sh b/bin/util/common.sh index 617ee6335..c4d184a5f 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -3,6 +3,8 @@ _captured_warnings_file=$(mktemp -t heroku-buildpack-php-captured-warnings-XXXX) error() { + # send all of our output to stderr + exec 1>&2 # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" @@ -21,6 +23,8 @@ error() { } warning() { + # send all of our output to stderr + exec 1>&2 # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" @@ -34,6 +38,8 @@ warning() { } warning_inline() { + # send all of our output to stderr + exec 1>&2 # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" @@ -47,6 +53,8 @@ warning_inline() { } status() { + # send all of our output to stderr + exec 1>&2 # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" @@ -56,6 +64,8 @@ status() { } notice() { + # send all of our output to stderr + exec 1>&2 # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" @@ -69,6 +79,8 @@ notice() { } notice_inline() { + # send all of our output to stderr + exec 1>&2 # if arguments are given, redirect them to stdin # this allows the funtion to be invoked with a string argument, or with stdin, e.g. via <<-EOF (( $# )) && exec <<< "$@" From e3867d94da43ef3ade4ff219f195616e6438ed44 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 23 Jul 2018 22:24:23 +0200 Subject: [PATCH 178/553] use arithmetics in curl_retry_on_18 while loop ((attempts++)) evaluates to 1 on first call, causing an error with set -o errtrace --- bin/util/common.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/util/common.sh b/bin/util/common.sh index c4d184a5f..8862bb896 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -121,8 +121,7 @@ export_env_dir() { curl_retry_on_18() { local ec=18; local attempts=0; - while [[ $ec -eq 18 && $attempts -lt 3 ]]; do - ((attempts++)) + while (( ec == 18 && attempts++ < 3 )); do curl "$@" # -C - would return code 33 if unsupported by server ec=$? done From 3cee06a3abba93845f7fb1247121b14e0f5d1956 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 23 Jul 2018 22:23:45 +0200 Subject: [PATCH 179/553] download stdlib to file before sourcing the curl_retry_on_18 function re-starts the entire download, as -C - (continue) is not supported by all servers if a download restarts this way, some file contents would be duplicate from the previous attempt, all sourced from stdout, breaking the code sourcing --- CHANGELOG.md | 4 ++++ bin/compile | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3061ec96..a501f638e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ - Trap unhandled build errors with dedicated message [David Zuelke] - Summarize all emitted warnings if subsequent build error occurs [David Zuelke] +### FIX + +- stdlib download during build init may theoretically fail on download restart [David Zuelke] + ## v139 (2018-07-20) ### ADD diff --git a/bin/compile b/bin/compile index ac1bd982b..f479d733c 100755 --- a/bin/compile +++ b/bin/compile @@ -27,7 +27,18 @@ source $bp_dir/bin/util/common.sh trap 'err_trap' ERR # stdlib -source /dev/stdin <<< "$(curl_retry_on_18 --silent https://lang-common.s3.amazonaws.com/buildpack-stdlib/v8/stdlib.sh)" +# download to a file first, as the function restarts the entire download on code 18 connection reset (not all servers support -C) +curl_retry_on_18 --fail --silent --location -o $bp_dir/bin/util/stdlib.sh https://lang-common.s3.amazonaws.com/buildpack-stdlib/v8/stdlib.sh || { + error <<-EOF + Failed to download standard library for bootstrapping! + + This is most likely a temporary internal error. If the problem + persists, make sure that you are not running a custom or forked + version of the Heroku PHP buildpack which may need updating. + EOF +} +source $bp_dir/bin/util/stdlib.sh +rm $bp_dir/bin/util/stdlib.sh # failure counting source $bp_dir/bin/util/failures.sh From e24f04077472ad5583afa7c59c66430bcf8644a3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 31 Jul 2018 16:18:03 +0200 Subject: [PATCH 180/553] verbose error message on bin/detect failure --- CHANGELOG.md | 6 ++++++ bin/detect | 24 +++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a501f638e..7e62a2cd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v141 (2018-08-??) + +### CHG + +- Verbose error messasge on `bin/detect` failure [David Zuelke] + ## v140 (2018-07-25) ### CHG diff --git a/bin/detect b/bin/detect index 8eabae00b..d3ad02003 100755 --- a/bin/detect +++ b/bin/detect @@ -1,7 +1,29 @@ #!/usr/bin/env bash +# convenience functions +source "$(cd $(dirname $0); cd ..; pwd)"/bin/util/common.sh + if [[ -f "$1/composer.json" || -f "$1/index.php" ]]; then echo "PHP" && exit 0 else - exit 1 + error <<-EOF + Application not supported by this buildpack! + + The 'heroku/php' buildpack is set on this application, but was + unable to detect a PHP codebase. + + A PHP app on Heroku requires a 'composer.json' at the root of + the directory structure, or an 'index.php' for legacy behavior. + + If you are trying to deploy a PHP application, ensure that one + of these files is present at the top level directory. + + If you are trying to deploy an application written in another + language, you need to change the list of buildpacks set on your + Heroku app using the 'heroku buildpacks' command. + + For more information, refer to the following documentation: + https://devcenter.heroku.com/articles/buildpacks + https://devcenter.heroku.com/articles/php-support#activation + EOF fi From 9d26eb57a1afd9748953041c16fb672d5c377339 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 31 Jul 2018 16:19:29 +0200 Subject: [PATCH 181/553] allow passing warnings for cases to regex_failures --- bin/util/failures.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/util/failures.sh b/bin/util/failures.sh index ca585ea0e..fd415dfe3 100755 --- a/bin/util/failures.sh +++ b/bin/util/failures.sh @@ -114,6 +114,12 @@ regex_failures() { local regexes=("${!name}") local name=$2[@] local failures=("${!name}") + if (( $# > 2 )); then + local name=$3[@] + local warnings=("${!name}") + else + local warnings=() + fi # buffer input, as we have to read it many times local input=$( Date: Tue, 31 Jul 2018 16:20:32 +0200 Subject: [PATCH 182/553] warnings for regexed build failure cases --- CHANGELOG.md | 1 + bin/util/failures.sh | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e62a2cd6..9730477f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### CHG - Verbose error messasge on `bin/detect` failure [David Zuelke] +- Emit brief warnings for common regexed build failure cases [David Zuelke] ## v140 (2018-07-25) diff --git a/bin/util/failures.sh b/bin/util/failures.sh index fd415dfe3..2648d503b 100755 --- a/bin/util/failures.sh +++ b/bin/util/failures.sh @@ -2,27 +2,35 @@ detect_platform_solving_failures() { # we can't use an associative array, as those are pure hashes in Bash 4+, so they don't preserve an order, but we need that local failures=() local regexes=() + local warnings=() regexes+=("requires php \S+ -> no matching package found") failures+=("requirements.php") + warnings+=("Requested version for package 'php' not available") regexes+=("requires php-64bit \S+ -> no matching package found") failures+=("requirements.php-64bit") + warnings+=("Requested version for package 'php-64bit' not available") regexes+=("requires hhvm \S+ -> no matching package found") failures+=("requirements.hhvm") + warnings+=("Requested version for package 'hhvm' is not available") regexes+=("requires ext-\S+ \S+ -> no matching package found") failures+=("requirements.extension") + warnings+=("A requested extension is not available") regexes+=("requires ext-mcrypt \S+ -> satisfiable by php") failures+=("requirements.extension.mcrypt") + warnings+=("ext-mcrypt not available for selected PHP version") regexes+=("requires ext-mongo \S+ -> satisfiable by ext-mongo") failures+=("requirements.extension.mongo") + warnings+=("ext-mongo not available for selected PHP version") regexes+=("requires ext-mysql \S+ -> satisfiable by php") failures+=("requirements.extension.mysql") + warnings+=("ext-mysql not available for selected PHP version") # FIXME: detect multiple conflicing requirements (e.g. from require and require-dev)? # regex_failures expects variable names, not values, as it dereferences the arrays - regex_failures regexes failures || echo "unknown" + regex_failures regexes failures warnings || echo "unknown" } detect_platform_install_failures() { @@ -60,52 +68,73 @@ detect_dependencies_install_failures() { # we can't use an associative array, as those are pure hashes in Bash 4+, so they don't preserve an order, but we need that local failures=() local regexes=() + local warnings=() regexes+=("Your configuration does not allow connections to") failures+=("download.insecure") + warnings+=("A package dependency failed to download over plain HTTP") regexes+=("Failed to download \S+ from dist: Could not authenticate against") failures+=("download.authentication.failed") + warnings+=("Authentication against an external repository failed") regexes+=("No bitbucket authentication configured") failures+=("download.authentication.bitbucket.missing") + warnings+=("Bitbucket authentication details not configured") regexes+=('Failed to clone \S+ via \S+(, \S+)* protocols, aborting.') failures+=("download.clone") + warnings+=("") # FIXME: may be followed first by "remote: Invalid username or password" and then "Host key verification failed." regexes+=("Failed to execute git clone") failures+=("download.clone") + warnings+=("") # FIXME: "Host key verification failed." may show up a few lines later # FIXME: or "fatal: unable to access 'https://foo:***@bitbucket.org/foo/bar.git/': The requested URL returned error: 403" regexes+=('Failed to download \S+ from dist: The "[^"]+" file could not be downloaded \(HTTP/\S+ 404') failures+=("download.not_found") + warnings+=("") regexes+=("Parse error: syntax error") failures+=("scripts.any.parse_error") + warnings+=("There was a PHP syntax error in your code") regexes+=("(ClassNotFoundException|Class '[^']+' not found)") failures+=("scripts.any.class_not_found") + warnings+=("There was a class not found error in your code") regexes+=('Symfony\\Component\\Process\\Exception\\ProcessTimedOutException') failures+=("scripts.any.timeout") + warnings+=("A script or process has exceeded the Composer timeout") regexes+=('(SQLSTATE|PDOException|Doctrine\\DBAL\\Exception)') failures+=("scripts.any.database") + warnings+=("An error occurred during a database connection or query") regexes+=("handling the post-install-cmd event terminated with an exception") failures+=("scripts.post-install-cmd.exception") + warnings+=("A post-install-cmd script terminated with an exception") regexes+=("handling the post-install-cmd event returned with error code") failures+=("scripts.post-install-cmd.error") + warnings+=("A post-install-cmd script terminated with an error") regexes+=("handling the post-autoload-dump event terminated with an exception") failures+=("scripts.post-autoload-dump.exception") + warnings+=("A post-autoload-dump script terminated with an exception") regexes+=("handling the post-autoload-dump event returned with error code") failures+=("scripts.post-autoload-dump.error") + warnings+=("A post-autoload-dump script terminated with an error") regexes+=("handling the \S+ event terminated with an exception") failures+=("scripts.unknown.exception") + warnings+=("A Composer script terminated with an exception") regexes+=("handling the \S+ event returned with error code") failures+=("scripts.unknown.error") + warnings+=("A Composer script terminated with an error") - regexes+=("(APP_ENV environment variable is not defined|Environment variable not found)") + regexes+=("APP_ENV environment variable is not defined") + failures+=("symfony.env_var_missing") + warnings+=($'The APP_ENV environment variable is missing\nRun \'heroku config:set APP_ENV=prod\' to set it.') + regexes+=("Environment variable not found") failures+=("symfony.env_var_missing") + warnings+=($'A required environment variable is missing\nUse the \'heroku config:set\' command to set it; more details:\nhttps://devcenter.heroku.com/articles/config-vars') # regex_failures expects variable names, not values, as it dereferences the arrays - regex_failures regexes failures || echo "unknown" + regex_failures regexes failures warnings || echo "unknown" } regex_failures() { From 1392d482e939f68164608e1146c5f15581caf4a8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 31 Jul 2018 16:27:09 +0200 Subject: [PATCH 183/553] warnings summary on error with a little yellow --- bin/util/common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/util/common.sh b/bin/util/common.sh index 8862bb896..c4e1d905c 100755 --- a/bin/util/common.sh +++ b/bin/util/common.sh @@ -14,9 +14,9 @@ error() { indent no_first_line_indent " ! " if [[ -s "$_captured_warnings_file" ]]; then echo "" | indent "" " ! " - echo "REMINDER: the following warnings were emitted during the build;" | indent "" " ! " - echo "check the details above, as they may be related to the error:" | indent "" " ! " - cat "$_captured_warnings_file" | indent "" " ! - " + echo -e "\033[1;33mREMINDER:\033[1;31m the following \033[1;33mwarnings\033[1;31m were emitted during the build;" | indent "" " ! " + echo "check the details above, as they may be related to this error:" | indent "" " ! " + cat "$_captured_warnings_file" | indent "" "$(echo -e " ! \033[1;33m-\033[1;31m ")" fi echo -e "\033[0m" # reset style exit 1 From abf86187d9b112f6d1529fab87ba087a8f63ea4d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 1 Aug 2018 20:27:41 +0200 Subject: [PATCH 184/553] Run most internal 'composer' invocations using '--no-plugins' Otherwise, a vendor dir present for a project built against e.g. PHP 7.2 would cause the php-min, currently at 7.0, to fail with certain plugins: https://github.com/Ocramius/PackageVersions/issues/64 --- CHANGELOG.md | 1 + bin/compile | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9730477f8..474319564 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Verbose error messasge on `bin/detect` failure [David Zuelke] - Emit brief warnings for common regexed build failure cases [David Zuelke] +- Run most internal 'composer' invocations using '--no-plugins' [David Zuelke] ## v140 (2018-07-25) diff --git a/bin/compile b/bin/compile index f479d733c..9aed15023 100755 --- a/bin/compile +++ b/bin/compile @@ -268,8 +268,9 @@ composer() { } export -f composer -composer_vendordir=$(composer config vendor-dir) -composer_bindir=$(composer config bin-dir) +# we use --no-plugins just in case the vendor dir is there, see e.g. https://github.com/Ocramius/PackageVersions/issues/64 +composer_vendordir=$(composer config --no-plugins vendor-dir) +composer_bindir=$(composer config --no-plugins bin-dir) # packages that get installed will add to this file, it's both for us and for buildpacks that follow # composer bin-dir goes last to avoid any conflicts @@ -281,7 +282,7 @@ echo "export PATH=\$HOME/.heroku/php/bin:\$PATH:\$HOME/$composer_bindir" > $buil # we perform this check early so people with stale lock files are reminded why if their lock file errors in the next step composer_lock_outdated=false -composer validate --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || { +composer validate --no-plugins --no-check-publish --no-check-all --quiet "$COMPOSER" 2>/dev/null || { mcount "warnings.composer_lock.outdated" composer_lock_outdated=true warning <<-EOF @@ -470,7 +471,7 @@ status "Installing dependencies..." # echo composer version for info purposes # tail to get rid of outdated version warnings (Composer sends those to STDOUT instead of STDERR) -composer --version 2> /dev/null | tail -n 1 | indent +composer --no-plugins --version 2> /dev/null | tail -n 1 | indent # throw a notice if people have added their vendor dir to Git; that's bad practice and makes everything slow and cluttered if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" ]]; then @@ -506,7 +507,7 @@ export_env_dir "$env_dir" '^COMPOSER_GITHUB_OAUTH_TOKEN$' COMPOSER_GITHUB_OAUTH_TOKEN=${COMPOSER_GITHUB_OAUTH_TOKEN:-} if [[ -n "$COMPOSER_GITHUB_OAUTH_TOKEN" ]]; then if curl --fail --silent -H "Authorization: token $COMPOSER_GITHUB_OAUTH_TOKEN" https://api.github.com/rate_limit > /dev/null; then - composer config -g github-oauth.github.com "$COMPOSER_GITHUB_OAUTH_TOKEN" &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) + composer config --no-plugins -g github-oauth.github.com "$COMPOSER_GITHUB_OAUTH_TOKEN" &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) notice_inline 'Using $COMPOSER_GITHUB_OAUTH_TOKEN for GitHub OAuth.' else mcount "failures.dependencies.auth.COMPOSER_GITHUB_OAUTH_TOKEN" @@ -521,7 +522,7 @@ if [[ -n "$COMPOSER_GITHUB_OAUTH_TOKEN" ]]; then fi else # don't forget to remove any stored key if it's gone from the env - composer config -g --unset github-oauth.github.com &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) + composer config --no-plugins -g --unset github-oauth.github.com &> /dev/null # redirect outdated version warnings (Composer sends those to STDOUT instead of STDERR) fi # no need for the token to stay around in the env unset COMPOSER_GITHUB_OAUTH_TOKEN From eb1b68c5d0836c7bbfc285154a5bcd78cdb1f527 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 3 Aug 2018 14:26:19 +0200 Subject: [PATCH 185/553] generate empty objects, not arrays, for certain keys required by Composer 1.7+ https://github.com/composer/composer/issues/7513 --- CHANGELOG.md | 4 ++++ bin/util/platform.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 474319564..c91b6d134 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Emit brief warnings for common regexed build failure cases [David Zuelke] - Run most internal 'composer' invocations using '--no-plugins' [David Zuelke] +### FIX + +- Generate Composer package repositories with empty JSON objects, not arrays, where required by Composer 1.7+ [David Zuelke] + ## v140 (2018-07-25) ### CHG diff --git a/bin/util/platform.php b/bin/util/platform.php index 1f6d1fe68..c87abb542 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -51,10 +51,10 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { // we re-use the dep name and version, makes for nice error messages if dependencies cannot be fulfilled :) "name" => $package["name"], "version" => $package["version"], - "require" => mkdep($preq), - "replace" => mkdep($prep), - "provide" => mkdep($ppro), - "conflict" => mkdep($pcon), + "require" => (object) mkdep($preq), + "replace" => (object) mkdep($prep), + "provide" => (object) mkdep($ppro), + "conflict" => (object) mkdep($pcon), ]; return true; } From 814af8edc67dbbdd886ef6f57a16e6a07c14f05b Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 3 Aug 2018 16:37:49 +0200 Subject: [PATCH 186/553] fix line length in warning --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 9aed15023..372dfb34b 100755 --- a/bin/compile +++ b/bin/compile @@ -483,7 +483,7 @@ if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" Your Composer vendor dir is part of your Git repository. This directory should not be under version control; only your - '$COMPOSER' and '$COMPOSER_LOCK' files should be added, because + '$COMPOSER' and '$COMPOSER_LOCK' files should be added, as Composer will handle installation of dependencies on deploy. To suppress this notice, first remove the folder from the index From 6a34ee41ec72716bcfa5b84d24ee4471d73df6f3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 3 Aug 2018 16:56:45 +0200 Subject: [PATCH 187/553] slightly better vendor warning wording --- bin/compile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index 372dfb34b..a5dcabef8 100755 --- a/bin/compile +++ b/bin/compile @@ -480,16 +480,16 @@ if [[ -f "$composer_vendordir/autoload.php" && -d "$composer_vendordir/composer" warning <<-EOF Composer vendor dir found in project! - Your Composer vendor dir is part of your Git repository. + Your Git repository contains Composer's '$composer_vendordir' directory. This directory should not be under version control; only your - '$COMPOSER' and '$COMPOSER_LOCK' files should be added, as + '$COMPOSER' and '$COMPOSER_LOCK' files need to be added, as Composer will handle installation of dependencies on deploy. To suppress this notice, first remove the folder from the index by running 'git rm -r --cached $composer_vendordir/'. Next, edit your project's '.gitignore' file and add the folder - '/$composer_vendordir/' to the list. + '/$composer_vendordir/' to the list, then commit the changes. $( [[ ! "$composer_bindir/" == "$composer_vendordir"/* && -d "$composer_bindir" ]] && cat <<-EOF2 From 8524c841b7d6422599d7d76a75cc0dfa45f29e01 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 3 Aug 2018 17:23:53 +0200 Subject: [PATCH 188/553] ext-redis/4.1.1 --- CHANGELOG.md | 4 ++++ .../no-debug-non-zts-20121212/{redis-4.1.0 => redis-4.1.1} | 0 .../no-debug-non-zts-20131226/{redis-4.1.0 => redis-4.1.1} | 0 .../no-debug-non-zts-20151012/{redis-4.1.0 => redis-4.1.1} | 0 .../no-debug-non-zts-20160303/{redis-4.1.0 => redis-4.1.1} | 0 .../no-debug-non-zts-20170718/{redis-4.1.0 => redis-4.1.1} | 0 6 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-4.1.0 => redis-4.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-4.1.0 => redis-4.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-4.1.0 => redis-4.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-4.1.0 => redis-4.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{redis-4.1.0 => redis-4.1.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c91b6d134..bf85e91ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v141 (2018-08-??) +### ADD + +- ext-redis/4.1.1 [David Zuelke] + ### CHG - Verbose error messasge on `bin/detect` failure [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.1.0 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-4.1.0 rename to support/build/extensions/no-debug-non-zts-20121212/redis-4.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.0 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-4.1.0 rename to support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.0 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-4.1.0 rename to support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-4.1.0 rename to support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/redis-4.1.0 rename to support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 From f7daa4be618dd6b1448b1f6cdcbbd32d1c6cfe09 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 3 Aug 2018 17:24:43 +0200 Subject: [PATCH 189/553] ext-mongodb/1.5.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{mongodb-1.5.1 => mongodb-1.5.2} | 0 .../no-debug-non-zts-20131226/{mongodb-1.5.1 => mongodb-1.5.2} | 0 .../no-debug-non-zts-20151012/{mongodb-1.5.1 => mongodb-1.5.2} | 0 .../no-debug-non-zts-20160303/{mongodb-1.5.1 => mongodb-1.5.2} | 0 .../no-debug-non-zts-20170718/{mongodb-1.5.1 => mongodb-1.5.2} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.5.1 => mongodb-1.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.5.1 => mongodb-1.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.5.1 => mongodb-1.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.5.1 => mongodb-1.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.5.1 => mongodb-1.5.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf85e91ff..720b40b61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-redis/4.1.1 [David Zuelke] +- ext-mongodb/1.5.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.1 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.1 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.1 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.1 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.1 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 From 9c45b21eadf9ed9f3d3065e81e1b87927fa1d0b5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 3 Aug 2018 16:30:10 +0200 Subject: [PATCH 190/553] Composer/1.7.1 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{composer-1.6.5 => composer-1.7.1} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{composer-1.6.5 => composer-1.7.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 720b40b61..474e402e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Verbose error messasge on `bin/detect` failure [David Zuelke] - Emit brief warnings for common regexed build failure cases [David Zuelke] - Run most internal 'composer' invocations using '--no-plugins' [David Zuelke] +- Composer/1.7.1 [David Zuelke] ### FIX diff --git a/bin/compile b/bin/compile index a5dcabef8..85c84d36a 100755 --- a/bin/compile +++ b/bin/compile @@ -249,7 +249,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.6.5.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.7.1.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.6.5 b/support/build/composer-1.7.1 similarity index 100% rename from support/build/composer-1.6.5 rename to support/build/composer-1.7.1 From d0384d8508ffe2d7292f4cda100b155032671565 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 7 Aug 2018 17:07:05 +0200 Subject: [PATCH 191/553] move minimum-stability check to later point --- bin/compile | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/bin/compile b/bin/compile index 85c84d36a..f6ec7358c 100755 --- a/bin/compile +++ b/bin/compile @@ -148,24 +148,6 @@ if [[ -s "$COMPOSER" ]]; then mcount "failures.composer_lock.lint" error "$composer_lock_parse_error" } - cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || { - mcount "warnings.composer_lock.minimum_stability" - warning <<-EOF - Non-stable 'minimum-stability'! - - Your '$COMPOSER' contains a non-'stable' value for the - for the 'minimum-stability' setting. - - This setting affects behavior globally and may result in the - installation of unstable versions of PHP and extensions in - addition to your dependencies. - - It is strongly recommended that you always use stability flags - on the specific packages which you want in a non-stable version - instead, even if you have 'prefer-stable' enabled. More info: - https://getcomposer.org/doc/04-schema.md#package-links - EOF - } fi else if [[ ! -f "$COMPOSER" ]]; then @@ -315,6 +297,25 @@ composer validate --no-plugins --no-check-publish --no-check-all --quiet "$COMPO EOF } +[[ -f "$COMPOSER_LOCK" ]] && cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || { + mcount "warnings.composer_lock.minimum_stability" + warning <<-EOF + Non-stable 'minimum-stability'! + + Your '$COMPOSER' contains a non-'stable' value for the + for the 'minimum-stability' setting. + + This setting affects behavior globally and may result in the + installation of unstable versions of PHP and extensions in + addition to your dependencies. + + It is strongly recommended that you always use stability flags + on the specific packages which you want in a non-stable version + instead, even if you have 'prefer-stable' enabled. More info: + https://getcomposer.org/doc/04-schema.md#package-links + EOF +} + status "Installing platform packages..." if [[ $STACK == "cedar-14" || $STACK == "heroku-16" ]]; then From 1cee85681f4cc4ae07da98ec524c5f8d7d71c414 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 7 Aug 2018 17:31:53 +0200 Subject: [PATCH 192/553] Warn about 'minimum-stability' only if 'prefer-stable' is off --- CHANGELOG.md | 1 + bin/compile | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 474e402e3..b27aa29a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Emit brief warnings for common regexed build failure cases [David Zuelke] - Run most internal 'composer' invocations using '--no-plugins' [David Zuelke] - Composer/1.7.1 [David Zuelke] +- Warn about 'minimum-stability' only if 'prefer-stable' is off [David Zuelke] ### FIX diff --git a/bin/compile b/bin/compile index f6ec7358c..9a4a8202f 100755 --- a/bin/compile +++ b/bin/compile @@ -297,22 +297,44 @@ composer validate --no-plugins --no-check-publish --no-check-all --quiet "$COMPO EOF } -[[ -f "$COMPOSER_LOCK" ]] && cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); sys.exit(not(l["minimum-stability"] == "stable"));' 2> /dev/null || { +# if prefer-stable is false and minimum-stability is not stable, warn about potential unstable platform installs +[[ -f "$COMPOSER_LOCK" ]] && minimum_stability=$(cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); print(l.get("minimum-stability")); sys.exit(l.get("minimum-stability", "stable") != "stable" and l.get("prefer-stable", False) == False);' 2> /dev/null) || { + possible_stabilities="dev, alpha, beta, or RC" + case $minimum_stability in + alpha) + possible_stabilities="alpha, beta, or RC" + ;; + beta) + possible_stabilities="beta or RC" + ;; + [rR][cC]) + possible_stabilities="release candidate" + ;; + esac mcount "warnings.composer_lock.minimum_stability" warning <<-EOF Non-stable 'minimum-stability'! - Your '$COMPOSER' contains a non-'stable' value for the - for the 'minimum-stability' setting. - - This setting affects behavior globally and may result in the - installation of unstable versions of PHP and extensions in - addition to your dependencies. - - It is strongly recommended that you always use stability flags - on the specific packages which you want in a non-stable version - instead, even if you have 'prefer-stable' enabled. More info: + Your '$COMPOSER' contains a 'minimum-stability' setting of + '$minimum_stability', and the 'prefer-stable' setting is not enabled. + + This combination of options may negatively impact the stability + of your app and result in crashes as it permits installation of + $possible_stabilities versions of PHP runtimes and extensions. + + If possible, you should always use explicit stability flags on + only those dependencies that you want unstable versions of, and + leave 'minimum-stability' at its default 'stable' setting. + + If you really need a global 'minimum-stability' setting lower + than 'stable', it is strongly recommended that you enable the + 'prefer-stable' setting in '$COMPOSER'. + + For more information, refer to the following documentation: + https://getcomposer.org/doc/articles/versions.md https://getcomposer.org/doc/04-schema.md#package-links + https://getcomposer.org/doc/04-schema.md#minimum-stability + https://getcomposer.org/doc/04-schema.md#prefer-stable EOF } From 8bbe252cae93ab125efc8c1c339bc56f7ae85bb5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 7 Aug 2018 21:15:44 +0200 Subject: [PATCH 193/553] v141 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b27aa29a7..0ba8015bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v141 (2018-08-??) +## v141 (2018-08-07) ### ADD From d71577f4148aab8852ecd8aea11b918a640cf23a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 8 Aug 2018 02:50:23 +0200 Subject: [PATCH 194/553] fix minimum-stability check failing with no lock file --- CHANGELOG.md | 6 ++++++ bin/compile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ba8015bf..acbf9d18f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v142 (2018-08-08) + +### FIX + +- Check for 'minimum-stability' may fail if no 'composer.lock' present [David Zuelke] + ## v141 (2018-08-07) ### ADD diff --git a/bin/compile b/bin/compile index 9a4a8202f..31cd24c2a 100755 --- a/bin/compile +++ b/bin/compile @@ -298,7 +298,7 @@ composer validate --no-plugins --no-check-publish --no-check-all --quiet "$COMPO } # if prefer-stable is false and minimum-stability is not stable, warn about potential unstable platform installs -[[ -f "$COMPOSER_LOCK" ]] && minimum_stability=$(cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); print(l.get("minimum-stability")); sys.exit(l.get("minimum-stability", "stable") != "stable" and l.get("prefer-stable", False) == False);' 2> /dev/null) || { +[[ ! -f "$COMPOSER_LOCK" ]] || minimum_stability=$(cat "$COMPOSER_LOCK" | python -c 'import sys, json; l = json.load(sys.stdin); print(l.get("minimum-stability")); sys.exit(l.get("minimum-stability", "stable") != "stable" and l.get("prefer-stable", False) == False);' 2> /dev/null) || { possible_stabilities="dev, alpha, beta, or RC" case $minimum_stability in alpha) From 5cb0810d55df7723c0d6a1d1da1033ad9cacf192 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 16 Aug 2018 16:00:38 +0200 Subject: [PATCH 195/553] PHP/7.2.9 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 | 2 +- .../extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/event-2.3.0 | 2 +- .../extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../extensions/no-debug-non-zts-20170718/mongodb-1.5.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../extensions/no-debug-non-zts-20170718/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- .../build/extensions/no-debug-non-zts-20170718/redis-4.1.1 | 2 +- support/build/{php-7.2.8 => php-7.2.9} | 0 17 files changed, 21 insertions(+), 15 deletions(-) rename support/build/{php-7.2.8 => php-7.2.9} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index acbf9d18f..c8674b511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v143 (2018-08-17) + +### ADD + +- PHP/7.2.9 [David Zuelke] + ## v142 (2018-08-08) ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index c8fab8899..4be4b25a0 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 index f27df9ca6..b42fc67b5 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 6bb29baed..77d2dab6a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.9, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 3f8710ee3..44c6ca085 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 index 863cd9262..7c5c92586 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index b5ffcaab5..cca6a43b8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index bb6d88043..9704d550f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.9, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 index bf4407ab1..2284de6dc 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 910e1ecf2..da53d4361 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 index 61bc258e9..072fbade4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index bd1456d7d..303a75354 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.9, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index cf3f5d708..b25d088f6 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 028dda88a..47d751229 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8, libraries/librdkafka-0.11.5 +# Build Deps: php-7.2.9, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 5d757dd9b..578539d7f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 index 5d757dd9b..578539d7f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.8 +# Build Deps: php-7.2.9 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.8 b/support/build/php-7.2.9 similarity index 100% rename from support/build/php-7.2.8 rename to support/build/php-7.2.9 From d551a266fbb964e9751307c52187aa5ef3333ffb Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 16 Aug 2018 16:01:18 +0200 Subject: [PATCH 196/553] PHP/7.1.21 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 | 2 +- support/build/{php-7.1.20 => php-7.1.21} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.20 => php-7.1.21} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8674b511..59b831a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.2.9 [David Zuelke] +- PHP/7.1.21 [David Zuelke] ## v142 (2018-08-08) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 05f90b1d1..e4b7d2b95 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 index 90ef89156..fe1a74328 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 823633995..602548b05 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.20, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.21, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 2d53df386..a72f6d5de 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 index f9f4ca2ca..a22cc296e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 +++ b/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.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 2280c6ef7..1249d73ce 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index f5f24b6cc..9a745d97a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.21, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 index 632216359..1a20c8592 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 412da824b..f4a5fcf5d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 index 6483a5640..d6f1a3aa6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index dbf19e5c4..1583e695e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.21, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index eb00da368..58a16f145 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index f909e7508..bd19ad119 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20, libraries/librdkafka-0.11.5 +# Build Deps: php-7.1.21, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 5b473c0f8..ca8e27305 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 index 5b473c0f8..ca8e27305 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.20 +# Build Deps: php-7.1.21 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.20 b/support/build/php-7.1.21 similarity index 100% rename from support/build/php-7.1.20 rename to support/build/php-7.1.21 From 72ba15de87611967f79ae8f5ec15e74aacc82e97 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 16 Aug 2018 16:02:07 +0200 Subject: [PATCH 197/553] ext-event/2.4.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.3.0 => event-2.4.1} | 0 .../no-debug-non-zts-20131226/{event-2.3.0 => event-2.4.1} | 0 .../no-debug-non-zts-20151012/{event-2.3.0 => event-2.4.1} | 0 .../no-debug-non-zts-20160303/{event-2.3.0 => event-2.4.1} | 0 .../no-debug-non-zts-20170718/{event-2.3.0 => event-2.4.1} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.3.0 => event-2.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.3.0 => event-2.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.3.0 => event-2.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.3.0 => event-2.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.3.0 => event-2.4.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b831a0a..7632e8bde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.2.9 [David Zuelke] - PHP/7.1.21 [David Zuelke] +- ext-event/2.4.1 [David Zuelke] ## v142 (2018-08-08) diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.3.0 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.3.0 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.3.0 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.3.0 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.3.0 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 From e85e1ce5689d058241101c21904334f2edd6391d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 17 Aug 2018 16:42:50 +0200 Subject: [PATCH 198/553] Composer/1.7.2 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.7.1 => composer-1.7.2} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.7.1 => composer-1.7.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7632e8bde..9de8b42a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - PHP/7.1.21 [David Zuelke] - ext-event/2.4.1 [David Zuelke] +### CHG + +- Composer/1.7.2 [David Zuelke] + ## v142 (2018-08-08) ### FIX diff --git a/bin/compile b/bin/compile index 31cd24c2a..5ca502315 100755 --- a/bin/compile +++ b/bin/compile @@ -231,7 +231,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.7.1.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.7.2.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.7.1 b/support/build/composer-1.7.2 similarity index 100% rename from support/build/composer-1.7.1 rename to support/build/composer-1.7.2 From 2b61d3d601263e5fdae171a0669d0a67886b11a6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 14:41:56 +0200 Subject: [PATCH 199/553] PHP/5.6.38 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/event-2.4.1 | 2 +- .../extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../extensions/no-debug-non-zts-20131226/mongodb-1.5.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../extensions/no-debug-non-zts-20131226/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- .../build/extensions/no-debug-non-zts-20131226/redis-4.1.1 | 2 +- support/build/{php-5.6.37 => php-5.6.38} | 0 19 files changed, 23 insertions(+), 17 deletions(-) rename support/build/{php-5.6.37 => php-5.6.38} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9de8b42a0..57590e024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v144 (2019-09-13) + +### ADD + +- PHP/5.6.38 [David Zuelke] + ## v143 (2018-08-17) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index f10689a86..edef184fd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 1a9253021..b07f2535f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 200cad1df..8271945e9 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37, libraries/libcassandra-2.9.0 +# Build Deps: php-5.6.38, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 31713411e..560903c78 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 index e259f7058..369bb3d78 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 2fd988cb1..8a463cec4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 2d5758e7f..c6d51ff46 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.38, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index 886493844..30671752e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 index 0f0513d1e..5eb90b908 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index eec5ba1ef..799f119bc 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 8b7fe11d0..96aeb9b45 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 index 8b7fe11d0..96aeb9b45 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 543cc47d8..1d43c337d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.38, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 4f214f008..4e726ecf4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 9307fbb1d..f5b48421c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37, libraries/librdkafka-0.11.5 +# Build Deps: php-5.6.38, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index eeff9a5f4..5b7f6cb41 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 index eeff9a5f4..5b7f6cb41 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.37 +# Build Deps: php-5.6.38 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.37 b/support/build/php-5.6.38 similarity index 100% rename from support/build/php-5.6.37 rename to support/build/php-5.6.38 From af2fd91e806421c5891d7c5a2536b08d161e2090 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 14:43:28 +0200 Subject: [PATCH 200/553] PHP/7.0.32 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.7.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 | 2 +- support/build/{php-7.0.31 => php-7.0.32} | 0 support/build/{php-min-7.0.31 => php-min-7.0.32} | 0 20 files changed, 18 insertions(+), 17 deletions(-) rename support/build/{php-7.0.31 => php-7.0.32} (100%) rename support/build/{php-min-7.0.31 => php-min-7.0.32} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57590e024..220227611 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/5.6.38 [David Zuelke] +- PHP/7.0.32 [David Zuelke] ## v143 (2018-08-17) diff --git a/bin/compile b/bin/compile index 5ca502315..0dad9c338 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.31.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.32.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/composer-1.7.2 b/support/build/composer-1.7.2 index f1267d7c1..dc4336d87 100755 --- a/support/build/composer-1.7.2 +++ b/support/build/composer-1.7.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.31 +# Build Deps: php-min-7.0.32 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index 398ba3c63..b675f4051 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 index 06ec59ef2..a8f929146 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 049c45eca..85b8eee37 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.31, libraries/libcassandra-2.9.0 +# Build Deps: php-7.0.32, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 0d4a3cf45..4595abacc 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 index 9ad2b576d..9293a17a5 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index dd8f79495..194291429 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 144b6f0b4..4342bea58 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.32, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 index ca763fb76..a3f3f9734 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 index 423e1eeab..0a5121dcf 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 +++ b/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.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 index 59800df34..a679b98e5 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 index 8a2b75e20..004aa2e8c 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.32, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 7955cf702..2659f6a18 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 6b08399a4..a1d5daac8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31, libraries/librdkafka-0.11.5 +# Build Deps: php-7.0.32, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index e3b69103c..2ab82502a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 index e3b69103c..2ab82502a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.31 +# Build Deps: php-7.0.32 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.31 b/support/build/php-7.0.32 similarity index 100% rename from support/build/php-7.0.31 rename to support/build/php-7.0.32 diff --git a/support/build/php-min-7.0.31 b/support/build/php-min-7.0.32 similarity index 100% rename from support/build/php-min-7.0.31 rename to support/build/php-min-7.0.32 From 30a06c2099d2fd8030e8a628bdac1c7539a14597 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 14:46:01 +0200 Subject: [PATCH 201/553] PHP/7.1.22 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 | 2 +- support/build/{php-7.1.21 => php-7.1.22} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.21 => php-7.1.22} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 220227611..935fbb18b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/5.6.38 [David Zuelke] - PHP/7.0.32 [David Zuelke] +- PHP/7.1.22 [David Zuelke] ## v143 (2018-08-17) diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index e4b7d2b95..8edfb38df 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 index fe1a74328..b98fa4e1c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 602548b05..b8625ad37 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.21, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.22, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index a72f6d5de..e7a621f90 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 index a22cc296e..17b78c9db 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 1249d73ce..637407820 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 9a745d97a..da8f0981d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.22, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 index 1a20c8592..209c554c1 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index f4a5fcf5d..0f26efad8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 index d6f1a3aa6..673b5b91f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index 1583e695e..580424341 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.22, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 58a16f145..37562528a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index bd19ad119..38cc11e91 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21, libraries/librdkafka-0.11.5 +# Build Deps: php-7.1.22, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index ca8e27305..873ef8e7a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 index ca8e27305..873ef8e7a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.21 +# Build Deps: php-7.1.22 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.21 b/support/build/php-7.1.22 similarity index 100% rename from support/build/php-7.1.21 rename to support/build/php-7.1.22 From f9bd5b0f7ab210a8d9f4f0431f3497a07a4ec96f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 14:46:33 +0200 Subject: [PATCH 202/553] PHP/7.2.10 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 | 2 +- support/build/{php-7.2.9 => php-7.2.10} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.9 => php-7.2.10} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 935fbb18b..2e9463868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/5.6.38 [David Zuelke] - PHP/7.0.32 [David Zuelke] - PHP/7.1.22 [David Zuelke] +- PHP/7.2.10 [David Zuelke] ## v143 (2018-08-17) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 4be4b25a0..7d4abe544 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 index b42fc67b5..6f66a4684 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 77d2dab6a..f5b286914 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.10, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 44c6ca085..50eb29974 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 index 7c5c92586..b400926df 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index cca6a43b8..1d3a5fa31 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index 9704d550f..a639aa22d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.10, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 index 2284de6dc..12a0603c3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index da53d4361..6738ab45e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 index 072fbade4..98b621812 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index 303a75354..372ac5592 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.10, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index b25d088f6..473caf324 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 47d751229..c94c2022b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9, libraries/librdkafka-0.11.5 +# Build Deps: php-7.2.10, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 578539d7f..78884e3ec 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 index 578539d7f..78884e3ec 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.9 +# Build Deps: php-7.2.10 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.9 b/support/build/php-7.2.10 similarity index 100% rename from support/build/php-7.2.9 rename to support/build/php-7.2.10 From 1478212018f2e17b3ca6d5e8af51ca8f2fc2547f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 14:48:01 +0200 Subject: [PATCH 203/553] ext-newrelic/8.2.0.221 --- CHANGELOG.md | 1 + .../{newrelic-8.1.0.209 => newrelic-8.2.0.221} | 0 .../{newrelic-8.1.0.209 => newrelic-8.2.0.221} | 0 .../{newrelic-8.1.0.209 => newrelic-8.2.0.221} | 0 .../{newrelic-8.1.0.209 => newrelic-8.2.0.221} | 0 .../{newrelic-8.1.0.209 => newrelic-8.2.0.221} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.1.0.209 => newrelic-8.2.0.221} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.1.0.209 => newrelic-8.2.0.221} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.1.0.209 => newrelic-8.2.0.221} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.1.0.209 => newrelic-8.2.0.221} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.1.0.209 => newrelic-8.2.0.221} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9463868..8220068c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.0.32 [David Zuelke] - PHP/7.1.22 [David Zuelke] - PHP/7.2.10 [David Zuelke] +- ext-newrelic/8.2.0.221 [David Zuelke] ## v143 (2018-08-17) diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.1.0.209 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.2.0.221 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.1.0.209 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.2.0.221 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.1.0.209 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.2.0.221 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.1.0.209 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.2.0.221 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.1.0.209 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.2.0.221 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.1.0.209 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.2.0.221 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.1.0.209 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.2.0.221 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.1.0.209 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.2.0.221 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.1.0.209 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.2.0.221 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.1.0.209 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.2.0.221 From 8326760a2fd58c4b6284ec02cfea6233ddb48416 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 14:48:59 +0200 Subject: [PATCH 204/553] ext-phalcon/3.4.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.4.0 => phalcon-3.4.1} | 0 .../no-debug-non-zts-20131226/{phalcon-3.4.0 => phalcon-3.4.1} | 0 .../no-debug-non-zts-20151012/{phalcon-3.4.0 => phalcon-3.4.1} | 0 .../no-debug-non-zts-20160303/{phalcon-3.4.0 => phalcon-3.4.1} | 0 .../no-debug-non-zts-20170718/{phalcon-3.4.0 => phalcon-3.4.1} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.4.0 => phalcon-3.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.4.0 => phalcon-3.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.4.0 => phalcon-3.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.4.0 => phalcon-3.4.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.4.0 => phalcon-3.4.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8220068c0..61fbb236e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.22 [David Zuelke] - PHP/7.2.10 [David Zuelke] - ext-newrelic/8.2.0.221 [David Zuelke] +- ext-phalcon/3.4.1 [David Zuelke] ## v143 (2018-08-17) diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.0 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.0 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.0 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.0 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.0 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 From 9daa57b7e530ee15493a0f1c5a134744a884e5c0 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Sep 2018 23:32:10 +0200 Subject: [PATCH 205/553] remind about runtimes and stacks on platform install fail --- CHANGELOG.md | 4 ++++ bin/compile | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61fbb236e..195a61ab2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - ext-newrelic/8.2.0.221 [David Zuelke] - ext-phalcon/3.4.1 [David Zuelke] +### CHG + +- Extra reminders about runtimes and stacks if runtime platform install fails [David Zuelke] + ## v143 (2018-08-17) ### ADD diff --git a/bin/compile b/bin/compile index 0dad9c338..efb53882d 100755 --- a/bin/compile +++ b/bin/compile @@ -455,6 +455,17 @@ else '$COMPOSER_LOCK' are compatible with the list above, and ensure all required extensions are available for the desired runtimes. + When choosing a PHP runtimes and extensions, please also ensure + they are available on your app's stack ($STACK), and select + a different stack if needed after consulting the article below. + $( + [[ "$STACK" == "heroku-18" ]] && cat <<-EOF2 + $(echo -e "\033[1;33m") + Be advised that the heroku-18 stack you're currently using only + supports PHP version 7.1 and later. + $(echo -e "\033[1;31m") + EOF2 + ) For a list of supported runtimes & extensions on Heroku, please refer to: https://devcenter.heroku.com/articles/php-support EOF From 97e590c2848914c23a37dd28a6a94a04ed539609 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 14 Sep 2018 00:32:10 +0200 Subject: [PATCH 206/553] warn on EOL/EOM or close PHP runtimes --- CHANGELOG.md | 1 + bin/compile | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ bin/util/eol.php | 28 ++++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 bin/util/eol.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 195a61ab2..02fd1519b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ### CHG - Extra reminders about runtimes and stacks if runtime platform install fails [David Zuelke] +- Warn users of PHP versions that are close to, or have reached, end of life or end of active support [David Zuelke] ## v143 (2018-08-17) diff --git a/bin/compile b/bin/compile index efb53882d..d70b061f8 100755 --- a/bin/compile +++ b/bin/compile @@ -501,6 +501,66 @@ export -f composer # log runtime version mcount "platform.packages.php.$($engine_r "echo ${engine^^}_VERSION;")" +if eoldate=$($engine $bp_dir/bin/util/eol.php); then + : +else + code=$? + eolmsg=$( + cat <<-EOF + It is strongly recommended you update your app to a version of + PHP with "active support" status immediately to ensure you get + the latest bugfixes and security updates each time you deploy. + + You may check the list of versions supported by the PHP Group + and their EOL dates here: http://php.net/supported-versions.php + + For a list of supported runtimes & extensions on Heroku, please + refer to: https://devcenter.heroku.com/articles/php-support + EOF + ) + if (( $code == 2 )); then + mcount "warnings.runtime_eol.eol_reached" + warning <<-EOF + Your selected PHP version has reached end-of-life + + No updates or security fixes have been provided for your PHP + version series by the PHP Group since $eoldate. + + $eolmsg + EOF + elif (( $code == 3 )); then + mcount "warnings.runtime_eol.eol_close" + warning <<-EOF + Your selected PHP version is close to end-of-life + + No updates or security fixes will be provided for your PHP + version series by the PHP Group as of $eoldate. + + $eolmsg + EOF + elif (( $code == 4 )); then + mcount "warnings.runtime_eol.eom_reached" + warning <<-EOF + Your app's PHP version is no longer actively maintained + + Only security updates will be provided for your PHP version + series by the PHP Group until its end-of-life on $eoldate. + + $eolmsg + EOF + elif (( $code == 5 )); then + mcount "warnings.runtime_eol.eom_close" + warning <<-EOF + Your app's PHP version is close to end of maintenance + + Only security updates will be provided for your PHP version + series by the PHP Group as of $eoldate. + + $eolmsg + EOF + fi +fi + status "Installing dependencies..." # echo composer version for info purposes diff --git a/bin/util/eol.php b/bin/util/eol.php new file mode 100644 index 000000000..fa9fdd408 --- /dev/null +++ b/bin/util/eol.php @@ -0,0 +1,28 @@ + array("2015-07-21", "2016-07-21"), + "5.6" => array("2017-01-19", "2018-12-31"), + "7.0" => array("2017-12-03", "2018-12-03"), + "7.1" => array("2018-12-01", "2019-12-01"), + "7.2" => array("2019-11-30", "2020-11-30"), +); + +if(!isset($eol[PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION])) exit(0); + +list($secdate, $eoldate) = $eol[PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION]; + +if(strtotime($eoldate) < time()) { + echo($eoldate); + exit(2); // fully EOL +} elseif(strtotime($eoldate) < strtotime("+3 months")) { + echo($eoldate); + exit(3); // less than three months to full EOL +} elseif(strtotime($secdate) < time()) { + echo($eoldate); // we want to print the looming full EOL date here + exit(4); // security fixes only support +} elseif(strtotime($secdate) < strtotime("+3 months")) { + echo($secdate); + exit(5); // less than three months to security fixes only support +} From 944ed0763cacb75987cbe95392f0946f0a6bb13d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 14 Sep 2018 00:58:08 +0200 Subject: [PATCH 207/553] Default to listen.mode=0666 for PHP-FPM socket This is to allow running in both Heroku Dynos and containers. As both dynos and containers only run a single site/pool, a mode of 0666 is okay. A solution via listen.owner is not possible, because the dyno user can't chown the socket to e.g. nobody or daemon user ownership. --- CHANGELOG.md | 1 + conf/php/php-fpm.conf | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02fd1519b..9e754e065 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Extra reminders about runtimes and stacks if runtime platform install fails [David Zuelke] - Warn users of PHP versions that are close to, or have reached, end of life or end of active support [David Zuelke] +- Default to listen.mode=0666 for PHP-FPM socket to allow running in both Heroku Dynos and containers [David Zuelke] ## v143 (2018-08-17) diff --git a/conf/php/php-fpm.conf b/conf/php/php-fpm.conf index 3e525ae61..f478c1b74 100644 --- a/conf/php/php-fpm.conf +++ b/conf/php/php-fpm.conf @@ -167,10 +167,12 @@ listen = /tmp/heroku.fcgi.${PORT}.sock ; permissions must be set in order to allow connections from a web server. Many ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user -; mode is set to 0666 +; mode is set to 0660 ;listen.owner = nobody ;listen.group = nobody -;listen.mode = 0666 +; Mode is set to 0666 so it works both in dynos and in containers (where FPM master, and thus the socket, belong to root) +; This can't portably done via listen.owner, as the dyno user can't chown the socket to e.g. nobody or daemon ownership +listen.mode = 0666 ; List of ipv4 addresses of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original From 596cf90ecc139c47864afda9244b6d427fd9cc10 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 10 Oct 2018 14:35:38 +0200 Subject: [PATCH 208/553] Fix #264: SERVER_NAME is localhost for Nginx In Apache, it is the requested hostname. This change brings the Nginx behavior in line with Nginx by exposing $host using fastcgi_param. --- CHANGELOG.md | 6 ++++++ conf/nginx/heroku.conf.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e754e065..0fc44c3b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v145 (2019-10-??) + +### FIX + +- Nginx reports "localhost" instead of requested hostname in SERVER_NAME FastCGI variable (#264) [David Zuelke] + ## v144 (2019-09-13) ### ADD diff --git a/conf/nginx/heroku.conf.php b/conf/nginx/heroku.conf.php index 5d9d59775..a7bcbe62d 100644 --- a/conf/nginx/heroku.conf.php +++ b/conf/nginx/heroku.conf.php @@ -36,6 +36,8 @@ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # try_files resets $fastcgi_path_info, see http://trac.nginx.org/nginx/ticket/321, so we use the if instead fastcgi_param PATH_INFO $fastcgi_path_info if_not_empty; + # pass actual request host instead of localhost + fastcgi_param SERVER_NAME $host; if (!-f $document_root$fastcgi_script_name) { # check if the script exists @@ -46,7 +48,6 @@ fastcgi_pass heroku-fcgi; } - # TODO: use X-Forwarded-Host? http://comments.gmane.org/gmane.comp.web.nginx.english/2170 server_name localhost; listen ; # FIXME: breaks redirects with foreman From 8286ae3cb1d7e14131b02c11b3cbc67312a083dd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 15 Oct 2018 21:03:33 +0200 Subject: [PATCH 209/553] PHP/7.1.23 --- CHANGELOG.md | 4 ++++ support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-4.1.1 | 2 +- support/build/{php-7.1.22 => php-7.1.23} | 0 17 files changed, 19 insertions(+), 15 deletions(-) rename support/build/{php-7.1.22 => php-7.1.23} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fc44c3b6..b0d4d1ca6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v145 (2019-10-??) +### ADD + +- PHP/7.1.23 [David Zuelke] + ### FIX - Nginx reports "localhost" instead of requested hostname in SERVER_NAME FastCGI variable (#264) [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 8edfb38df..6bb867316 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 index b98fa4e1c..bfe56c7b1 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index b8625ad37..2ce559605 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.22, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.23, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index e7a621f90..7d5e7d985 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 index 17b78c9db..7bf2f591a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 637407820..e1ca94012 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index da8f0981d..7e3bc1b26 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.23, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 index 209c554c1..71f46a3b8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 index 0f26efad8..b388848b8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 +++ b/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.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 index 673b5b91f..15927861f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index 580424341..23d312833 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.23, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 37562528a..a1fe4a598 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 38cc11e91..ffa428912 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22, libraries/librdkafka-0.11.5 +# Build Deps: php-7.1.23, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 873ef8e7a..4c1297976 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 index 873ef8e7a..4c1297976 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.22 +# Build Deps: php-7.1.23 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.22 b/support/build/php-7.1.23 similarity index 100% rename from support/build/php-7.1.22 rename to support/build/php-7.1.23 From c7b9290d76369574752999eb699d8fc276b45e9c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 15 Oct 2018 21:04:51 +0200 Subject: [PATCH 210/553] PHP/7.2.11 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 | 2 +- support/build/{php-7.2.10 => php-7.2.11} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.10 => php-7.2.11} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0d4d1ca6..19135c821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.1.23 [David Zuelke] +- PHP/7.2.11 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 7d4abe544..2ffea0348 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 index 6f66a4684..685580c7d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index f5b286914..d6927553c 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.11, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 50eb29974..b78db4b75 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 index b400926df..2785a6f88 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 1d3a5fa31..80d37241a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index a639aa22d..9eb14660f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.11, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 index 12a0603c3..137f3188c 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 index 6738ab45e..fb7e24cda 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 index 98b621812..314086324 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index 372ac5592..9c953c257 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.11, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 473caf324..ab8b532d2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index c94c2022b..c04de9b42 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10, libraries/librdkafka-0.11.5 +# Build Deps: php-7.2.11, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 78884e3ec..a73444398 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 index 78884e3ec..a73444398 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.10 +# Build Deps: php-7.2.11 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.10 b/support/build/php-7.2.11 similarity index 100% rename from support/build/php-7.2.10 rename to support/build/php-7.2.11 From 7621bfeeaae7cc6e2d0ed517d6bc00e52c7a7473 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 15 Oct 2018 21:15:03 +0200 Subject: [PATCH 211/553] ext-oauth/2.0.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20151012/{oauth-2.0.2 => oauth-2.0.3} | 0 .../no-debug-non-zts-20160303/{oauth-2.0.2 => oauth-2.0.3} | 0 .../no-debug-non-zts-20170718/{oauth-2.0.2 => oauth-2.0.3} | 0 4 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{oauth-2.0.2 => oauth-2.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{oauth-2.0.2 => oauth-2.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{oauth-2.0.2 => oauth-2.0.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19135c821..ed362bd3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.1.23 [David Zuelke] - PHP/7.2.11 [David Zuelke] +- ext-oauth/2.0.3 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.2 rename to support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.2 rename to support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.2 rename to support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 From a943bf9450c8015a373c574094ea9a3240c4dafd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 15 Oct 2018 21:18:35 +0200 Subject: [PATCH 212/553] ext-mongodb/1.5.3 --- .../no-debug-non-zts-20121212/{mongodb-1.5.2 => mongodb-1.5.3} | 0 .../no-debug-non-zts-20131226/{mongodb-1.5.2 => mongodb-1.5.3} | 0 .../no-debug-non-zts-20151012/{mongodb-1.5.2 => mongodb-1.5.3} | 0 .../no-debug-non-zts-20160303/{mongodb-1.5.2 => mongodb-1.5.3} | 0 .../no-debug-non-zts-20170718/{mongodb-1.5.2 => mongodb-1.5.3} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.5.2 => mongodb-1.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.5.2 => mongodb-1.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.5.2 => mongodb-1.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.5.2 => mongodb-1.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.5.2 => mongodb-1.5.3} (100%) diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.2 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.2 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.2 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.2 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.2 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 From e9e2efbe84edbd678b0d01d5e372911e6b1ba391 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 15 Oct 2018 21:20:35 +0200 Subject: [PATCH 213/553] ext-blackfire/1.23.1 --- CHANGELOG.md | 2 ++ .../{blackfire-1.22.0 => blackfire-1.23.1} | 0 .../{blackfire-1.22.0 => blackfire-1.23.1} | 0 .../{blackfire-1.22.0 => blackfire-1.23.1} | 0 .../{blackfire-1.22.0 => blackfire-1.23.1} | 0 .../{blackfire-1.22.0 => blackfire-1.23.1} | 0 6 files changed, 2 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.22.0 => blackfire-1.23.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.22.0 => blackfire-1.23.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.22.0 => blackfire-1.23.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.22.0 => blackfire-1.23.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.22.0 => blackfire-1.23.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed362bd3f..6f65d0cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - PHP/7.1.23 [David Zuelke] - PHP/7.2.11 [David Zuelke] - ext-oauth/2.0.3 [David Zuelke] +- ext-mongodb/1.5.3 [David Zuelke] +- ext-blackfire/1.23.1 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.22.0 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.23.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.22.0 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.23.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.22.0 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.23.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.22.0 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.23.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.22.0 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.23.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.22.0 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.23.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.22.0 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.23.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.22.0 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.23.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.22.0 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.23.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.22.0 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.23.1 From 15b6ba9c87609de71cbde6e8f6c86aac075f1a0f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 15 Oct 2018 21:22:15 +0200 Subject: [PATCH 214/553] ext-newrelic/8.3.0.226 --- CHANGELOG.md | 1 + .../{newrelic-8.2.0.221 => newrelic-8.3.0.226} | 0 .../{newrelic-8.2.0.221 => newrelic-8.3.0.226} | 0 .../{newrelic-8.2.0.221 => newrelic-8.3.0.226} | 0 .../{newrelic-8.2.0.221 => newrelic-8.3.0.226} | 0 .../{newrelic-8.2.0.221 => newrelic-8.3.0.226} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.2.0.221 => newrelic-8.3.0.226} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.2.0.221 => newrelic-8.3.0.226} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.2.0.221 => newrelic-8.3.0.226} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.2.0.221 => newrelic-8.3.0.226} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.2.0.221 => newrelic-8.3.0.226} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f65d0cf0..9c1a0bee7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - ext-oauth/2.0.3 [David Zuelke] - ext-mongodb/1.5.3 [David Zuelke] - ext-blackfire/1.23.1 [David Zuelke] +- ext-newrelic/8.3.0.226 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.2.0.221 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.3.0.226 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.2.0.221 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.3.0.226 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.2.0.221 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.3.0.226 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.2.0.221 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.3.0.226 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.2.0.221 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.3.0.226 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.2.0.221 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.3.0.226 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.2.0.221 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.3.0.226 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.2.0.221 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.3.0.226 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.2.0.221 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.3.0.226 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.2.0.221 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.3.0.226 From 28ba13ab82f971323a1043b809d1b31994fd5a4a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 16 Oct 2018 18:21:53 +0200 Subject: [PATCH 215/553] v145 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c1a0bee7..2709d8c89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v145 (2019-10-??) +## v145 (2019-10-16) ### ADD From 7c3ab69a6c8b45419f792a1ff1938ef40627ec88 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Apr 2018 15:27:10 -0400 Subject: [PATCH 216/553] translate NEW_RELIC_LOG_LEVEL to log level for daemon --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20121212/newrelic | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2709d8c89..98ad00648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v146 (2018-11-08) + +### CHG + +- Translate `NEW_RELIC_LOG_LEVEL` values "verbose" and "verbosedebug" to "debug" for `newrelic-daemon` [David Zuelke] + ## v145 (2019-10-16) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 3c5a4450d..0e9a9dfe9 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -60,6 +60,10 @@ if [[ -n "$NEW_RELIC_LICENSE_KEY" ]]; then if [[ -f "/app/.heroku/php/bin/newrelic-daemon" ]]; then export NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME:-${HEROKU_APP_NAME:-"PHP Application on Heroku"}} export NEW_RELIC_LOG_LEVEL=${NEW_RELIC_LOG_LEVEL:-"warning"} + export NEW_RELIC_DAEMON_LOG_LEVEL="$NEW_RELIC_LOG_LEVEL" + if [[ "$NEW_RELIC_DAEMON_LOG_LEVEL" == verbose* || "$NEW_RELIC_DAEMON_LOG_LEVEL" == *debug ]]; then + NEW_RELIC_DAEMON_LOG_LEVEL="debug" + fi # The daemon is a started in foreground mode so it will not daemonize # (i.e. disassociate from the controlling TTY and disappear into the @@ -71,7 +75,7 @@ if [[ -n "$NEW_RELIC_LICENSE_KEY" ]]; then tail -qF -n 0 /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log 1>&2 & # daemon start - /app/.heroku/php/bin/newrelic-daemon --foreground --port "@newrelic-daemon" --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" & + /app/.heroku/php/bin/newrelic-daemon --foreground --port "@newrelic-daemon" --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_DAEMON_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" & # give it a moment to connect sleep 2 @@ -88,7 +92,7 @@ newrelic.daemon.location = /app/.heroku/php/bin/newrelic-daemon newrelic.daemon.port = @newrelic-daemon newrelic.loglevel = ${NEW_RELIC_LOG_LEVEL} -newrelic.daemon.loglevel = ${NEW_RELIC_LOG_LEVEL} +newrelic.daemon.loglevel = ${NEW_RELIC_DAEMON_LOG_LEVEL} newrelic.license = ${NEW_RELIC_LICENSE_KEY} newrelic.appname = ${NEW_RELIC_APP_NAME} From a656838c3a554ac1b66860f14936d6308ecd21c1 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 8 Nov 2018 05:26:23 +0100 Subject: [PATCH 217/553] Apache/2.4.37 --- CHANGELOG.md | 4 ++++ support/build/{apache-2.4.34 => apache-2.4.37} | 0 2 files changed, 4 insertions(+) rename support/build/{apache-2.4.34 => apache-2.4.37} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ad00648..fa22c72a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v146 (2018-11-08) +### ADD + +- Apache/2.4.37 [David Zuelke] + ### CHG - Translate `NEW_RELIC_LOG_LEVEL` values "verbose" and "verbosedebug" to "debug" for `newrelic-daemon` [David Zuelke] diff --git a/support/build/apache-2.4.34 b/support/build/apache-2.4.37 similarity index 100% rename from support/build/apache-2.4.34 rename to support/build/apache-2.4.37 From b2f15907578524e7d91d3561f0428d06f3818dbf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 8 Nov 2018 05:27:44 +0100 Subject: [PATCH 218/553] PHP/7.1.24 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 | 2 +- support/build/{php-7.1.23 => php-7.1.24} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.23 => php-7.1.24} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa22c72a8..af7be39ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - Apache/2.4.37 [David Zuelke] +- PHP/7.1.24 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 6bb867316..67530a0cd 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 index bfe56c7b1..b0f229f9c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 2ce559605..e52d64183 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.23, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.24, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 7d5e7d985..a7dea70f0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 index 7bf2f591a..e1261701f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index e1ca94012..74bc1b75d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 7e3bc1b26..9cc4c6d89 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.24, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 index 71f46a3b8..4b31e0e1e 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 index b388848b8..5c5f34c39 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 index 15927861f..36bfcb24c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index 23d312833..c8a53958b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.24, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index a1fe4a598..a40802659 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index ffa428912..a26145e6c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23, libraries/librdkafka-0.11.5 +# Build Deps: php-7.1.24, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 4c1297976..6da254768 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 index 4c1297976..6da254768 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.23 +# Build Deps: php-7.1.24 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.23 b/support/build/php-7.1.24 similarity index 100% rename from support/build/php-7.1.23 rename to support/build/php-7.1.24 From 0e5a8e76820b2f726fc248260bee1edd0ff19d41 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 8 Nov 2018 05:28:19 +0100 Subject: [PATCH 219/553] PHP/7.2.12 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 | 2 +- support/build/{php-7.2.11 => php-7.2.12} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.11 => php-7.2.12} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index af7be39ef..d2580e8ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Apache/2.4.37 [David Zuelke] - PHP/7.1.24 [David Zuelke] +- PHP/7.2.12 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index 2ffea0348..a49941682 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 index 685580c7d..4c70ccdce 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index d6927553c..22b80ae6e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.12, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index b78db4b75..815a1f7ce 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 index 2785a6f88..c4211ed83 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 80d37241a..6ba8a5832 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index 9eb14660f..a78b65044 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.12, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index 137f3188c..fb3305890 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index fb7e24cda..bc5563d75 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 index 314086324..f98422168 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index 9c953c257..a0d21c362 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.12, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index ab8b532d2..3c9599ff0 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index c04de9b42..6b79c860b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11, libraries/librdkafka-0.11.5 +# Build Deps: php-7.2.12, libraries/librdkafka-0.11.5 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index a73444398..d7c456aed 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 index a73444398..d7c456aed 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.11 +# Build Deps: php-7.2.12 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.11 b/support/build/php-7.2.12 similarity index 100% rename from support/build/php-7.2.11 rename to support/build/php-7.2.12 From 654cf0fd57dab87c968fcc9c6172c72013e0c3f6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 8 Nov 2018 05:29:33 +0100 Subject: [PATCH 220/553] librdkafka/0.11.6 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../build/libraries/{librdkafka-0.11.5 => librdkafka-0.11.6} | 0 7 files changed, 6 insertions(+), 5 deletions(-) rename support/build/libraries/{librdkafka-0.11.5 => librdkafka-0.11.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2580e8ac..d6ecb823e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### CHG - Translate `NEW_RELIC_LOG_LEVEL` values "verbose" and "verbosedebug" to "debug" for `newrelic-daemon` [David Zuelke] +- librdkafka/0.11.6 ## v145 (2019-10-16) diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index 5e38f84c1..18b7332fc 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.11.5 +# Build Deps: php-5.5.38, libraries/librdkafka-0.11.6 source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index f5b48421c..c38513652 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38, libraries/librdkafka-0.11.5 +# Build Deps: php-5.6.38, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index a1d5daac8..d1b497641 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32, libraries/librdkafka-0.11.5 +# Build Deps: php-7.0.32, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index a26145e6c..242a7e88f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24, libraries/librdkafka-0.11.5 +# Build Deps: php-7.1.24, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 6b79c860b..60408df4d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12, libraries/librdkafka-0.11.5 +# Build Deps: php-7.2.12, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.11.5 b/support/build/libraries/librdkafka-0.11.6 similarity index 100% rename from support/build/libraries/librdkafka-0.11.5 rename to support/build/libraries/librdkafka-0.11.6 From 961fca7dac879de3231f360c127a3aa92117dbb9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sun, 9 Dec 2018 17:47:36 +0100 Subject: [PATCH 221/553] Look for configs relative to buildpack dir in boot scripts --- CHANGELOG.md | 6 ++++++ bin/heroku-hhvm-apache2 | 21 ++++++++++++++------- bin/heroku-hhvm-nginx | 21 ++++++++++++++------- bin/heroku-php-apache2 | 23 +++++++++++++++-------- bin/heroku-php-nginx | 23 +++++++++++++++-------- 5 files changed, 64 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6ecb823e..faae7dbed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v147 (2018-??-??) + +### CHG + +- Look for configs relative to buildpack dir, and not to $CWD/vendor/heroku/…, in boot scripts [David Zuelke] + ## v146 (2018-11-08) ### ADD diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2 index 6ffcd3f80..2c2ffe495 100755 --- a/bin/heroku-hhvm-apache2 +++ b/bin/heroku-hhvm-apache2 @@ -9,6 +9,9 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +# we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) + verbose= php_passthrough() { @@ -54,19 +57,19 @@ print_help() { Recommended approach when customizing Apache2's config in most cases, unless you need to set fundamental server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf] + [default: /conf/apache2/default_include.conf] -c The path to the full VHost configuration file that is included after Heroku's (or your local) Apache2 config is loaded. Must contain a 'Listen \${PORT}' directive and should have a '' and likely also a '' section (see option -C above). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf] + [default: /conf/apache2/heroku.conf] -h, --help Display this help screen and exit. -I The path to an extra php.ini to use in addition to the default HHVM php.ini (see option -i below). -i The path to the php.ini file to use. It is highly recommended to use the -I option (see above) instead. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php] + [default: /conf/hhvm/php.ini.php] -l Path to additional log file to tail to STDERR so its contents appear in 'heroku logs'. If the file does not exist, it will be created. Wildcards are allowed, but @@ -78,6 +81,9 @@ print_help() { chosen if that variable does not exist. -v, --verbose Be more verbose during startup. + The placeholder above represents the base directory of this buildpack: + $bp_dir + All file paths must be relative to '$HEROKU_APP_DIR'. Any file name that ends in '.php' will be run through the PHP interpreter first. @@ -202,6 +208,7 @@ composer() { hhvm $composer_bin "$@" fi } +# these exports are used in default web server configs to lock down access to composer directories COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export @@ -222,7 +229,7 @@ if [[ "$#" == "1" ]]; then fi function prepare_hhvm_ini() { # we have to do this twice, as the WEB_CONCURRENCY setting is evaluated using PHP code, not ${...} syntax which HHVM does not support; if a value for $1 is passed then it won't echo messages upon second invocation -if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then +if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$bp_dir/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 fi php_configs=( "-c" "$(php_passthrough "$php_config")" ) @@ -234,13 +241,13 @@ fi } prepare_hhvm_ini -if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf"} && $verbose ) ]]; then +if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$bp_dir/conf/apache2/default_include.conf"} && $verbose ) ]]; then echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 fi httpd_config_include=$(php_passthrough "$httpd_config_include") export HEROKU_PHP_HTTPD_CONFIG_INCLUDE="$httpd_config_include" -if [[ -n ${httpd_config:-} || ( ${httpd_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf"} && $verbose) ]]; then +if [[ -n ${httpd_config:-} || ( ${httpd_config:="$bp_dir/conf/apache2/heroku.conf"} && $verbose) ]]; then echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 fi httpd_config=$(php_passthrough "$httpd_config") @@ -264,7 +271,7 @@ if [[ -z ${WEB_CONCURRENCY:-} ]]; then fi # determine number of HHVM threads to run - read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php "$ram") # tail, as composer echos outdated version warnings to STDOUT + read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $bp_dir/bin/util/autotune.php "$ram") [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 export WEB_CONCURRENCY diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index 865fa25a9..4343dfbe3 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -9,6 +9,9 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +# we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) + verbose= php_passthrough() { @@ -54,7 +57,7 @@ print_help() { Recommended approach when customizing Nginx's config in most cases, unless you need to set http or fundamental server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php] + [default: /conf/nginx/default_include.conf.php] -c The path to the full configuration file that is included after Heroku's (or your local) Nginx config is loaded. It must contain an 'http { ... }' block @@ -62,13 +65,13 @@ print_help() { and 'root' (see option -C above), but no global, directives (globals are read from the system's default Nginx configuration files). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php] + [default: /conf/nginx/heroku.conf.php] -h, --help Display this help screen and exit. -I The path to an extra php.ini to use in addition to the default HHVM php.ini (see option -i below). -i The path to the php.ini file to use. It is highly recommended to use the -I option (see above) instead. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php] + [default: /conf/hhvm/php.ini.php] -l Path to additional log file to tail to STDERR so its contents appear in 'heroku logs'. If the file does not exist, it will be created. Wildcards are allowed, but @@ -80,6 +83,9 @@ print_help() { chosen if that variable does not exist. -v, --verbose Be more verbose during startup. + The placeholder above represents the base directory of this buildpack: + $bp_dir + All file paths must be relative to '$HEROKU_APP_DIR'. Any file name that ends in '.php' will be run through the PHP interpreter first. @@ -202,6 +208,7 @@ composer() { hhvm $composer_bin "$@" fi } +# these exports are used in default web server configs to lock down access to composer directories COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export @@ -222,7 +229,7 @@ if [[ "$#" == "1" ]]; then fi function prepare_hhvm_ini() { # we have to do this twice, as the WEB_CONCURRENCY setting is evaluated using PHP code, not ${...} syntax which HHVM does not support; if a value for $1 is passed then it won't echo messages upon second invocation -if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then +if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$bp_dir/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 fi php_configs=( "-c" "$(php_passthrough "$php_config")" ) @@ -234,13 +241,13 @@ fi } prepare_hhvm_ini -if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then +if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$bp_dir/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 fi nginx_config_include=$(php_passthrough "$nginx_config_include") export HEROKU_PHP_NGINX_CONFIG_INCLUDE="$nginx_config_include" -if [[ -n ${nginx_config:-} || ( ${nginx_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php"} && $verbose) ]]; then +if [[ -n ${nginx_config:-} || ( ${nginx_config:="$bp_dir/conf/nginx/heroku.conf.php"} && $verbose) ]]; then echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 fi nginx_config=$(php_passthrough "$nginx_config") @@ -264,7 +271,7 @@ if [[ -z ${WEB_CONCURRENCY:-} ]]; then fi # determine number of HHVM threads to run - read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php "$ram") # tail, as composer echos outdated version warnings to STDOUT + read WEB_CONCURRENCY php_memory_limit <<<$(hhvm "${php_configs[@]}" $bp_dir/bin/util/autotune.php "$ram") [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 export WEB_CONCURRENCY diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index 7ce29349e..81cadedd4 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -9,6 +9,9 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +# we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) + verbose= php_passthrough() { @@ -54,23 +57,23 @@ print_help() { Recommended approach when customizing Apache2's config in most cases, unless you need to set fundamental server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf] + [default: /conf/apache2/default_include.conf] -c The path to the full VHost configuration file that is included after Heroku's (or your local) Apache2 config is loaded. Must contain a 'Listen \${PORT}' directive and should have a '' and likely also a '' section (see option -C above). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf] + [default: /conf/apache2/heroku.conf] -F The path to the configuration file to include at the end of php-fpm.conf (see option -f below), in the '[www]' pool section. Recommended approach when customizing PHP-FPM's configuration in most cases, unless you need to set global options. -f The path to the full PHP-FPM configuration file. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf] + [default: /conf/php/php-fpm.conf] -h, --help Display this help screen and exit. -i The path to the php.ini file to use. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php.ini] + [default: /conf/php/php.ini] -l Path to additional log file to tail to STDERR so its contents appear in 'heroku logs'. If the file does not exist, it will be created. Wildcards are allowed, but @@ -82,6 +85,9 @@ print_help() { chosen if that variable does not exist. -v, --verbose Be more verbose during startup. + The placeholder above represents the base directory of this buildpack: + $bp_dir + All file paths must be relative to '$HEROKU_APP_DIR'. Any file name that ends in '.php' will be run through the PHP interpreter first. @@ -211,6 +217,7 @@ composer() { php -n $composer_bin "$@" fi } +# these exports are used in default web server configs to lock down access to composer directories COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export @@ -236,7 +243,7 @@ if [[ -n ${fpm_config_include:-} ]]; then export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" fi -if [[ -n ${fpm_config:-} || ( ${fpm_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf"} && $verbose ) ]]; then +if [[ -n ${fpm_config:-} || ( ${fpm_config:="$bp_dir/conf/php/php-fpm.conf"} && $verbose ) ]]; then echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 fi fpm_config=$(php_passthrough "$fpm_config") @@ -246,13 +253,13 @@ if [[ -n ${php_config:-} ]]; then php_config=$(php_passthrough "$php_config") fi -if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/default_include.conf"} && $verbose ) ]]; then +if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$bp_dir/conf/apache2/default_include.conf"} && $verbose ) ]]; then echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 fi httpd_config_include=$(php_passthrough "$httpd_config_include") export HEROKU_PHP_HTTPD_CONFIG_INCLUDE="$httpd_config_include" -if [[ -n ${httpd_config:-} || ( ${httpd_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/apache2/heroku.conf"} && $verbose) ]]; then +if [[ -n ${httpd_config:-} || ( ${httpd_config:="$bp_dir/conf/apache2/heroku.conf"} && $verbose) ]]; then echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 fi httpd_config=$(php_passthrough "$httpd_config") @@ -277,7 +284,7 @@ if [[ -z ${WEB_CONCURRENCY:-} ]]; then # determine number of FPM processes to run # prevent loading of extension INIs (and thus e.g. newrelic) using empty PHP_INI_SCAN_DIR - read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") # tail, as composer echos outdated version warnings to STDOUT + read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} "$bp_dir/bin/util/autotune.php" -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 export WEB_CONCURRENCY diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index 969a1bf52..c097b39a3 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -9,6 +9,9 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +# we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) + verbose= php_passthrough() { @@ -54,7 +57,7 @@ print_help() { Recommended approach when customizing Nginx's config in most cases, unless you need to set http or fundamental server level options. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php] + [default: /conf/nginx/default_include.conf.php] -c The path to the full configuration file that is included after Heroku's (or your local) Nginx config is loaded. It must contain an 'http { ... }' block @@ -62,17 +65,17 @@ print_help() { and 'root' (see option -C above), but no global, directives (globals are read from the system's default Nginx configuration files). - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php] + [default: /conf/nginx/heroku.conf.php] -F The path to the configuration file to include at the end of php-fpm.conf (see option -f below), in the '[www]' pool section. Recommended approach when customizing PHP-FPM's configuration in most cases, unless you need to set global options. -f The path to the full PHP-FPM configuration file. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf] + [default: /conf/php/php-fpm.conf] -h, --help Display this help screen and exit. -i The path to the php.ini file to use. - [default: \$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php.ini] + [default: /conf/php/php.ini] -l Path to additional log file to tail to STDERR so its contents appear in 'heroku logs'. If the file does not exist, it will be created. Wildcards are allowed, but @@ -84,6 +87,9 @@ print_help() { chosen if that variable does not exist. -v, --verbose Be more verbose during startup. + The placeholder above represents the base directory of this buildpack: + $bp_dir + All file paths must be relative to '$HEROKU_APP_DIR'. Any file name that ends in '.php' will be run through the PHP interpreter first. @@ -212,6 +218,7 @@ composer() { php -n $composer_bin "$@" fi } +# these exports are used in default web server configs to lock down access to composer directories COMPOSER_VENDOR_DIR=$(composer config vendor-dir 2> /dev/null | tail -n 1) && export COMPOSER_VENDOR_DIR || { echo "Unable to determine Composer vendor-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export COMPOSER_BIN_DIR=$(composer config bin-dir 2> /dev/null | tail -n 1) && export COMPOSER_BIN_DIR || { echo "Unable to determine Composer bin-dir setting; is 'composer' executable on path or 'composer.phar' in current working directory?" >&2; exit 1; } # tail, as composer echos outdated version warnings to STDOUT; export after the assignment or exit status will that be of 'export @@ -237,7 +244,7 @@ if [[ -n ${fpm_config_include:-} ]]; then export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" fi -if [[ -n ${fpm_config:-} || ( ${fpm_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/php/php-fpm.conf"} && $verbose ) ]]; then +if [[ -n ${fpm_config:-} || ( ${fpm_config:="$bp_dir/conf/php/php-fpm.conf"} && $verbose ) ]]; then echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 fi fpm_config=$(php_passthrough "$fpm_config") @@ -247,13 +254,13 @@ if [[ -n ${php_config:-} ]]; then php_config=$(php_passthrough "$php_config") fi -if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then +if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$bp_dir/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 fi nginx_config_include=$(php_passthrough "$nginx_config_include") export HEROKU_PHP_NGINX_CONFIG_INCLUDE="$nginx_config_include" -if [[ -n ${nginx_config:-} || ( ${nginx_config:="$HEROKU_APP_DIR/$COMPOSER_VENDOR_DIR/heroku/heroku-buildpack-php/conf/nginx/heroku.conf.php"} && $verbose) ]]; then +if [[ -n ${nginx_config:-} || ( ${nginx_config:="$bp_dir/conf/nginx/heroku.conf.php"} && $verbose) ]]; then echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 fi nginx_config=$(php_passthrough "$nginx_config") @@ -278,7 +285,7 @@ if [[ -z ${WEB_CONCURRENCY:-} ]]; then # determine number of FPM processes to run # prevent loading of extension INIs (and thus e.g. newrelic) using empty PHP_INI_SCAN_DIR - read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} $(composer config vendor-dir 2> /dev/null | tail -n 1)/heroku/heroku-buildpack-php/bin/util/autotune.php -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") # tail, as composer echos outdated version warnings to STDOUT + read WEB_CONCURRENCY php_memory_limit <<<$(PHP_INI_SCAN_DIR= php ${php_config:+-c "$php_config"} "$bp_dir/bin/util/autotune.php" -y "$fpm_config" -t "$DOCUMENT_ROOT" "$ram") [[ $WEB_CONCURRENCY -lt 1 ]] && WEB_CONCURRENCY=1 export WEB_CONCURRENCY From 791bf0ddecb672813b457b2b539e7ccdf0cdf505 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sun, 9 Dec 2018 18:00:52 +0100 Subject: [PATCH 222/553] Look for default configs using version specific paths first in boot scripts --- CHANGELOG.md | 1 + bin/heroku-hhvm-apache2 | 47 +++++++++++++++++++++++++++++++++++------ bin/heroku-hhvm-nginx | 47 +++++++++++++++++++++++++++++++++++------ bin/heroku-php-apache2 | 47 +++++++++++++++++++++++++++++++++++------ bin/heroku-php-nginx | 47 +++++++++++++++++++++++++++++++++++------ 5 files changed, 161 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faae7dbed..5d0a8c934 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### CHG - Look for configs relative to buildpack dir, and not to $CWD/vendor/heroku/…, in boot scripts [David Zuelke] +- Look for default configs using version specific paths first in boot scripts [David Zuelke] ## v146 (2018-11-08) diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2 index 2c2ffe495..c39610577 100755 --- a/bin/heroku-hhvm-apache2 +++ b/bin/heroku-hhvm-apache2 @@ -9,8 +9,16 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +if ! type -p "realpath" > /dev/null; then + # cedar-14 doesn't have realpath + # must be a function so subshells, including $(…), can use it + realpath() { + readlink "$@" + } +fi + # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) verbose= @@ -41,6 +49,25 @@ touch_log() { mkdir -p $(dirname "$1") && touch "$1" } +findconfig() { + local dir=$(dirname "$2") + local file=$(basename "$2") + IFS='.' read -r -a version <<< "$1" # read the parts of $1 (version number) into an array, e.g. (7 2 33) + + # iterate "backwards" over version parts so we try "7/2/11" first, then "7/2", then "7" for a version "7.2.11" + # we go down to 0, which will yield an empty string, for the last fallback layer without any version number + for (( i = ${#version[@]}; i >= 0; i--)); do + version_dir=$(IFS=/; echo "${version[*]:0:$i}") # set IFS to "/" for merging, but echo is a builtin, so it must be a subshell and a separate command + full_path="${dir}/${version_dir}${version_dir:+/}${file}" # concat, but if scandir is empty (last fallback), don't produce a double slash + if [[ -f "$full_path" ]]; then + echo "$full_path"; + return 0; + fi + done + echo "$2" + return 1; +} + print_help() { cat >&2 <<-EOF @@ -57,19 +84,22 @@ print_help() { Recommended approach when customizing Apache2's config in most cases, unless you need to set fundamental server level options. - [default: /conf/apache2/default_include.conf] + [default: /conf/apache2/default_include.conf, + or a more version-specific file from a subdirectory] -c The path to the full VHost configuration file that is included after Heroku's (or your local) Apache2 config is loaded. Must contain a 'Listen \${PORT}' directive and should have a '' and likely also a '' section (see option -C above). - [default: /conf/apache2/heroku.conf] + [default: /conf/apache2/heroku.conf, + or a more version-specific file from a subdirectory] -h, --help Display this help screen and exit. -I The path to an extra php.ini to use in addition to the default HHVM php.ini (see option -i below). -i The path to the php.ini file to use. It is highly recommended to use the -I option (see above) instead. - [default: /conf/hhvm/php.ini.php] + [default: /conf/hhvm/php.ini.php, + or a more version-specific file from a subdirectory] -l Path to additional log file to tail to STDERR so its contents appear in 'heroku logs'. If the file does not exist, it will be created. Wildcards are allowed, but @@ -197,6 +227,9 @@ logs+=( "/tmp/heroku.apache2_error.$PORT.log" "/tmp/heroku.apache2_access.$PORT. hhvm --php -r 'exit((int)version_compare(HHVM_VERSION, "3.0.1", "<"));' || { echo "This program requires HHVM 3.0.1 or newer" >&2; exit 1; } { { httpd -v | hhvm --php -r 'exit((int)version_compare(preg_replace("#^Server version: Apache/(\S+).+$#sm", "\\1", file_get_contents("php://stdin")), "2.4.10", "<"));'; } && { httpd -t -D DUMP_MODULES | grep 'proxy_fcgi_module' > /dev/null; }; } || { echo "This program requires Apache 2.4.10 or newer with mod_proxy and mod_proxy_fcgi enabled; check your 'httpd' command." >&2; exit 1; } +hhvm_version="$(hhvm --php -r 'echo HHVM_VERSION;')" +httpd_version="$(httpd -v | hhvm --php -r 'echo preg_replace("#^Server version: Apache/(\S+).+$#sm", "\\1", file_get_contents("php://stdin"));')" + # make sure we run a local composer.phar if present, or global composer if not composer() { local composer_bin=$(which ./composer.phar composer | head -n1) @@ -229,7 +262,7 @@ if [[ "$#" == "1" ]]; then fi function prepare_hhvm_ini() { # we have to do this twice, as the WEB_CONCURRENCY setting is evaluated using PHP code, not ${...} syntax which HHVM does not support; if a value for $1 is passed then it won't echo messages upon second invocation -if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$bp_dir/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then +if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:=$(findconfig "$hhvm_version" "$bp_dir/conf/hhvm/php.ini.php")} && $verbose && ! ${1:-} ) ]]; then echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 fi php_configs=( "-c" "$(php_passthrough "$php_config")" ) @@ -241,13 +274,13 @@ fi } prepare_hhvm_ini -if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$bp_dir/conf/apache2/default_include.conf"} && $verbose ) ]]; then +if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:=$(findconfig "$httpd_version" "$bp_dir/conf/apache2/default_include.conf")} && $verbose ) ]]; then echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 fi httpd_config_include=$(php_passthrough "$httpd_config_include") export HEROKU_PHP_HTTPD_CONFIG_INCLUDE="$httpd_config_include" -if [[ -n ${httpd_config:-} || ( ${httpd_config:="$bp_dir/conf/apache2/heroku.conf"} && $verbose) ]]; then +if [[ -n ${httpd_config:-} || ( ${httpd_config:=$(findconfig "$httpd_version" "$bp_dir/conf/apache2/heroku.conf")} && $verbose) ]]; then echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 fi httpd_config=$(php_passthrough "$httpd_config") diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index 4343dfbe3..f3436efd6 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -9,8 +9,16 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +if ! type -p "realpath" > /dev/null; then + # cedar-14 doesn't have realpath + # must be a function so subshells, including $(…), can use it + realpath() { + readlink "$@" + } +fi + # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) verbose= @@ -41,6 +49,25 @@ touch_log() { mkdir -p $(dirname "$1") && touch "$1" } +findconfig() { + local dir=$(dirname "$2") + local file=$(basename "$2") + IFS='.' read -r -a version <<< "$1" # read the parts of $1 (version number) into an array, e.g. (7 2 33) + + # iterate "backwards" over version parts so we try "7/2/11" first, then "7/2", then "7" for a version "7.2.11" + # we go down to 0, which will yield an empty string, for the last fallback layer without any version number + for (( i = ${#version[@]}; i >= 0; i--)); do + version_dir=$(IFS=/; echo "${version[*]:0:$i}") # set IFS to "/" for merging, but echo is a builtin, so it must be a subshell and a separate command + full_path="${dir}/${version_dir}${version_dir:+/}${file}" # concat, but if scandir is empty (last fallback), don't produce a double slash + if [[ -f "$full_path" ]]; then + echo "$full_path"; + return 0; + fi + done + echo "$2" + return 1; +} + print_help() { cat >&2 <<-EOF @@ -57,7 +84,8 @@ print_help() { Recommended approach when customizing Nginx's config in most cases, unless you need to set http or fundamental server level options. - [default: /conf/nginx/default_include.conf.php] + [default: /conf/nginx/default_include.conf.php, + or a more version-specific file from a subdirectory] -c The path to the full configuration file that is included after Heroku's (or your local) Nginx config is loaded. It must contain an 'http { ... }' block @@ -65,13 +93,15 @@ print_help() { and 'root' (see option -C above), but no global, directives (globals are read from the system's default Nginx configuration files). - [default: /conf/nginx/heroku.conf.php] + [default: /conf/nginx/heroku.conf.php, + or a more version-specific file from a subdirectory] -h, --help Display this help screen and exit. -I The path to an extra php.ini to use in addition to the default HHVM php.ini (see option -i below). -i The path to the php.ini file to use. It is highly recommended to use the -I option (see above) instead. - [default: /conf/hhvm/php.ini.php] + [default: /conf/hhvm/php.ini.php, + or a more version-specific file from a subdirectory] -l Path to additional log file to tail to STDERR so its contents appear in 'heroku logs'. If the file does not exist, it will be created. Wildcards are allowed, but @@ -197,6 +227,9 @@ logs+=( "/tmp/heroku.nginx_access.$PORT.log" ) hhvm --php -r 'exit((int)version_compare(HHVM_VERSION, "3.0.1", "<"));' || { echo "This program requires HHVM 3.0.1 or newer" >&2; exit 1; } +hhvm_version="$(hhvm --php -r 'echo HHVM_VERSION;')" +nginx_version="$(nginx -v 2>&1 | grep -oP "nginx\/\K[\d\.]+")" # \K, available with -P, resets the start of the match + # make sure we run a local composer.phar if present, or global composer if not composer() { local composer_bin=$(which ./composer.phar composer | head -n1) @@ -229,7 +262,7 @@ if [[ "$#" == "1" ]]; then fi function prepare_hhvm_ini() { # we have to do this twice, as the WEB_CONCURRENCY setting is evaluated using PHP code, not ${...} syntax which HHVM does not support; if a value for $1 is passed then it won't echo messages upon second invocation -if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:="$bp_dir/conf/hhvm/php.ini.php"} && $verbose && ! ${1:-} ) ]]; then +if [[ ( -n ${php_config:-} && ! ${1:-} ) || ( ${php_config:=$(findconfig "$hhvm_version" "$bp_dir/conf/hhvm/php.ini.php")} && $verbose && ! ${1:-} ) ]]; then echo "Using HHVM configuration (php.ini) file '${php_config#$HEROKU_APP_DIR/}'" >&2 fi php_configs=( "-c" "$(php_passthrough "$php_config")" ) @@ -241,13 +274,13 @@ fi } prepare_hhvm_ini -if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$bp_dir/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then +if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:=$(findconfig "$nginx_version" "$bp_dir/conf/nginx/default_include.conf.php")} && $verbose ) ]]; then echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 fi nginx_config_include=$(php_passthrough "$nginx_config_include") export HEROKU_PHP_NGINX_CONFIG_INCLUDE="$nginx_config_include" -if [[ -n ${nginx_config:-} || ( ${nginx_config:="$bp_dir/conf/nginx/heroku.conf.php"} && $verbose) ]]; then +if [[ -n ${nginx_config:-} || ( ${nginx_config:=$(findconfig "$nginx_version" "$bp_dir/conf/nginx/heroku.conf.php")} && $verbose) ]]; then echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 fi nginx_config=$(php_passthrough "$nginx_config") diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index 81cadedd4..452f151ce 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -9,8 +9,16 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +if ! type -p "realpath" > /dev/null; then + # cedar-14 doesn't have realpath + # must be a function so subshells, including $(…), can use it + realpath() { + readlink "$@" + } +fi + # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) verbose= @@ -41,6 +49,25 @@ touch_log() { mkdir -p $(dirname "$1") && touch "$1" } +findconfig() { + local dir=$(dirname "$2") + local file=$(basename "$2") + IFS='.' read -r -a version <<< "$1" # read the parts of $1 (version number) into an array, e.g. (7 2 33) + + # iterate "backwards" over version parts so we try "7/2/11" first, then "7/2", then "7" for a version "7.2.11" + # we go down to 0, which will yield an empty string, for the last fallback layer without any version number + for (( i = ${#version[@]}; i >= 0; i--)); do + version_dir=$(IFS=/; echo "${version[*]:0:$i}") # set IFS to "/" for merging, but echo is a builtin, so it must be a subshell and a separate command + full_path="${dir}/${version_dir}${version_dir:+/}${file}" # concat, but if scandir is empty (last fallback), don't produce a double slash + if [[ -f "$full_path" ]]; then + echo "$full_path"; + return 0; + fi + done + echo "$2" + return 1; +} + print_help() { cat >&2 <<-EOF @@ -57,20 +84,23 @@ print_help() { Recommended approach when customizing Apache2's config in most cases, unless you need to set fundamental server level options. - [default: /conf/apache2/default_include.conf] + [default: /conf/apache2/default_include.conf, + or a more version-specific file from a subdirectory] -c The path to the full VHost configuration file that is included after Heroku's (or your local) Apache2 config is loaded. Must contain a 'Listen \${PORT}' directive and should have a '' and likely also a '' section (see option -C above). - [default: /conf/apache2/heroku.conf] + [default: /conf/apache2/heroku.conf, + or a more version-specific file from a subdirectory] -F The path to the configuration file to include at the end of php-fpm.conf (see option -f below), in the '[www]' pool section. Recommended approach when customizing PHP-FPM's configuration in most cases, unless you need to set global options. -f The path to the full PHP-FPM configuration file. - [default: /conf/php/php-fpm.conf] + [default: /conf/php/php-fpm.conf, + or a more version-specific file from a subdirectory] -h, --help Display this help screen and exit. -i The path to the php.ini file to use. [default: /conf/php/php.ini] @@ -206,6 +236,9 @@ php -n -r 'exit((int)version_compare(PHP_VERSION, "5.5.11", "<"));' || { echo "T { php-fpm -n -v | php -n -r 'exit((int)version_compare(preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin")), "5.5.11", "<"));'; } || { echo "This program requires PHP 5.5.11 or newer; check your 'php-fpm' command." >&2; exit 1; } { { httpd -v | php -n -r 'exit((int)version_compare(preg_replace("#^Server version: Apache/(\S+).+$#sm", "\\1", file_get_contents("php://stdin")), "2.4.10", "<"));'; } && { httpd -t -D DUMP_MODULES | grep 'proxy_fcgi_module' > /dev/null; }; } || { echo "This program requires Apache 2.4.10 or newer with mod_proxy and mod_proxy_fcgi enabled; check your 'httpd' command." >&2; exit 1; } +php_version="$(php-fpm -n -v | php -n -r 'echo preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin"));')" +httpd_version="$(httpd -v | php -n -r 'echo preg_replace("#^Server version: Apache/(\S+).+$#sm", "\\1", file_get_contents("php://stdin"));')" + # make sure we run a local composer.phar if present, or global composer if not composer() { local composer_bin=$(which ./composer.phar composer | head -n1) @@ -243,7 +276,7 @@ if [[ -n ${fpm_config_include:-} ]]; then export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" fi -if [[ -n ${fpm_config:-} || ( ${fpm_config:="$bp_dir/conf/php/php-fpm.conf"} && $verbose ) ]]; then +if [[ -n ${fpm_config:-} || ( ${fpm_config:=$(findconfig "$php_version" "$bp_dir/conf/php/php-fpm.conf")} && $verbose ) ]]; then echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 fi fpm_config=$(php_passthrough "$fpm_config") @@ -253,13 +286,13 @@ if [[ -n ${php_config:-} ]]; then php_config=$(php_passthrough "$php_config") fi -if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:="$bp_dir/conf/apache2/default_include.conf"} && $verbose ) ]]; then +if [[ -n ${httpd_config_include:-} || ( ${httpd_config_include:=$(findconfig "$httpd_version" "$bp_dir/conf/apache2/default_include.conf")} && $verbose ) ]]; then echo "Using Apache2 VirtualHost-level configuration include '${httpd_config_include#$HEROKU_APP_DIR/}'" >&2 fi httpd_config_include=$(php_passthrough "$httpd_config_include") export HEROKU_PHP_HTTPD_CONFIG_INCLUDE="$httpd_config_include" -if [[ -n ${httpd_config:-} || ( ${httpd_config:="$bp_dir/conf/apache2/heroku.conf"} && $verbose) ]]; then +if [[ -n ${httpd_config:-} || ( ${httpd_config:=$(findconfig "$httpd_version" "$bp_dir/conf/apache2/heroku.conf")} && $verbose) ]]; then echo "Using Apache2 configuration file '${httpd_config#$HEROKU_APP_DIR/}'" >&2 fi httpd_config=$(php_passthrough "$httpd_config") diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index c097b39a3..ff7026ae6 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -9,8 +9,16 @@ shopt -s extglob # for detecting when -l 'logs/*.log' matches nothing shopt -s nullglob +if ! type -p "realpath" > /dev/null; then + # cedar-14 doesn't have realpath + # must be a function so subshells, including $(…), can use it + realpath() { + readlink "$@" + } +fi + # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) verbose= @@ -41,6 +49,25 @@ touch_log() { mkdir -p $(dirname "$1") && touch "$1" } +findconfig() { + local dir=$(dirname "$2") + local file=$(basename "$2") + IFS='.' read -r -a version <<< "$1" # read the parts of $1 (version number) into an array, e.g. (7 2 33) + + # iterate "backwards" over version parts so we try "7/2/11" first, then "7/2", then "7" for a version "7.2.11" + # we go down to 0, which will yield an empty string, for the last fallback layer without any version number + for (( i = ${#version[@]}; i >= 0; i--)); do + version_dir=$(IFS=/; echo "${version[*]:0:$i}") # set IFS to "/" for merging, but echo is a builtin, so it must be a subshell and a separate command + full_path="${dir}/${version_dir}${version_dir:+/}${file}" # concat, but if scandir is empty (last fallback), don't produce a double slash + if [[ -f "$full_path" ]]; then + echo "$full_path"; + return 0; + fi + done + echo "$2" + return 1; +} + print_help() { cat >&2 <<-EOF @@ -57,7 +84,8 @@ print_help() { Recommended approach when customizing Nginx's config in most cases, unless you need to set http or fundamental server level options. - [default: /conf/nginx/default_include.conf.php] + [default: /conf/nginx/default_include.conf.php, + or a more version-specific file from a subdirectory] -c The path to the full configuration file that is included after Heroku's (or your local) Nginx config is loaded. It must contain an 'http { ... }' block @@ -65,14 +93,16 @@ print_help() { and 'root' (see option -C above), but no global, directives (globals are read from the system's default Nginx configuration files). - [default: /conf/nginx/heroku.conf.php] + [default: /conf/nginx/heroku.conf.php, + or a more version-specific file from a subdirectory] -F The path to the configuration file to include at the end of php-fpm.conf (see option -f below), in the '[www]' pool section. Recommended approach when customizing PHP-FPM's configuration in most cases, unless you need to set global options. -f The path to the full PHP-FPM configuration file. - [default: /conf/php/php-fpm.conf] + [default: /conf/php/php-fpm.conf, + or a more version-specific file from a subdirectory] -h, --help Display this help screen and exit. -i The path to the php.ini file to use. [default: /conf/php/php.ini] @@ -207,6 +237,9 @@ php -n -r 'exit((int)version_compare(PHP_VERSION, "5.5.11", "<"));' || { echo "T { php-fpm -n -v | php -n -r 'exit((int)version_compare(preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin")), "5.5.11", "<"));'; } || { echo "This program requires PHP 5.5.11 or newer; check your 'php-fpm' command." >&2; exit 1; } unset -f php-fpm # remove the alias we made earlier that would prevent newrelic from starting on php-fpm -v +php_version="$(php-fpm -n -v | php -n -r 'echo preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin"));')" +nginx_version="$(nginx -v 2>&1 | grep -oP "nginx\/\K[\d\.]+")" # \K, available with -P, resets the start of the match + # make sure we run a local composer.phar if present, or global composer if not composer() { local composer_bin=$(which ./composer.phar composer | head -n1) @@ -244,7 +277,7 @@ if [[ -n ${fpm_config_include:-} ]]; then export HEROKU_PHP_FPM_CONFIG_INCLUDE="$fpm_config_include" fi -if [[ -n ${fpm_config:-} || ( ${fpm_config:="$bp_dir/conf/php/php-fpm.conf"} && $verbose ) ]]; then +if [[ -n ${fpm_config:-} || ( ${fpm_config:=$(findconfig "$php_version" "$bp_dir/conf/php/php-fpm.conf")} && $verbose ) ]]; then echo "Using PHP-FPM configuration file '${fpm_config#$HEROKU_APP_DIR/}'" >&2 fi fpm_config=$(php_passthrough "$fpm_config") @@ -254,13 +287,13 @@ if [[ -n ${php_config:-} ]]; then php_config=$(php_passthrough "$php_config") fi -if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:="$bp_dir/conf/nginx/default_include.conf.php"} && $verbose ) ]]; then +if [[ -n ${nginx_config_include:-} || ( ${nginx_config_include:=$(findconfig "$nginx_version" "$bp_dir/conf/nginx/default_include.conf.php")} && $verbose ) ]]; then echo "Using Nginx server-level configuration include '${nginx_config_include#$HEROKU_APP_DIR/}'" >&2 fi nginx_config_include=$(php_passthrough "$nginx_config_include") export HEROKU_PHP_NGINX_CONFIG_INCLUDE="$nginx_config_include" -if [[ -n ${nginx_config:-} || ( ${nginx_config:="$bp_dir/conf/nginx/heroku.conf.php"} && $verbose) ]]; then +if [[ -n ${nginx_config:-} || ( ${nginx_config:=$(findconfig "$nginx_version" "$bp_dir/conf/nginx/heroku.conf.php")} && $verbose) ]]; then echo "Using Nginx configuration file '${nginx_config#$HEROKU_APP_DIR/}'" >&2 fi nginx_config=$(php_passthrough "$nginx_config") From 6ce78f5e54e490e909a44fd55e5b8be2aef05b2c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:51:26 +0100 Subject: [PATCH 223/553] mini CHANGELOG.md fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d0a8c934..308966f27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ ### CHG - Translate `NEW_RELIC_LOG_LEVEL` values "verbose" and "verbosedebug" to "debug" for `newrelic-daemon` [David Zuelke] -- librdkafka/0.11.6 +- librdkafka/0.11.6 [David Zuelke] ## v145 (2019-10-16) From b1291e94b0b3d0648f6e3cba65d115b2652ad502 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 19:27:13 +0100 Subject: [PATCH 224/553] remove redundant unset in heroku-php-nginx --- bin/heroku-php-nginx | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index ff7026ae6..889685fa8 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -235,7 +235,6 @@ logs+=( "/tmp/heroku.php-fpm.$PORT.log" "/tmp/heroku.php-fpm.www.$PORT.log" "/tm # a bunch of checks; don't load any INIs to prevent newrelic etc from loading, we don't need all that stuff php -n -r 'exit((int)version_compare(PHP_VERSION, "5.5.11", "<"));' || { echo "This program requires PHP 5.5.11 or newer; check your 'php' command." >&2; exit 1; } { php-fpm -n -v | php -n -r 'exit((int)version_compare(preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin")), "5.5.11", "<"));'; } || { echo "This program requires PHP 5.5.11 or newer; check your 'php-fpm' command." >&2; exit 1; } -unset -f php-fpm # remove the alias we made earlier that would prevent newrelic from starting on php-fpm -v php_version="$(php-fpm -n -v | php -n -r 'echo preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin"));')" nginx_version="$(nginx -v 2>&1 | grep -oP "nginx\/\K[\d\.]+")" # \K, available with -P, resets the start of the match From 23e378cfee524415e6565f89815cf2e62b06d3ad Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:23:13 +0100 Subject: [PATCH 225/553] do not copy php-fpm runtime config into platform package archive we dynamically pass this to php-fpm at runtime, so it's redundant --- support/build/php | 1 - 1 file changed, 1 deletion(-) diff --git a/support/build/php b/support/build/php index f54741b59..606628dc9 100755 --- a/support/build/php +++ b/support/build/php @@ -202,7 +202,6 @@ rm ${OUT_PREFIX}/etc/php/php.ini composer.phar cp $(dirname $BASH_SOURCE)/_conf/php/php.ini ${OUT_PREFIX}/etc/php/ cp $(dirname $BASH_SOURCE)/_conf/php/conf.d/*.ini ${OUT_PREFIX}/etc/php/conf.d/ -cp $(dirname $BASH_SOURCE)/../../conf/php/php-fpm.conf ${OUT_PREFIX}/etc/php/ # this gets sourced after package install, so that the buildpack and following buildpacks can invoke cat > ${OUT_PREFIX}/bin/export.php.sh <<'EOF' From 89808f50c35a2c0ce58ae3cf2d5786ae3e036af5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:47:51 +0100 Subject: [PATCH 226/553] pull in version-specific php.ini and extra ini files during PHP builds --- support/build/php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/support/build/php b/support/build/php index 606628dc9..c25d08d9e 100755 --- a/support/build/php +++ b/support/build/php @@ -200,8 +200,14 @@ MANIFEST_EXTRA="${MANIFEST_EXTRA:-"$extra"}" # remove temporary ini file that enables all extensions, and the composer download rm ${OUT_PREFIX}/etc/php/php.ini composer.phar -cp $(dirname $BASH_SOURCE)/_conf/php/php.ini ${OUT_PREFIX}/etc/php/ -cp $(dirname $BASH_SOURCE)/_conf/php/conf.d/*.ini ${OUT_PREFIX}/etc/php/conf.d/ +IFS='.' read -r -a version <<< "$dep_version" # read the parts of $dep_version into an array, e.g. (7 2 33) +# iterate over version parts so we try "" (from index 0) first, then "7", then "7/2/", then "7/2/11" for a version "7.2.11" +# in each case, we copy anything that's in that directory; more specific version configs will this overwrite less specific ones +for (( i = 0; i < ${#version[@]}; i++)); do + version_dir=$(IFS=/; echo "${version[*]:0:$i}") # set IFS to "/" for merging, but echo is a builtin, so it must be a subshell and a separate command + cp $(dirname $BASH_SOURCE)/_conf/php/${version_dir}/php.ini ${OUT_PREFIX}/etc/php/ 2> /dev/null || true + cp $(dirname $BASH_SOURCE)/_conf/php/${version_dir}/conf.d/*.ini ${OUT_PREFIX}/etc/php/conf.d/ 2> /dev/null || true +done # this gets sourced after package install, so that the buildpack and following buildpacks can invoke cat > ${OUT_PREFIX}/bin/export.php.sh <<'EOF' From b004abcaca0c41ad9aa3d7a1f96455f38e9d2ebb Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:50:24 +0100 Subject: [PATCH 227/553] Apply non-default opcache INI settings only to the PHP 5 builds that need them opcache.memory_consumption, opcache.interned_strings_buffer, and opcache.max_accelerated_files have higher defaults in PHP 7 than in PHP 5, so the existing custom limits should apply to PHP 5 only --- CHANGELOG.md | 1 + support/build/_conf/php/5/conf.d/010-ext-zend_opcache.ini | 6 ++++++ support/build/_conf/php/conf.d/010-ext-zend_opcache.ini | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 support/build/_conf/php/5/conf.d/010-ext-zend_opcache.ini diff --git a/CHANGELOG.md b/CHANGELOG.md index 308966f27..df0c21ae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Look for configs relative to buildpack dir, and not to $CWD/vendor/heroku/…, in boot scripts [David Zuelke] - Look for default configs using version specific paths first in boot scripts [David Zuelke] +- Apply non-default opcache INI settings only to the PHP 5 builds that need them [David Zuelke] ## v146 (2018-11-08) diff --git a/support/build/_conf/php/5/conf.d/010-ext-zend_opcache.ini b/support/build/_conf/php/5/conf.d/010-ext-zend_opcache.ini new file mode 100644 index 000000000..34b47fcb3 --- /dev/null +++ b/support/build/_conf/php/5/conf.d/010-ext-zend_opcache.ini @@ -0,0 +1,6 @@ +zend_extension=opcache.so +opcache.enable_cli=1 +opcache.validate_timestamps=0 +opcache.memory_consumption=128 +opcache.interned_strings_buffer=8 +opcache.max_accelerated_files=4000 diff --git a/support/build/_conf/php/conf.d/010-ext-zend_opcache.ini b/support/build/_conf/php/conf.d/010-ext-zend_opcache.ini index bf8db54aa..a949419fe 100644 --- a/support/build/_conf/php/conf.d/010-ext-zend_opcache.ini +++ b/support/build/_conf/php/conf.d/010-ext-zend_opcache.ini @@ -1,7 +1,3 @@ zend_extension=opcache.so opcache.enable_cli=1 opcache.validate_timestamps=0 -opcache.fast_shutdown=0 -opcache.memory_consumption=128 -opcache.interned_strings_buffer=8 -opcache.max_accelerated_files=4000 From 6bb6bb9f1efb2b40f3c7c2e86b2d5655c92c14b5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:56:01 +0100 Subject: [PATCH 228/553] PHP/7.3.0 FPM config is different to enable better log defaults (16k line limit, no decoration) --- CHANGELOG.md | 4 + bin/util/eol.php | 1 + conf/php/7/3/php-fpm.conf | 580 ++++++++++++++++++ .../no-debug-non-zts-20121212/blackfire | 3 + .../no-debug-non-zts-20121212/newrelic | 3 + .../no-debug-non-zts-20180731/apcu-5.1.12 | 5 + .../no-debug-non-zts-20180731/cassandra-1.3.2 | 5 + .../no-debug-non-zts-20180731/ev-1.0.4 | 5 + .../no-debug-non-zts-20180731/event-2.4.1 | 5 + .../no-debug-non-zts-20180731/imagick-3.4.3 | 5 + .../no-debug-non-zts-20180731/mongodb-1.5.3 | 5 + .../no-debug-non-zts-20180731/oauth-2.0.3 | 5 + .../no-debug-non-zts-20180731/raphf-2.0.0 | 5 + .../no-debug-non-zts-20180731/rdkafka-3.0.5 | 5 + .../no-debug-non-zts-20180731/redis-4.1.1 | 5 + support/build/php | 5 +- support/build/php-7.3.0 | 5 + 17 files changed, 650 insertions(+), 1 deletion(-) create mode 100644 conf/php/7/3/php-fpm.conf create mode 100755 support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.12 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/event-2.4.1 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/redis-4.1.1 create mode 100755 support/build/php-7.3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index df0c21ae3..6bca5839f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v147 (2018-??-??) +### ADD + +- PHP/7.3.0 [David Zuelke] + ### CHG - Look for configs relative to buildpack dir, and not to $CWD/vendor/heroku/…, in boot scripts [David Zuelke] diff --git a/bin/util/eol.php b/bin/util/eol.php index fa9fdd408..21f9da768 100644 --- a/bin/util/eol.php +++ b/bin/util/eol.php @@ -7,6 +7,7 @@ "7.0" => array("2017-12-03", "2018-12-03"), "7.1" => array("2018-12-01", "2019-12-01"), "7.2" => array("2019-11-30", "2020-11-30"), + "7.3" => array("2020-12-06", "2021-12-06"), ); if(!isset($eol[PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION])) exit(0); diff --git a/conf/php/7/3/php-fpm.conf b/conf/php/7/3/php-fpm.conf new file mode 100644 index 000000000..8a0f7c75c --- /dev/null +++ b/conf/php/7/3/php-fpm.conf @@ -0,0 +1,580 @@ +;;;;;;;;;;;;;;;;;;;;; +; FPM Configuration ; +;;;;;;;;;;;;;;;;;;;;; + +; All relative paths in this configuration file are relative to PHP's install +; prefix (/app/.heroku/php). This prefix can be dynamically changed by using the +; '-p' argument from the command line. + +;;;;;;;;;;;;;;;;;; +; Global Options ; +;;;;;;;;;;;;;;;;;; + +[global] +; Pid file +; Note: the default prefix is /app/.heroku/php/var +; Default Value: none +;pid = run/php-fpm.pid + +; Error log file +; If it's set to "syslog", log is sent to syslogd instead of being written +; into a local file. +; Note: the default prefix is /app/.heroku/php/var +; Default Value: log/php-fpm.log +error_log = /tmp/heroku.php-fpm.${PORT}.log + +; syslog_facility is used to specify what type of program is logging the +; message. This lets syslogd specify that messages from different facilities +; will be handled differently. +; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON) +; Default Value: daemon +;syslog.facility = daemon + +; syslog_ident is prepended to every message. If you have multiple FPM +; instances running on the same server, you can change the default value +; which must suit common needs. +; Default Value: php-fpm +;syslog.ident = php-fpm + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +log_level = warning + +; Log limit on number of characters in the single line (log entry). If the +; line is over the limit, it is wrapped on multiple lines. The limit is for +; all logged characters including message prefix and suffix if present. However +; the new line character does not count into it as it is present only when +; logging to a file descriptor. It means the new line character is not present +; when logging to syslog. +; Default Value: 1024 +log_limit = 10000 ; that's Heroku's line length limit + +; Log buffering specifies if the log line is buffered which means that the +; line is written in a single write operation. If the value is false, then the +; data is written directly into the file descriptor. It is an experimental +; option that can potentionaly improve logging performance and memory usage +; for some heavy logging scenarios. This option is ignored if logging to syslog +; as it has to be always buffered. +; Default value: yes +;log_buffering = no + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +;emergency_restart_threshold = 0 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;emergency_restart_interval = 0 + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;process_control_timeout = 0 + +; The maximum number of processes FPM will fork. This has been designed to control +; the global number of processes when using dynamic PM within a lot of pools. +; Use it with caution. +; Note: A value of 0 indicates no limit +; Default Value: 0 +; process.max = 128 + +; Specify the nice(2) priority to apply to the master process (only if set) +; The value can vary from -19 (highest priority) to 20 (lowest priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool process will inherit the master process priority +; unless specified otherwise +; Default Value: no set +; process.priority = -19 + +; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. +; Default Value: yes +daemonize = no + +; Set open file descriptor rlimit for the master process. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit for the master process. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Specify the event mechanism FPM will use. The following is available: +; - select (any POSIX os) +; - poll (any POSIX os) +; - epoll (linux >= 2.5.44) +; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0) +; - /dev/poll (Solaris >= 7) +; - port (Solaris >= 10) +; Default Value: not set (auto detection) +;events.mechanism = epoll + +; When FPM is built with systemd integration, specify the interval, +; in seconds, between health report notification to systemd. +; Set to 0 to disable. +; Available Units: s(econds), m(inutes), h(ours) +; Default Unit: seconds +; Default value: 10 +;systemd_interval = 10 + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; Multiple pools of child processes may be started with different listening +; ports and different management options. The name of the pool will be +; used in logs and stats. There is no limitation on the number of pools which +; FPM can handle. Your system will tell you anyway :) + +; Include one or more files. If glob(3) exists, it is used to include a bunch of +; files from a glob(3) pattern. This directive can be used everywhere in the +; file. +; Relative path can also be used. They will be prefixed by: +; - the global prefix if it's been set (-p argument) +; - /app/.heroku/php otherwise + +; Start a new pool named 'www'. +; the variable $pool can be used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'access.log' +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /app/.heroku/php) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = nobody +;group = nobody + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = /tmp/heroku.fcgi.${PORT}.sock + +; Set listen(2) backlog. +; Default Value: 511 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 511 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0660 +;listen.owner = nobody +;listen.group = nobody +; Mode is set to 0666 so it works both in dynos and in containers (where FPM master, and thus the socket, belong to root) +; This can't portably done via listen.owner, as the dyno user can't chown the socket to e.g. nobody or daemon ownership +listen.mode = 0666 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 + +; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; or group is differrent than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = static + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = ${WEB_CONCURRENCY} + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +;pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 3 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: ${prefix}/share/php/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +slowlog = /tmp/heroku.php-fpm.${PORT}.www.slowlog + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; Depth of slow log stack trace. +; Default Value: 20 +;request_slowlog_trace_depth = 20 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + +; Decorate worker output with prefix and suffix containing information about +; the child that writes to the log and if stdout or stderr is used as well as +; log level and time. This options is used only if catch_workers_output is yes. +; Settings to "no" will output data as written to the stdout or stderr. +; Default value: yes +decorate_workers_output = no + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +clear_env = no + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; execute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 .php7 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /app/.heroku/php) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M + +; log PHP errors to a file, otherwise they're bubbled up through FPM via stderr +php_value[error_log] = /tmp/heroku.php-fpm.www.${PORT}.log + +include=${HEROKU_PHP_FPM_CONFIG_INCLUDE} diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire b/support/build/extensions/no-debug-non-zts-20121212/blackfire index a96931221..c710c7c49 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/blackfire +++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire @@ -29,6 +29,9 @@ case ${ZEND_MODULE_API_VERSION} in 20170718) series=7.2 ;; + 20180731) + series=7.3 + ;; *) echo "Unsupported PHP/Zend Module API version: ${ZEND_MODULE_API_VERSION}" exit 1 diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 0e9a9dfe9..03969dcb6 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -36,6 +36,9 @@ case ${ZEND_MODULE_API_VERSION} in 20170718) series=7.2 ;; + 20180731) + series=7.3 + ;; esac dep_manifest=${dep_package}_php-$series.composer.json diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.12 new file mode 100755 index 000000000..167f1d6af --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.12 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 new file mode 100755 index 000000000..1cb6f2dc1 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0, libraries/libcassandra-2.9.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 new file mode 100755 index 000000000..136c517fa --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.1 new file mode 100755 index 000000000..f80a89886 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.1 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 new file mode 100755 index 000000000..f314dc774 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 new file mode 100755 index 000000000..83e8467b9 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 new file mode 100755 index 000000000..0d8e053e4 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 new file mode 100755 index 000000000..7a18ce5b9 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 new file mode 100755 index 000000000..8b470656f --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0, libraries/librdkafka-0.11.6 + +source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.1.1 new file mode 100755 index 000000000..1ccdb3f0d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-4.1.1 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php b/support/build/php index c25d08d9e..64446de40 100755 --- a/support/build/php +++ b/support/build/php @@ -27,6 +27,8 @@ if [[ $dep_version == *alpha* ]] || [[ $dep_version == *beta* ]] || [[ $dep_vers dep_url=https://downloads.php.net/~krakjoe/${dep_archive_name} elif [[ $dep_version == 7.2.* ]]; then dep_url=https://downloads.php.net/~pollita/${dep_archive_name} + elif [[ $dep_version == 7.3.* ]]; then + dep_url=https://downloads.php.net/~cmb/${dep_archive_name} fi else dep_url=https://php.net/get/${dep_archive_name}/from/this/mirror @@ -102,7 +104,8 @@ fi configureopts=() if [[ $dep_version == 7.* ]]; then configureopts+=("--enable-opcache-file") - + configureopts+=("--without-libzip") # FIXME: change to --with-libzip once cedar-14 is EOL, as the other stacks have an up to date enough version + if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then configureopts+=("--with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix}") else diff --git a/support/build/php-7.3.0 b/support/build/php-7.3.0 new file mode 100755 index 000000000..788f4a78c --- /dev/null +++ b/support/build/php-7.3.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: libraries/libc-client-2007f + +source $(dirname $0)/php From df68c377893e0bdc8d01f544501613186017dc73 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:57:18 +0100 Subject: [PATCH 229/553] PHP/7.2.13 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 | 2 +- support/build/{php-7.2.12 => php-7.2.13} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.12 => php-7.2.13} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bca5839f..a5633f59a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.3.0 [David Zuelke] +- PHP/7.2.13 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 index a49941682..29ff1af11 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 index 4c70ccdce..cffd3606b 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 22b80ae6e..893ee0a53 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.13, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 815a1f7ce..c772bbf2d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 index c4211ed83..4267ca544 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 6ba8a5832..fc7eb1405 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 index a78b65044..8e9ec25ed 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.13, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index fb3305890..56732f404 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index bc5563d75..ddda9fe77 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 index f98422168..475c1766a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index a0d21c362..30259224f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.13, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 3c9599ff0..07c2f7f34 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 60408df4d..43669a395 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12, libraries/librdkafka-0.11.6 +# Build Deps: php-7.2.13, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index d7c456aed..367208f36 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 index d7c456aed..367208f36 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.12 +# Build Deps: php-7.2.13 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.12 b/support/build/php-7.2.13 similarity index 100% rename from support/build/php-7.2.12 rename to support/build/php-7.2.13 From 1e68b829dd512e25888d6e546ad30af181449f2f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 22:57:59 +0100 Subject: [PATCH 230/553] PHP/7.1.25 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 | 2 +- support/build/{php-7.1.24 => php-7.1.25} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.24 => php-7.1.25} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5633f59a..68fbe2b71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.3.0 [David Zuelke] - PHP/7.2.13 [David Zuelke] +- PHP/7.1.25 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 index 67530a0cd..649f09d90 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 index b0f229f9c..7fbaf0059 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index e52d64183..ca4c16897 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.24, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.25, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index a7dea70f0..39325170f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 index e1261701f..bbdd2605a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 74bc1b75d..73e68afab 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 index 9cc4c6d89..06f818c4b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.25, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 index 4b31e0e1e..3b2c66fa6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 index 5c5f34c39..b65f9334a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 index 36bfcb24c..affd5d20f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index c8a53958b..704f939be 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.25, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index a40802659..c9618c0f8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 242a7e88f..2b166c33f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24, libraries/librdkafka-0.11.6 +# Build Deps: php-7.1.25, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 6da254768..90ae7a0bf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 index 6da254768..90ae7a0bf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.24 +# Build Deps: php-7.1.25 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.24 b/support/build/php-7.1.25 similarity index 100% rename from support/build/php-7.1.24 rename to support/build/php-7.1.25 From fd9ae1071a4ff3dfe293afb22ca5418d3f19a5cd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:02:46 +0100 Subject: [PATCH 231/553] PHP/7.0.33 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.7.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 | 2 +- support/build/{php-7.0.32 => php-7.0.33} | 0 support/build/{php-min-7.0.32 => php-min-7.0.33} | 0 20 files changed, 18 insertions(+), 17 deletions(-) rename support/build/{php-7.0.32 => php-7.0.33} (100%) rename support/build/{php-min-7.0.32 => php-min-7.0.33} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68fbe2b71..88a746bcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.3.0 [David Zuelke] - PHP/7.2.13 [David Zuelke] - PHP/7.1.25 [David Zuelke] +- PHP/7.0.33 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index d70b061f8..aeade1e6a 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.32.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.0.33.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/composer-1.7.2 b/support/build/composer-1.7.2 index dc4336d87..8021fd7c6 100755 --- a/support/build/composer-1.7.2 +++ b/support/build/composer-1.7.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.32 +# Build Deps: php-min-7.0.33 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 index b675f4051..7f597ee5d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 index a8f929146..c30a7fb4e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 85b8eee37..7eb033b5a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.32, libraries/libcassandra-2.9.0 +# Build Deps: php-7.0.33, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 4595abacc..a3fd7302b 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 index 9293a17a5..f26489c2a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 194291429..52adcbffd 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 index 4342bea58..fccce3a69 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.33, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 index a3f3f9734..691bc288e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 index 0a5121dcf..c2a75e674 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 index a679b98e5..d65f0c62f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 index 004aa2e8c..ce61395cb 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.33, extensions/no-debug-non-zts-20151012/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 2659f6a18..cbc6ab9ba 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index d1b497641..339995c8a 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32, libraries/librdkafka-0.11.6 +# Build Deps: php-7.0.33, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index 2ab82502a..ac9457e77 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 index 2ab82502a..ac9457e77 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.32 +# Build Deps: php-7.0.33 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.0.32 b/support/build/php-7.0.33 similarity index 100% rename from support/build/php-7.0.32 rename to support/build/php-7.0.33 diff --git a/support/build/php-min-7.0.32 b/support/build/php-min-7.0.33 similarity index 100% rename from support/build/php-min-7.0.32 rename to support/build/php-min-7.0.33 From fb4d508687bbcea892ff413bdd561a524fea9a42 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:06:45 +0100 Subject: [PATCH 232/553] PHP/5.6.39 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 | 2 +- support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 | 2 +- .../build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 | 2 +- support/build/{php-5.6.38 => php-5.6.39} | 0 19 files changed, 18 insertions(+), 17 deletions(-) rename support/build/{php-5.6.38 => php-5.6.39} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88a746bcb..f2b23b1b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.2.13 [David Zuelke] - PHP/7.1.25 [David Zuelke] - PHP/7.0.33 [David Zuelke] +- PHP/5.6.39 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 index edef184fd..beb192092 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index b07f2535f..227899b7d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 8271945e9..8359a9a49 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38, libraries/libcassandra-2.9.0 +# Build Deps: php-5.6.39, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 560903c78..b32741e63 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 index 369bb3d78..4ae9cdcb8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 8a463cec4..82ea1e1b0 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index c6d51ff46..53c154938 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.39, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index 30671752e..52631dabc 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 index 5eb90b908..29a3b4d88 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 799f119bc..aa8c71bd8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 96aeb9b45..5b5107076 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 index 96aeb9b45..5b5107076 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 1d43c337d..8d86100f3 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.39, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 4e726ecf4..3d452f3f1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index c38513652..12c00beee 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38, libraries/librdkafka-0.11.6 +# Build Deps: php-5.6.39, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index 5b7f6cb41..ec29a565b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 index 5b7f6cb41..ec29a565b 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.38 +# Build Deps: php-5.6.39 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.38 b/support/build/php-5.6.39 similarity index 100% rename from support/build/php-5.6.38 rename to support/build/php-5.6.39 From 026b36a63deedade8727d7252f042a457e337785 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:08:45 +0100 Subject: [PATCH 233/553] ext-phalcon/3.4.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{phalcon-3.4.1 => phalcon-3.4.2} | 0 .../no-debug-non-zts-20131226/{phalcon-3.4.1 => phalcon-3.4.2} | 0 .../no-debug-non-zts-20151012/{phalcon-3.4.1 => phalcon-3.4.2} | 0 .../no-debug-non-zts-20160303/{phalcon-3.4.1 => phalcon-3.4.2} | 0 .../no-debug-non-zts-20170718/{phalcon-3.4.1 => phalcon-3.4.2} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.4.1 => phalcon-3.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.4.1 => phalcon-3.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.4.1 => phalcon-3.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.4.1 => phalcon-3.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.4.1 => phalcon-3.4.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2b23b1b9..cb3866e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/7.1.25 [David Zuelke] - PHP/7.0.33 [David Zuelke] - PHP/5.6.39 [David Zuelke] +- ext-phalcon/3.4.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.1 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.1 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.1 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.1 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.1 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 From 120bdbc9597bfc0eab9539590ac61f52b0066739 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:09:43 +0100 Subject: [PATCH 234/553] ext-newrelic/8.4.0.231 --- CHANGELOG.md | 1 + .../{newrelic-8.3.0.226 => newrelic-8.4.0.231} | 0 .../{newrelic-8.3.0.226 => newrelic-8.4.0.231} | 0 .../{newrelic-8.3.0.226 => newrelic-8.4.0.231} | 0 .../{newrelic-8.3.0.226 => newrelic-8.4.0.231} | 0 .../{newrelic-8.3.0.226 => newrelic-8.4.0.231} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.3.0.226 => newrelic-8.4.0.231} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.3.0.226 => newrelic-8.4.0.231} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.3.0.226 => newrelic-8.4.0.231} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.3.0.226 => newrelic-8.4.0.231} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.3.0.226 => newrelic-8.4.0.231} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3866e8d..c2c1045b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - PHP/7.0.33 [David Zuelke] - PHP/5.6.39 [David Zuelke] - ext-phalcon/3.4.2 [David Zuelke] +- ext-newrelic/8.4.0.231 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.3.0.226 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.4.0.231 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.3.0.226 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.4.0.231 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.3.0.226 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.4.0.231 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.3.0.226 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.4.0.231 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.3.0.226 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.4.0.231 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.3.0.226 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.4.0.231 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.3.0.226 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.4.0.231 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.3.0.226 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.4.0.231 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.3.0.226 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.4.0.231 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.3.0.226 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.4.0.231 From af8ffefbecdffa375ebd4aaf9d56c4a316bf3d29 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:10:42 +0100 Subject: [PATCH 235/553] ext-redis/4.2.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{redis-4.1.1 => redis-4.2.0} | 0 .../no-debug-non-zts-20131226/{redis-4.1.1 => redis-4.2.0} | 0 .../no-debug-non-zts-20151012/{redis-4.1.1 => redis-4.2.0} | 0 .../no-debug-non-zts-20160303/{redis-4.1.1 => redis-4.2.0} | 0 .../no-debug-non-zts-20170718/{redis-4.1.1 => redis-4.2.0} | 0 .../no-debug-non-zts-20180731/{redis-4.1.1 => redis-4.2.0} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-4.1.1 => redis-4.2.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-4.1.1 => redis-4.2.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-4.1.1 => redis-4.2.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-4.1.1 => redis-4.2.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{redis-4.1.1 => redis-4.2.0} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{redis-4.1.1 => redis-4.2.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2c1045b0..02c962122 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - PHP/5.6.39 [David Zuelke] - ext-phalcon/3.4.2 [David Zuelke] - ext-newrelic/8.4.0.231 [David Zuelke] +- ext-redis/4.2.0 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.2.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-4.1.1 rename to support/build/extensions/no-debug-non-zts-20121212/redis-4.2.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-4.1.1 rename to support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.2.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-4.1.1 rename to support/build/extensions/no-debug-non-zts-20151012/redis-4.2.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-4.1.1 rename to support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/redis-4.1.1 rename to support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.1.1 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/redis-4.1.1 rename to support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 From f0e2807e536b1b8f84e56ed40c50387d279bffdd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:12:02 +0100 Subject: [PATCH 236/553] ext-apcu/5.1.14 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20151012/{apcu-5.1.12 => apcu-5.1.14} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.12 => apcu-5.1.14} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.12 => apcu-5.1.14} | 0 .../no-debug-non-zts-20180731/{apcu-5.1.12 => apcu-5.1.14} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.12 => apcu-5.1.14} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.12 => apcu-5.1.14} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.12 => apcu-5.1.14} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{apcu-5.1.12 => apcu-5.1.14} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02c962122..ccbf99b36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - ext-phalcon/3.4.2 [David Zuelke] - ext-newrelic/8.4.0.231 [David Zuelke] - ext-redis/4.2.0 [David Zuelke] +- ext-apcu/5.1.14 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.14 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.12 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.14 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.14 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.12 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.14 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.14 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.12 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.14 diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.12 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.14 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.12 rename to support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.14 From 2dd10a4cd1d1054cd012e4774a8259d74a4c3342 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:12:55 +0100 Subject: [PATCH 237/553] ext-event/2.4.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.4.1 => event-2.4.2} | 0 .../no-debug-non-zts-20131226/{event-2.4.1 => event-2.4.2} | 0 .../no-debug-non-zts-20151012/{event-2.4.1 => event-2.4.2} | 0 .../no-debug-non-zts-20160303/{event-2.4.1 => event-2.4.2} | 0 .../no-debug-non-zts-20170718/{event-2.4.1 => event-2.4.2} | 0 .../no-debug-non-zts-20180731/{event-2.4.1 => event-2.4.2} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.4.1 => event-2.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.4.1 => event-2.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.4.1 => event-2.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.4.1 => event-2.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.4.1 => event-2.4.2} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.4.1 => event-2.4.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccbf99b36..d67a732d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - ext-newrelic/8.4.0.231 [David Zuelke] - ext-redis/4.2.0 [David Zuelke] - ext-apcu/5.1.14 [David Zuelke] +- ext-event/2.4.2 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.4.1 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.4.1 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.4.1 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.4.1 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.4.1 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.4.2 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.1 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.4.1 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.4.2 From 382c0e50be41b8f1a0551759b276df24b4246d2f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Dec 2018 23:16:10 +0100 Subject: [PATCH 238/553] Composer/1.8.0 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{composer-1.7.2 => composer-1.8.0} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{composer-1.7.2 => composer-1.8.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d67a732d3..52532bf76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Look for configs relative to buildpack dir, and not to $CWD/vendor/heroku/…, in boot scripts [David Zuelke] - Look for default configs using version specific paths first in boot scripts [David Zuelke] - Apply non-default opcache INI settings only to the PHP 5 builds that need them [David Zuelke] +- Composer/1.8.0 [David Zuelke] ## v146 (2018-11-08) diff --git a/bin/compile b/bin/compile index aeade1e6a..8c7c29349 100755 --- a/bin/compile +++ b/bin/compile @@ -231,7 +231,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.7.2.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.8.0.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.7.2 b/support/build/composer-1.8.0 similarity index 100% rename from support/build/composer-1.7.2 rename to support/build/composer-1.8.0 From 00814f75b2d9a8951cd8e44cdbdacb9352018574 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Dec 2018 18:32:09 +0100 Subject: [PATCH 239/553] v147 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52532bf76..f4c30834f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v147 (2018-??-??) +## v147 (2018-12-13) ### ADD From 48f64cfda5fb4be9545ae1b24de31aab8cbb12a8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:41:24 +0100 Subject: [PATCH 240/553] Fix #311: BSD grep doesn't support Perl expression mode --- CHANGELOG.md | 6 ++++++ bin/heroku-hhvm-nginx | 2 +- bin/heroku-php-nginx | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4c30834f..dff977901 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v148 (2018-12-??) + +### FIX + +- BSD grep doesn't support Perl expression mode (#311) [David Zuelke] + ## v147 (2018-12-13) ### ADD diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index f3436efd6..f9f5165ca 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -228,7 +228,7 @@ logs+=( "/tmp/heroku.nginx_access.$PORT.log" ) hhvm --php -r 'exit((int)version_compare(HHVM_VERSION, "3.0.1", "<"));' || { echo "This program requires HHVM 3.0.1 or newer" >&2; exit 1; } hhvm_version="$(hhvm --php -r 'echo HHVM_VERSION;')" -nginx_version="$(nginx -v 2>&1 | grep -oP "nginx\/\K[\d\.]+")" # \K, available with -P, resets the start of the match +nginx_version="$(nginx -v 2>&1 | hhvm --php -r 'echo preg_replace("#.*nginx/([\d\.]+)$#sm", "\\1", file_get_contents("php://stdin"));')" # make sure we run a local composer.phar if present, or global composer if not composer() { diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index 889685fa8..b9a69e5fd 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -237,7 +237,7 @@ php -n -r 'exit((int)version_compare(PHP_VERSION, "5.5.11", "<"));' || { echo "T { php-fpm -n -v | php -n -r 'exit((int)version_compare(preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin")), "5.5.11", "<"));'; } || { echo "This program requires PHP 5.5.11 or newer; check your 'php-fpm' command." >&2; exit 1; } php_version="$(php-fpm -n -v | php -n -r 'echo preg_replace("#PHP (\S+) \(fpm-fcgi\).+$#sm", "\\1", file_get_contents("php://stdin"));')" -nginx_version="$(nginx -v 2>&1 | grep -oP "nginx\/\K[\d\.]+")" # \K, available with -P, resets the start of the match +nginx_version="$(nginx -v 2>&1 | php -n -r 'echo preg_replace("#.*nginx/([\d\.]+)$#sm", "\\1", file_get_contents("php://stdin"));')" # make sure we run a local composer.phar if present, or global composer if not composer() { From 260ee3114a93a6e6d9f46143b0d2e868b9435c05 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:51:55 +0100 Subject: [PATCH 241/553] ext-apcu/5.1.16 --- CHANGELOG.md | 4 ++++ .../no-debug-non-zts-20151012/{apcu-5.1.14 => apcu-5.1.16} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.14 => apcu-5.1.16} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.14 => apcu-5.1.16} | 0 .../no-debug-non-zts-20180731/{apcu-5.1.14 => apcu-5.1.16} | 0 5 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.14 => apcu-5.1.16} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.14 => apcu-5.1.16} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.14 => apcu-5.1.16} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{apcu-5.1.14 => apcu-5.1.16} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dff977901..c28f7daf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v148 (2018-12-??) +### ADD + +- ext-apcu/5.1.16 [David Zuelke] + ### FIX - BSD grep doesn't support Perl expression mode (#311) [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.14 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.16 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.14 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.16 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.14 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.14 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.14 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.14 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.14 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.14 rename to support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 From a1a48d9dbdba73721e54be05772e662d5636c9fa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:53:52 +0100 Subject: [PATCH 242/553] ext-blackfire/1.24.2 --- CHANGELOG.md | 1 + .../{blackfire-1.23.1 => blackfire-1.24.2} | 0 .../{blackfire-1.23.1 => blackfire-1.24.2} | 0 .../{blackfire-1.23.1 => blackfire-1.24.2} | 0 .../{blackfire-1.23.1 => blackfire-1.24.2} | 0 .../{blackfire-1.23.1 => blackfire-1.24.2} | 0 support/build/extensions/no-debug-non-zts-20180731/blackfire | 4 ++++ .../extensions/no-debug-non-zts-20180731/blackfire-1.24.2 | 4 ++++ 8 files changed, 9 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.23.1 => blackfire-1.24.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.23.1 => blackfire-1.24.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.23.1 => blackfire-1.24.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.23.1 => blackfire-1.24.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.23.1 => blackfire-1.24.2} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20180731/blackfire create mode 100755 support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index c28f7daf3..635abb282 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-apcu/5.1.16 [David Zuelke] +- ext-blackfire/1.24.2 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.23.1 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.23.1 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.23.1 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.23.1 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.23.1 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.23.1 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.23.1 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.23.1 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.23.1 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.23.1 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.2 diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire b/support/build/extensions/no-debug-non-zts-20180731/blackfire new file mode 100755 index 000000000..153289a11 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/blackfire @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ + +source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.2 new file mode 100755 index 000000000..e093375c3 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.2 @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ + +source $(dirname $0)/blackfire From b6c5f5769ae7117fb308317766029231501db0ac Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:54:46 +0100 Subject: [PATCH 243/553] ext-event/2.4.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.4.2 => event-2.4.3} | 0 .../no-debug-non-zts-20131226/{event-2.4.2 => event-2.4.3} | 0 .../no-debug-non-zts-20151012/{event-2.4.2 => event-2.4.3} | 0 .../no-debug-non-zts-20160303/{event-2.4.2 => event-2.4.3} | 0 .../no-debug-non-zts-20170718/{event-2.4.2 => event-2.4.3} | 0 .../no-debug-non-zts-20180731/{event-2.4.2 => event-2.4.3} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.4.2 => event-2.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.4.2 => event-2.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.4.2 => event-2.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.4.2 => event-2.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.4.2 => event-2.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.4.2 => event-2.4.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 635abb282..12204fb99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-apcu/5.1.16 [David Zuelke] - ext-blackfire/1.24.2 [David Zuelke] +- ext-event/2.4.3 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.2 b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.4.2 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.2 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.4.2 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.2 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.4.2 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.2 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.4.2 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.2 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.4.2 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.2 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.4.2 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 From eabbab2153aa2938bdd514d68546f11f7e7a41c5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:56:28 +0100 Subject: [PATCH 244/553] ext-newrelic/8.5.0.235 --- CHANGELOG.md | 1 + .../{newrelic-8.4.0.231 => newrelic-8.5.0.235} | 0 .../{newrelic-8.4.0.231 => newrelic-8.5.0.235} | 0 .../{newrelic-8.4.0.231 => newrelic-8.5.0.235} | 0 .../{newrelic-8.4.0.231 => newrelic-8.5.0.235} | 0 .../{newrelic-8.4.0.231 => newrelic-8.5.0.235} | 0 .../extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 | 4 ++++ 7 files changed, 5 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.4.0.231 => newrelic-8.5.0.235} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.4.0.231 => newrelic-8.5.0.235} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.4.0.231 => newrelic-8.5.0.235} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.4.0.231 => newrelic-8.5.0.235} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.4.0.231 => newrelic-8.5.0.235} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 diff --git a/CHANGELOG.md b/CHANGELOG.md index 12204fb99..16fb8f2aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-apcu/5.1.16 [David Zuelke] - ext-blackfire/1.24.2 [David Zuelke] - ext-event/2.4.3 [David Zuelke] +- ext-newrelic/8.5.0.235 [David Zuelke] ### FIX diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.4.0.231 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.5.0.235 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.4.0.231 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.5.0.235 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.4.0.231 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.5.0.235 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.4.0.231 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.5.0.235 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.4.0.231 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.5.0.235 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.4.0.231 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.5.0.235 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.4.0.231 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.5.0.235 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.4.0.231 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.5.0.235 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.4.0.231 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.5.0.235 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.4.0.231 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.5.0.235 diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 new file mode 100755 index 000000000..42faa757d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ + +source $(dirname $0)/../no-debug-non-zts-20121212/newrelic From 871db89fdce3c262deecd34905212f92774e33fa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:56:56 +0100 Subject: [PATCH 245/553] v148 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16fb8f2aa..34d7125c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v148 (2018-12-??) +## v148 (2018-12-20) ### ADD From 69b4a72e1418bb32f9d3c65b8c48a6f23698b9ad Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 27 Dec 2018 17:07:23 +0100 Subject: [PATCH 246/553] ext-memcached/3.1.3 --- CHANGELOG.md | 6 ++++++ .../{memcached-3.0.4 => memcached-3.1.3} | 0 .../{memcached-3.0.4 => memcached-3.1.3} | 0 .../{memcached-3.0.4 => memcached-3.1.3} | 0 .../extensions/no-debug-non-zts-20180731/memcached-3.1.3 | 5 +++++ 5 files changed, 11 insertions(+) rename support/build/extensions/no-debug-non-zts-20151012/{memcached-3.0.4 => memcached-3.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{memcached-3.0.4 => memcached-3.1.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{memcached-3.0.4 => memcached-3.1.3} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 34d7125c2..13601a360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v149 (2019-01-??) + +### ADD + +- ext-memcached/3.1.3 [David Zuelke] + ## v148 (2018-12-20) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/memcached-3.0.4 rename to support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/memcached-3.0.4 rename to support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/memcached-3.0.4 rename to support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 diff --git a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 new file mode 100755 index 000000000..5856b036d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0, libraries/libmemcached-1.0.18 + +source $(dirname $0)/../no-debug-non-zts-20121212/memcached From f3f7f88ba9a5717126bfef1908a4139501365f3d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 27 Dec 2018 19:09:00 +0100 Subject: [PATCH 247/553] use PHP 7.3 for bootstrapping --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/composer-1.8.0 | 2 +- support/build/php-min | 3 ++- support/build/{php-min-7.0.33 => php-min-7.3.0} | 0 5 files changed, 8 insertions(+), 3 deletions(-) rename support/build/{php-min-7.0.33 => php-min-7.3.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13601a360..4d8337f21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - ext-memcached/3.1.3 [David Zuelke] +### CHG + +- Use PHP 7.3 for bootstrapping [David Zuelke] + ## v148 (2018-12-20) ### ADD diff --git a/bin/compile b/bin/compile index 8c7c29349..5a5bd3595 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.33.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.0.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/composer-1.8.0 b/support/build/composer-1.8.0 index 8021fd7c6..cea9fbf24 100755 --- a/support/build/composer-1.8.0 +++ b/support/build/composer-1.8.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.0.33 +# Build Deps: php-min-7.3.0 source $(dirname $0)/composer diff --git a/support/build/php-min b/support/build/php-min index bc2447642..736350b1f 100755 --- a/support/build/php-min +++ b/support/build/php-min @@ -52,7 +52,8 @@ export PATH=${OUT_PREFIX}/bin:$PATH --disable-xmlreader \ --disable-xmlwriter \ --enable-zip \ - --with-zlib + --with-zlib \ + --without-libzip # FIXME: change to --with-libzip once cedar-14 is EOL, as the other stacks have an up to date enough version make -s -j 9 mkdir -p ${OUT_PREFIX}/bin diff --git a/support/build/php-min-7.0.33 b/support/build/php-min-7.3.0 similarity index 100% rename from support/build/php-min-7.0.33 rename to support/build/php-min-7.3.0 From f3e60d2b66314bc2d96e812cb3637c3f3833485a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 7 Jan 2019 15:51:52 +1100 Subject: [PATCH 248/553] ext-amqp/1.9.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20131226/{amqp-1.9.3 => amqp-1.9.4} | 0 .../no-debug-non-zts-20151012/{amqp-1.9.3 => amqp-1.9.4} | 0 .../no-debug-non-zts-20160303/{amqp-1.9.3 => amqp-1.9.4} | 0 .../no-debug-non-zts-20170718/{amqp-1.9.3 => amqp-1.9.4} | 0 .../build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 | 5 +++++ 6 files changed, 6 insertions(+) rename support/build/extensions/no-debug-non-zts-20131226/{amqp-1.9.3 => amqp-1.9.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{amqp-1.9.3 => amqp-1.9.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{amqp-1.9.3 => amqp-1.9.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{amqp-1.9.3 => amqp-1.9.4} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d8337f21..0a6752498 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-memcached/3.1.3 [David Zuelke] +- ext-amqp/1.9.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.3 rename to support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.3 rename to support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.3 rename to support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.3 rename to support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 diff --git a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 new file mode 100755 index 000000000..aae83564c --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.0 + +source $(dirname $0)/../no-debug-non-zts-20131226/amqp From 457ab445f9b543a3292a1a15f265e0a4db571600 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 8 Jan 2019 17:59:07 +1100 Subject: [PATCH 249/553] Fix #317: boot scripts require GNU realpath or readlink --- CHANGELOG.md | 4 ++++ bin/heroku-hhvm-apache2 | 7 ++++--- bin/heroku-hhvm-nginx | 7 ++++--- bin/heroku-php-apache2 | 7 ++++--- bin/heroku-php-nginx | 7 ++++--- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a6752498..582665b4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - Use PHP 7.3 for bootstrapping [David Zuelke] +### FIX + +- Boot scripts fail without GNU realpath or GNU readlink (#317) [David Zuelke] + ## v148 (2018-12-20) ### ADD diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2 index c39610577..e3094f55d 100755 --- a/bin/heroku-hhvm-apache2 +++ b/bin/heroku-hhvm-apache2 @@ -10,15 +10,16 @@ shopt -s extglob shopt -s nullglob if ! type -p "realpath" > /dev/null; then - # cedar-14 doesn't have realpath + # cedar-14 and macOS don't have realpath + # readlink is not an option because BSD readlink does not have the GNU -f option # must be a function so subshells, including $(…), can use it realpath() { - readlink "$@" + python -c 'import os,sys; print(os.path.realpath(sys.argv[1]))' "$@" } fi # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) verbose= diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index f9f5165ca..677dd9b4d 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -10,15 +10,16 @@ shopt -s extglob shopt -s nullglob if ! type -p "realpath" > /dev/null; then - # cedar-14 doesn't have realpath + # cedar-14 and macOS don't have realpath + # readlink is not an option because BSD readlink does not have the GNU -f option # must be a function so subshells, including $(…), can use it realpath() { - readlink "$@" + python -c 'import os,sys; print(os.path.realpath(sys.argv[1]))' "$@" } fi # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) verbose= diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index 452f151ce..58d7d6c25 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -10,15 +10,16 @@ shopt -s extglob shopt -s nullglob if ! type -p "realpath" > /dev/null; then - # cedar-14 doesn't have realpath + # cedar-14 and macOS don't have realpath + # readlink is not an option because BSD readlink does not have the GNU -f option # must be a function so subshells, including $(…), can use it realpath() { - readlink "$@" + python -c 'import os,sys; print(os.path.realpath(sys.argv[1]))' "$@" } fi # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) verbose= diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index b9a69e5fd..ed48c704f 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -10,15 +10,16 @@ shopt -s extglob shopt -s nullglob if ! type -p "realpath" > /dev/null; then - # cedar-14 doesn't have realpath + # cedar-14 and macOS don't have realpath + # readlink is not an option because BSD readlink does not have the GNU -f option # must be a function so subshells, including $(…), can use it realpath() { - readlink "$@" + python -c 'import os,sys; print(os.path.realpath(sys.argv[1]))' "$@" } fi # we very likely got called via a symlink, so we have to realpath $0 first to find the base buildpack directory -bp_dir=$(cd $(dirname $(realpath -e $0)); cd ..; pwd) +bp_dir=$(cd $(dirname $(realpath $0)); cd ..; pwd) verbose= From 43c0c11a8e1815c66ce13d8cf272bff5bb8810f9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 Jan 2019 17:39:03 +0800 Subject: [PATCH 250/553] PHP/5.6.40 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 | 2 +- support/build/{php-5.6.39 => php-5.6.40} | 0 19 files changed, 18 insertions(+), 17 deletions(-) rename support/build/{php-5.6.39 => php-5.6.40} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 582665b4a..fa407cded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-memcached/3.1.3 [David Zuelke] - ext-amqp/1.9.4 [David Zuelke] +- PHP/5.6.40 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 index beb192092..637244651 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index 227899b7d..e909aac94 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 8359a9a49..e06ff217c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39, libraries/libcassandra-2.9.0 +# Build Deps: php-5.6.40, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index b32741e63..1087a5d90 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 index 4ae9cdcb8..b75ca3c49 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 82ea1e1b0..f707c4171 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 53c154938..22ea342b8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.40, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index 52631dabc..b9f0a4158 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 index 29a3b4d88..dff49f411 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index aa8c71bd8..60e698cb4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index 5b5107076..c53b2ef9d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 index 5b5107076..c53b2ef9d 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 8d86100f3..92d3cd1d1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.40, extensions/no-debug-non-zts-20131226/raphf-1.1.2 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 3d452f3f1..15fa2bb14 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 12c00beee..b188964e1 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39, libraries/librdkafka-0.11.6 +# Build Deps: php-5.6.40, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index ec29a565b..9f6c5bf65 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 index ec29a565b..9f6c5bf65 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.39 +# Build Deps: php-5.6.40 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-5.6.39 b/support/build/php-5.6.40 similarity index 100% rename from support/build/php-5.6.39 rename to support/build/php-5.6.40 From bd859bb10fb763cd43ca8ec1889e5a7de7b65707 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 Jan 2019 17:40:04 +0800 Subject: [PATCH 251/553] PHP/7.1.26 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 | 2 +- support/build/{php-7.1.25 => php-7.1.26} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.1.25 => php-7.1.26} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa407cded..222afb494 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-memcached/3.1.3 [David Zuelke] - ext-amqp/1.9.4 [David Zuelke] - PHP/5.6.40 [David Zuelke] +- PHP/7.1.26 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 index 649f09d90..09638b16d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 index 7fbaf0059..1308a14e9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index ca4c16897..d56767128 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.25, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.26, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 39325170f..9b198cb94 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 index bbdd2605a..b156477a7 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 73e68afab..66ccf6bac 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 index 06f818c4b..ec29a887d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.26, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 index 3b2c66fa6..5d580b473 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 index b65f9334a..ed30193cf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 index affd5d20f..6f1300cda 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 index 704f939be..37a3053b8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.26, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index c9618c0f8..20e9970c0 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 2b166c33f..e0c7880cd 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25, libraries/librdkafka-0.11.6 +# Build Deps: php-7.1.26, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 90ae7a0bf..60f823e1c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 index 90ae7a0bf..60f823e1c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.25 +# Build Deps: php-7.1.26 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.25 b/support/build/php-7.1.26 similarity index 100% rename from support/build/php-7.1.25 rename to support/build/php-7.1.26 From 5239057af46a514d2009006a44c1cae4d555872d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 Jan 2019 17:40:58 +0800 Subject: [PATCH 252/553] PHP/7.2.14 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 | 2 +- support/build/{php-7.2.13 => php-7.2.14} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.13 => php-7.2.14} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 222afb494..93620a659 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - ext-amqp/1.9.4 [David Zuelke] - PHP/5.6.40 [David Zuelke] - PHP/7.1.26 [David Zuelke] +- PHP/7.2.14 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 index 29ff1af11..922a23372 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 index cffd3606b..f0a729234 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 893ee0a53..e23580acd 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.14, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index c772bbf2d..3c5bc3cc3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 index 4267ca544..ecd88d9e8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index fc7eb1405..253587590 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 index 8e9ec25ed..519d3bab4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.14, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index 56732f404..b5c198467 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index ddda9fe77..5be88d720 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 index 475c1766a..05dca09b6 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 index 30259224f..5e4c45488 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.14, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 07c2f7f34..7112b8caf 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 43669a395..7a99c0fd9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13, libraries/librdkafka-0.11.6 +# Build Deps: php-7.2.14, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 367208f36..8d0a55b41 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 index 367208f36..8d0a55b41 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.13 +# Build Deps: php-7.2.14 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.13 b/support/build/php-7.2.14 similarity index 100% rename from support/build/php-7.2.13 rename to support/build/php-7.2.14 From 38f3fab14e1d5a8494accdc64dde4286d29eafd7 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 Jan 2019 17:44:40 +0800 Subject: [PATCH 253/553] PHP/7.3.1 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.8.0 | 2 +- support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 | 2 +- support/build/{php-7.3.0 => php-7.3.1} | 0 support/build/{php-min-7.3.0 => php-min-7.3.1} | 0 17 files changed, 15 insertions(+), 14 deletions(-) rename support/build/{php-7.3.0 => php-7.3.1} (100%) rename support/build/{php-min-7.3.0 => php-min-7.3.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93620a659..4c4cb7fb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/5.6.40 [David Zuelke] - PHP/7.1.26 [David Zuelke] - PHP/7.2.14 [David Zuelke] +- PHP/7.3.1 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index 5a5bd3595..15ebf34a0 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.0.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.1.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/composer-1.8.0 b/support/build/composer-1.8.0 index cea9fbf24..f5da8b0dd 100755 --- a/support/build/composer-1.8.0 +++ b/support/build/composer-1.8.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.3.0 +# Build Deps: php-min-7.3.1 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 index aae83564c..d4464e1d9 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 index 167f1d6af..5237c5902 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 index 1cb6f2dc1..6e0719cc6 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0, libraries/libcassandra-2.9.0 +# Build Deps: php-7.3.1, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 index 136c517fa..06bfedf16 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 index f80a89886..2dee71789 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 index f314dc774..1457a0376 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 index 5856b036d..1f71fa7a6 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0, libraries/libmemcached-1.0.18 +# Build Deps: php-7.3.1, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 index 83e8467b9..892be1eb2 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 index 0d8e053e4..145b090a9 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 index 7a18ce5b9..7fed570c0 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 index 8b470656f..017bcef8e 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0, libraries/librdkafka-0.11.6 +# Build Deps: php-7.3.1, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 index 1ccdb3f0d..53f5b1105 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.0 +# Build Deps: php-7.3.1 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.3.0 b/support/build/php-7.3.1 similarity index 100% rename from support/build/php-7.3.0 rename to support/build/php-7.3.1 diff --git a/support/build/php-min-7.3.0 b/support/build/php-min-7.3.1 similarity index 100% rename from support/build/php-min-7.3.0 rename to support/build/php-min-7.3.1 From 3069a7ff23b3a2aacd4a20a9049412587ad22fe8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 10 Jan 2019 17:46:29 +0800 Subject: [PATCH 254/553] v149 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c4cb7fb9..1866f640d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v149 (2019-01-??) +## v149 (2019-01-11) ### ADD From b2ee3deb6f0ff363031652c0af586c17cfd07fa6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 14 Jan 2019 16:07:38 +0100 Subject: [PATCH 255/553] ext-pq/2.1.5 --- CHANGELOG.md | 3 ++- .../no-debug-non-zts-20151012/{pq-2.1.4 => pq-2.1.5} | 0 .../no-debug-non-zts-20160303/{pq-2.1.4 => pq-2.1.5} | 0 .../no-debug-non-zts-20170718/{pq-2.1.4 => pq-2.1.5} | 0 support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 | 5 +++++ 5 files changed, 7 insertions(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20151012/{pq-2.1.4 => pq-2.1.5} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{pq-2.1.4 => pq-2.1.5} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{pq-2.1.4 => pq-2.1.5} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1866f640d..076fa9c5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v149 (2019-01-11) +## v149 (2019-01-14) ### ADD @@ -10,6 +10,7 @@ - PHP/7.1.26 [David Zuelke] - PHP/7.2.14 [David Zuelke] - PHP/7.3.1 [David Zuelke] +- ext-pq/2.1.5 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/pq-2.1.4 rename to support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/pq-2.1.4 rename to support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/pq-2.1.4 rename to support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 diff --git a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 new file mode 100755 index 000000000..f24357180 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.1, extensions/no-debug-non-zts-20180731/raphf-2.0.0 + +source $(dirname $0)/../no-debug-non-zts-20121212/pq From 558156e6ae4b8945909a86a26343909340912efa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Feb 2019 18:50:43 +0100 Subject: [PATCH 256/553] fix #322: ext-oauth does not find libcurl headers on heroku-18 --- CHANGELOG.md | 6 ++++++ support/build/extensions/no-debug-non-zts-20121212/oauth | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 076fa9c5a..59e693c74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v150 (2019-02-07) + +### FIX + +- ext-oauth doesn't find libcurl headers on heroku-18 (#322) [David Zuelke] + ## v149 (2019-01-14) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/oauth b/support/build/extensions/no-debug-non-zts-20121212/oauth index 58fb390e7..3ae0b19d4 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/oauth +++ b/support/build/extensions/no-debug-non-zts-20121212/oauth @@ -2,4 +2,9 @@ dep_name=$(basename $BASH_SOURCE) +if [[ $STACK != "cedar-14" && $STACK != "heroku-16" ]]; then + # headers for libcurl are in a different location from Ubuntu 18 and oauth configure doesn't check there + ln -s /usr/include/x86_64-linux-gnu/curl /usr/include/curl +fi + source $(dirname $BASH_SOURCE)/../pecl From 5b5d7204a7c32d68e30b7e22cd9f29058874cc83 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Feb 2019 19:36:15 +0100 Subject: [PATCH 257/553] ext-blackfire/1.24.4 --- CHANGELOG.md | 4 ++++ .../{blackfire-1.24.2 => blackfire-1.24.4} | 0 .../{blackfire-1.24.2 => blackfire-1.24.4} | 0 .../{blackfire-1.24.2 => blackfire-1.24.4} | 0 .../{blackfire-1.24.2 => blackfire-1.24.4} | 0 .../{blackfire-1.24.2 => blackfire-1.24.4} | 0 .../{blackfire-1.24.2 => blackfire-1.24.4} | 0 7 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.24.2 => blackfire-1.24.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.24.2 => blackfire-1.24.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.24.2 => blackfire-1.24.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.24.2 => blackfire-1.24.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.24.2 => blackfire-1.24.4} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{blackfire-1.24.2 => blackfire-1.24.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59e693c74..40c87e126 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v150 (2019-02-07) +### ADD + +- ext-blackfire/1.24.4 [David Zuelke] + ### FIX - ext-oauth doesn't find libcurl headers on heroku-18 (#322) [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.2 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.2 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.2 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.2 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.2 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.2 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.2 rename to support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 From 8989bdcc4710e792b384b1e41d362d33b2b31711 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 6 Feb 2019 19:37:48 +0100 Subject: [PATCH 258/553] Composer/1.8.3 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.8.0 => composer-1.8.3} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.8.0 => composer-1.8.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40c87e126..76e33270e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - ext-blackfire/1.24.4 [David Zuelke] +### CHG + +- Composer/1.8.3 [David Zuelke] + ### FIX - ext-oauth doesn't find libcurl headers on heroku-18 (#322) [David Zuelke] diff --git a/bin/compile b/bin/compile index 15ebf34a0..5ffce835f 100755 --- a/bin/compile +++ b/bin/compile @@ -231,7 +231,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.8.0.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.8.3.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.8.0 b/support/build/composer-1.8.3 similarity index 100% rename from support/build/composer-1.8.0 rename to support/build/composer-1.8.3 From 486dc0876833cb3bf982f967caa57f46b73b0473 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Feb 2019 17:57:56 +0100 Subject: [PATCH 259/553] Apache/2.4.38 --- CHANGELOG.md | 1 + support/build/{apache-2.4.37 => apache-2.4.38} | 0 2 files changed, 1 insertion(+) rename support/build/{apache-2.4.37 => apache-2.4.38} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76e33270e..ea3b581c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-blackfire/1.24.4 [David Zuelke] +- Apache/2.4.38 [David Zuelke] ### CHG diff --git a/support/build/apache-2.4.37 b/support/build/apache-2.4.38 similarity index 100% rename from support/build/apache-2.4.37 rename to support/build/apache-2.4.38 From 62b25181aee3f51a7b194cbc4c0aaafd9838b149 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Feb 2019 17:58:42 +0100 Subject: [PATCH 260/553] PHP/7.2.15 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 | 2 +- support/build/{php-7.2.14 => php-7.2.15} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.14 => php-7.2.15} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea3b581c1..8187d85f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-blackfire/1.24.4 [David Zuelke] - Apache/2.4.38 [David Zuelke] +- PHP/7.2.15 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 index 922a23372..573d8ae72 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 index f0a729234..f3b3d1451 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index e23580acd..40aaecfd4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.15, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 3c5bc3cc3..133f812b2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 index ecd88d9e8..038ff6bf4 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 253587590..1ec1bc927 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 index 519d3bab4..ddf49f528 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.15, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index b5c198467..705cfa482 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index 5be88d720..4e22dfbce 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 index 05dca09b6..099cc8f5f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 index 5e4c45488..c40206597 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.15, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 7112b8caf..190bb34b1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 7a99c0fd9..c2ca8ad37 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14, libraries/librdkafka-0.11.6 +# Build Deps: php-7.2.15, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 8d0a55b41..4f35f08cb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 index 8d0a55b41..4f35f08cb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.14 +# Build Deps: php-7.2.15 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.14 b/support/build/php-7.2.15 similarity index 100% rename from support/build/php-7.2.14 rename to support/build/php-7.2.15 From f7f22cd5db01bbf18ece12768d851fe687cef868 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Feb 2019 17:59:32 +0100 Subject: [PATCH 261/553] PHP/7.3.2 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.8.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 | 2 +- support/build/{php-7.3.1 => php-7.3.2} | 0 support/build/{php-min-7.3.1 => php-min-7.3.2} | 0 18 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.3.1 => php-7.3.2} (100%) rename support/build/{php-min-7.3.1 => php-min-7.3.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8187d85f6..f72da3bca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-blackfire/1.24.4 [David Zuelke] - Apache/2.4.38 [David Zuelke] - PHP/7.2.15 [David Zuelke] +- PHP/7.3.2 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index 5ffce835f..38d67df96 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.1.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.2.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/composer-1.8.3 b/support/build/composer-1.8.3 index f5da8b0dd..92d2789f2 100755 --- a/support/build/composer-1.8.3 +++ b/support/build/composer-1.8.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.3.1 +# Build Deps: php-min-7.3.2 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 index d4464e1d9..580c181c1 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 index 5237c5902..6f301d5a5 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 index 6e0719cc6..faf1d7910 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1, libraries/libcassandra-2.9.0 +# Build Deps: php-7.3.2, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 index 06bfedf16..813667a7c 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 index 2dee71789..15e9b08c9 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 index 1457a0376..819a6698e 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 index 1f71fa7a6..ac635e973 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1, libraries/libmemcached-1.0.18 +# Build Deps: php-7.3.2, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 index 892be1eb2..3e33424a5 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 index 145b090a9..22a3ce631 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 index f24357180..5a8c29bbf 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1, extensions/no-debug-non-zts-20180731/raphf-2.0.0 +# Build Deps: php-7.3.2, extensions/no-debug-non-zts-20180731/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 index 7fed570c0..c7c6da2cd 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 index 017bcef8e..dc5926b97 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1, libraries/librdkafka-0.11.6 +# Build Deps: php-7.3.2, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 index 53f5b1105..3444f6261 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.1 +# Build Deps: php-7.3.2 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.3.1 b/support/build/php-7.3.2 similarity index 100% rename from support/build/php-7.3.1 rename to support/build/php-7.3.2 diff --git a/support/build/php-min-7.3.1 b/support/build/php-min-7.3.2 similarity index 100% rename from support/build/php-min-7.3.1 rename to support/build/php-min-7.3.2 From 562db18efefe7155c7eff48998294ae77ecb4a4a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 13 Feb 2019 22:36:34 +0100 Subject: [PATCH 262/553] some Dockerfile/env simplifications and README adjustments --- support/build/_docker/README.md | 44 +++++++++++++++++----- support/build/_docker/cedar-14.Dockerfile | 4 ++ support/build/_docker/env.default | 9 ++--- support/build/_docker/heroku-16.Dockerfile | 4 ++ support/build/_docker/heroku-18.Dockerfile | 4 ++ 5 files changed, 49 insertions(+), 16 deletions(-) diff --git a/support/build/_docker/README.md b/support/build/_docker/README.md index 3b7337347..47a5e7abf 100644 --- a/support/build/_docker/README.md +++ b/support/build/_docker/README.md @@ -2,30 +2,54 @@ ## Building the Image -**After every change to your formulae, perform the following** from the root of the Git repository (not from `support/build/_docker/`): +**After every change to your formulae, perform the following** from the root of the Git repository (not from `support/build/_docker/`) to rebuild the images for each stack: $ docker build --pull --tag heroku-php-build-cedar-14 --file $(pwd)/support/build/_docker/cedar-14.Dockerfile . + $ docker build --pull --tag heroku-php-build-heroku-16 --file $(pwd)/support/build/_docker/heroku-16.Dockerfile . + $ docker build --pull --tag heroku-php-build-heroku-18 --file $(pwd)/support/build/_docker/heroku-18.Dockerfile . ## Configuration -File `env.default` contains a list of required env vars, some with default values. You can modify it with the values you desire, or pass them to `docker run` using `--env`. +File `env.default` contains a list of required env vars, some with default values. You can copy this file to a location outside the buildpack and modify it with the values you desire and pass its location with `--env-file`, or pass the env vars to `docker run` using `--env`. -Out of the box, you'll likely want to change `S3_BUCKET` and `S3_PREFIX` to match your info. Instead of setting `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` in that file, it is recommended to pass them to `docker run` through the environment, or explicitly using `--env`, in order to prevent accidental commits of credentials. +Out of the box, each `Dockerfile` has the correct values predefined for `S3_BUCKET`, `S3_PREFIX`, and `S3_REGION`. If you're building your own packages, you'll likely want to change `S3_BUCKET` and `S3_PREFIX` to match your info. Instead of setting `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` into that file, it is recommended to pass them to `docker run` through the environment, or explicitly using `--env`, in order to prevent accidental commits of credentials. ## Using the Image -From the root of the Git repository (not from `support/build/_docker/`): +From the root of the Git repository (not from `support/build/_docker/`), you can e.g. `bash` into each of the images you built using their tag: - docker run --rm --tty --interactive --env-file=support/build/_docker/env.default heroku-php-build-cedar-14 /bin/bash + docker run --rm -ti heroku-php-build-cedar-14 bash + docker run --rm -ti heroku-php-build-heroku-16 bash + docker run --rm -ti heroku-php-build-heroku-18 bash -That runs with values from `env.default`; if you need to pass e.g. `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` because they are not already in your environment, do either: +You then have a shell where you can run `bob build`, `deploy.sh` and so forth. You can of course also invoke these programs directly with `docker run`. - AWS_ACCESS_KEY_ID=... AWS_SECRET_ACCESS_KEY=... docker run --rm --tty --interactive --env-file=support/build/_docker/env.default heroku-php-build-cedar-14 /bin/bash +The `support/build/_util/` directory is on `$PATH` in the image. + +### Passing AWS credentials to the container + +If you want to deploy packages and thus need to pass `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`, you can either pass them explicitly, through your environment, or through an env file. + +#### Passing credentials explicitly + + docker run --rm -ti -e AWS_ACCESS_KEY_ID=... -e AWS_SECRET_ACCESS_KEY=... heroku-php-build-heroku-18 bash + +#### Passing credentials through the environment + +The two environment variables `AWS_ACCESS_KEY_ID`and `AWS_SECRET_ACCESS_KEY` are defined in `support/build/_docker/env.default`, without values. This will cause Docker to "forward" values for these variables from the current environment, so you can pass them in: + + AWS_ACCESS_KEY_ID=... AWS_SECRET_ACCESS_KEY=... docker run --rm -ti --env-file=support/build/_docker/env.default heroku-php-build-heroku-18 bash or - docker run --rm --tty --interactive --env-file=support/build/_docker/env.default -e AWS_ACCESS_KEY_ID=... -e AWS_SECRET_ACCESS_KEY=... heroku-php-build-cedar-14 /bin/bash + export AWS_ACCESS_KEY_ID=... + export AWS_SECRET_ACCESS_KEY=... + docker run --rm -ti --env-file=support/build/_docker/env.default heroku-php-build-heroku-18 bash -You then have a shell where you can run `bob build`, `deploy.sh` and so forth. +#### Passing credentials through a separate env file -The `support/build/_util/` directory is on `$PATH` in the image. +This method is the easiest for users who want to build packages in their own S3 bucket, as they will have to adjust the `S3_BUCKET` and `S3_PREFIX` environment variable values anyway from their default values. + +For this method, it is important to keep the credentials file in a location outside the buildpack, so that your credentials aren't accidentally committed. Copy `support/build/_docker/env.default` **to a safe location outside the buildpack directory**, and insert your values for `AWS_ACCESS_KEY_ID`and `AWS_SECRET_ACCESS_KEY`. + + docker run --rm -ti --env-file=../SOMEPATHOUTSIDE/s3.env heroku-php-build-heroku-18 bash diff --git a/support/build/_docker/cedar-14.Dockerfile b/support/build/_docker/cedar-14.Dockerfile index 9ea9e4406..bd72c517f 100644 --- a/support/build/_docker/cedar-14.Dockerfile +++ b/support/build/_docker/cedar-14.Dockerfile @@ -3,6 +3,10 @@ FROM heroku/cedar:14 WORKDIR /app ENV WORKSPACE_DIR=/app/support/build ENV PATH=/app/support/build/_util:$PATH +ENV S3_BUCKET=lang-php +ENV S3_PREFIX=dist-cedar-14-develop/ +ENV S3_REGION=s3 +ENV STACK=cedar-14 RUN apt-get update && apt-get install -y python-pip diff --git a/support/build/_docker/env.default b/support/build/_docker/env.default index f796351a6..9d2b8c24d 100644 --- a/support/build/_docker/env.default +++ b/support/build/_docker/env.default @@ -1,8 +1,5 @@ AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY - -S3_BUCKET=lang-php -S3_PREFIX=dist-cedar-14-develop/ -S3_REGION=s3 - -STACK=cedar-14 +S3_BUCKET +S3_PREFIX +S3_REGION diff --git a/support/build/_docker/heroku-16.Dockerfile b/support/build/_docker/heroku-16.Dockerfile index 806bbd040..493fcc108 100644 --- a/support/build/_docker/heroku-16.Dockerfile +++ b/support/build/_docker/heroku-16.Dockerfile @@ -3,6 +3,10 @@ FROM heroku/heroku:16-build WORKDIR /app ENV WORKSPACE_DIR=/app/support/build ENV PATH=/app/support/build/_util:$PATH +ENV S3_BUCKET=lang-php +ENV S3_PREFIX=dist-heroku-16-develop/ +ENV S3_REGION=s3 +ENV STACK=heroku-16 RUN apt-get update && apt-get install -y python-pip diff --git a/support/build/_docker/heroku-18.Dockerfile b/support/build/_docker/heroku-18.Dockerfile index d610df68a..ceaf1ab35 100644 --- a/support/build/_docker/heroku-18.Dockerfile +++ b/support/build/_docker/heroku-18.Dockerfile @@ -3,6 +3,10 @@ FROM heroku/heroku:18-build WORKDIR /app ENV WORKSPACE_DIR=/app/support/build ENV PATH=/app/support/build/_util:$PATH +ENV S3_BUCKET=lang-php +ENV S3_PREFIX=dist-heroku-18-develop/ +ENV S3_REGION=s3 +ENV STACK=heroku-18 RUN apt-get update && apt-get install -y python-pip From bc97a6f04abf3027afa488f4b30258fa6c4841dd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Mar 2019 14:10:52 +0100 Subject: [PATCH 263/553] PHP/7.1.27 --- CHANGELOG.md | 6 ++++++ .../build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 | 2 +- .../extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/event-2.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/memcached-3.1.3 | 2 +- .../extensions/no-debug-non-zts-20160303/mongodb-1.5.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 | 2 +- .../extensions/no-debug-non-zts-20160303/phalcon-3.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- .../build/extensions/no-debug-non-zts-20160303/redis-4.2.0 | 2 +- support/build/{php-7.1.26 => php-7.1.27} | 0 17 files changed, 21 insertions(+), 15 deletions(-) rename support/build/{php-7.1.26 => php-7.1.27} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f72da3bca..d808710ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v151 (2019-03-08) + +### ADD + +- PHP/7.1.27 [David Zuelke] + ## v150 (2019-02-07) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 index 09638b16d..a42df580b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 index 1308a14e9..25bf5df51 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index d56767128..d9986d9f3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.26, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.27, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 9b198cb94..332ae7dd5 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 index b156477a7..fa78b9ccf 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 66ccf6bac..f01f481b6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 index ec29a887d..17ae9ac30 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.27, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 index 5d580b473..4c4f4b833 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 index ed30193cf..16abc4e49 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 index 6f1300cda..446f072b8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 index 37a3053b8..ecef4311d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.27, extensions/no-debug-non-zts-20160303/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 20e9970c0..0c27cb643 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index e0c7880cd..4dafd5033 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26, libraries/librdkafka-0.11.6 +# Build Deps: php-7.1.27, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index 60f823e1c..a4270574d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 index 60f823e1c..a4270574d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.26 +# Build Deps: php-7.1.27 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.1.26 b/support/build/php-7.1.27 similarity index 100% rename from support/build/php-7.1.26 rename to support/build/php-7.1.27 From 09b4ba3ef6aa81c64e615ab9926776a633e0c963 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Mar 2019 14:11:32 +0100 Subject: [PATCH 264/553] PHP/7.2.16 --- CHANGELOG.md | 1 + support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 | 2 +- support/build/{php-7.2.15 => php-7.2.16} | 0 17 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.2.15 => php-7.2.16} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d808710ce..ed4cddb67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.1.27 [David Zuelke] +- PHP/7.2.16 [David Zuelke] ## v150 (2019-02-07) diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 index 573d8ae72..19c9aeb82 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 index f3b3d1451..56f489683 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 40aaecfd4..952b0f628 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.16, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index 133f812b2..b0be43a68 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 index 038ff6bf4..1d718b310 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 1ec1bc927..898213b0d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 index ddf49f528..bcb130a57 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.16, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index 705cfa482..8fbcd5ba8 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index 4e22dfbce..916fd1615 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 index 099cc8f5f..0d4916294 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 index c40206597..c92af3c46 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.16, extensions/no-debug-non-zts-20170718/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index 190bb34b1..e448a94cf 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index c2ca8ad37..558248b0e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15, libraries/librdkafka-0.11.6 +# Build Deps: php-7.2.16, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 4f35f08cb..67615dcf7 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 index 4f35f08cb..67615dcf7 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.15 +# Build Deps: php-7.2.16 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.2.15 b/support/build/php-7.2.16 similarity index 100% rename from support/build/php-7.2.15 rename to support/build/php-7.2.16 From a6309eeebe0ce777b4f3b02989e76038098aa8bf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Mar 2019 14:12:52 +0100 Subject: [PATCH 265/553] PHP/7.3.3 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/composer-1.8.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 | 2 +- .../build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 | 2 +- support/build/{php-7.3.2 => php-7.3.3} | 0 support/build/{php-min-7.3.2 => php-min-7.3.3} | 0 18 files changed, 16 insertions(+), 15 deletions(-) rename support/build/{php-7.3.2 => php-7.3.3} (100%) rename support/build/{php-min-7.3.2 => php-min-7.3.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed4cddb67..25ffb9ee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.1.27 [David Zuelke] - PHP/7.2.16 [David Zuelke] +- PHP/7.3.3 [David Zuelke] ## v150 (2019-02-07) diff --git a/bin/compile b/bin/compile index 38d67df96..a57dc0f4e 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.2.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.3.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/composer-1.8.3 b/support/build/composer-1.8.3 index 92d2789f2..4d9682918 100755 --- a/support/build/composer-1.8.3 +++ b/support/build/composer-1.8.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.3.2 +# Build Deps: php-min-7.3.3 source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 index 580c181c1..1d4140ac8 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 index 6f301d5a5..0f2bb2c77 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 +++ b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 index faf1d7910..df01564f3 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2, libraries/libcassandra-2.9.0 +# Build Deps: php-7.3.3, libraries/libcassandra-2.9.0 source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 index 813667a7c..057b680fa 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 index 15e9b08c9..918f91110 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 index 819a6698e..24254c215 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 index ac635e973..785489b70 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2, libraries/libmemcached-1.0.18 +# Build Deps: php-7.3.3, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 index 3e33424a5..028ad4425 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 index 22a3ce631..e660392fd 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 index 5a8c29bbf..4474ed41e 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2, extensions/no-debug-non-zts-20180731/raphf-2.0.0 +# Build Deps: php-7.3.3, extensions/no-debug-non-zts-20180731/raphf-2.0.0 source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 index c7c6da2cd..7319761df 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 index dc5926b97..f5c188b71 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2, libraries/librdkafka-0.11.6 +# Build Deps: php-7.3.3, libraries/librdkafka-0.11.6 source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 index 3444f6261..d0261b899 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.2 +# Build Deps: php-7.3.3 source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/php-7.3.2 b/support/build/php-7.3.3 similarity index 100% rename from support/build/php-7.3.2 rename to support/build/php-7.3.3 diff --git a/support/build/php-min-7.3.2 b/support/build/php-min-7.3.3 similarity index 100% rename from support/build/php-min-7.3.2 rename to support/build/php-min-7.3.3 From 56d7f93932aae796232d3128571020d1dab49999 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Mar 2019 14:13:43 +0100 Subject: [PATCH 266/553] Composer/1.8.4 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.8.3 => composer-1.8.4} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.8.3 => composer-1.8.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25ffb9ee9..16c4b720f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - PHP/7.2.16 [David Zuelke] - PHP/7.3.3 [David Zuelke] +### CHG + +- Composer/1.8.4 [David Zuelke] + ## v150 (2019-02-07) ### ADD diff --git a/bin/compile b/bin/compile index a57dc0f4e..4650f275b 100755 --- a/bin/compile +++ b/bin/compile @@ -231,7 +231,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.8.3.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.8.4.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.8.3 b/support/build/composer-1.8.4 similarity index 100% rename from support/build/composer-1.8.3 rename to support/build/composer-1.8.4 From bf53a99c62a6994548d3bbd049f8e7ca350c15bd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Mar 2019 14:17:01 +0100 Subject: [PATCH 267/553] ext-phalcon/3.4.3 --- CHANGELOG.md | 1 + .../{phalcon-3.4.2 => phalcon-3.4.3} | 0 .../{phalcon-3.4.2 => phalcon-3.4.3} | 0 .../{phalcon-3.4.2 => phalcon-3.4.3} | 0 .../{phalcon-3.4.2 => phalcon-3.4.3} | 0 .../{phalcon-3.4.2 => phalcon-3.4.3} | 0 .../build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 | 5 +++++ 7 files changed, 6 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.4.2 => phalcon-3.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.4.2 => phalcon-3.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.4.2 => phalcon-3.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.4.2 => phalcon-3.4.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.4.2 => phalcon-3.4.3} (100%) create mode 100755 support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 16c4b720f..56601488e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.1.27 [David Zuelke] - PHP/7.2.16 [David Zuelke] - PHP/7.3.3 [David Zuelke] +- ext-phalcon/3.4.3 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.2 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.2 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.2 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.2 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.2 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 diff --git a/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 new file mode 100755 index 000000000..cd3360fc9 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php/ +# Build Deps: php-7.3.3 + +source $(dirname $0)/../no-debug-non-zts-20121212/phalcon From e3a53e2eea72dcfc4bfc2b6a91486fe76b4f7903 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 8 Mar 2019 14:29:54 +0100 Subject: [PATCH 268/553] ext-apcu/5.1.17 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20151012/{apcu-5.1.16 => apcu-5.1.17} | 0 .../no-debug-non-zts-20160303/{apcu-5.1.16 => apcu-5.1.17} | 0 .../no-debug-non-zts-20170718/{apcu-5.1.16 => apcu-5.1.17} | 0 .../no-debug-non-zts-20180731/{apcu-5.1.16 => apcu-5.1.17} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20151012/{apcu-5.1.16 => apcu-5.1.17} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{apcu-5.1.16 => apcu-5.1.17} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{apcu-5.1.16 => apcu-5.1.17} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{apcu-5.1.16 => apcu-5.1.17} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56601488e..9b5c6aba1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.2.16 [David Zuelke] - PHP/7.3.3 [David Zuelke] - ext-phalcon/3.4.3 [David Zuelke] +- ext-apcu/5.1.17 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.16 rename to support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.16 rename to support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.16 rename to support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.16 rename to support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 From aec149b62801c6e8cf1165954df368865a75df3d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 7 Mar 2019 02:11:05 +0100 Subject: [PATCH 269/553] import test infra --- .travis.yml | 32 +++++++++++++++++- Gemfile | 8 +++++ Gemfile.lock | 70 ++++++++++++++++++++++++++++++++++++++++ hatchet.json | 1 + hatchet.lock | 1 + test/spec/spec_helper.rb | 43 ++++++++++++++++++++++++ 6 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 hatchet.json create mode 100644 hatchet.lock create mode 100644 test/spec/spec_helper.rb diff --git a/.travis.yml b/.travis.yml index 0a3316f15..fb5f30790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,32 @@ +language: generic +dist: xenial sudo: false -script: exit 0 +before_install: +- gem install bundler +install: +- bundle install +before_script: +- bundle exec hatchet ci:setup +script: bundle exec rspec test/spec/ +env: + global: + - HATCHET_RETRIES=3 + - IS_RUNNING_ON_CI=true + - HATCHET_APP_LIMIT=80 + - HEROKU_APP_LIMIT=9999 + - HATCHET_DEPLOY_STRATEGY=git + - HATCHET_BUILDPACK_BASE="https://github.com/heroku/heroku-buildpack-php" +matrix: + include: + - env: STACK=cedar-14 + if: branch = master OR tag IS present + - env: STACK=heroku-16 + if: branch = master OR tag IS present + - env: STACK=heroku-18 + if: branch = master OR tag IS present + - env: STACK=cedar-14 HEROKU_PHP_PLATFORM_REPOSITORIES="- https://lang-php.s3.amazonaws.com/dist-cedar-14-develop/" + if: branch != master + - env: STACK=heroku-16 HEROKU_PHP_PLATFORM_REPOSITORIES="- https://lang-php.s3.amazonaws.com/dist-heroku-16-develop/" + if: branch != master + - env: STACK=heroku-18 HEROKU_PHP_PLATFORM_REPOSITORIES="- https://lang-php.s3.amazonaws.com/dist-heroku-18-develop/" + if: branch != master diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..e8c32c76f --- /dev/null +++ b/Gemfile @@ -0,0 +1,8 @@ +source "https://rubygems.org" + +gem 'heroku_hatchet', ">=4.0.7" +gem 'rspec-retry' +gem 'rspec-expectations' +gem 'sem_version' +gem "parallel_tests" +gem "rake" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..bff0b3496 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,70 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + concurrent-ruby (1.1.4) + diff-lcs (1.3) + erubis (2.7.0) + excon (0.62.0) + heroics (0.0.25) + erubis (~> 2.0) + excon + moneta + multi_json (>= 1.9.2) + heroku_hatchet (4.0.7) + excon (~> 0) + minitest-retry (~> 0.1.9) + platform-api (~> 2) + repl_runner (~> 0.0.3) + rrrretry (~> 1) + thor (~> 0) + threaded (~> 0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + minitest-retry (0.1.9) + minitest (>= 5.0) + moneta (1.0.0) + multi_json (1.13.1) + parallel (1.14.0) + parallel_tests (2.28.0) + parallel + platform-api (2.2.0) + heroics (~> 0.0.25) + moneta (~> 1.0.0) + rake (12.3.2) + repl_runner (0.0.3) + activesupport + rrrretry (1.0.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-retry (0.6.1) + rspec-core (> 3.3) + rspec-support (3.8.0) + sem_version (2.0.1) + thor (0.20.3) + thread_safe (0.3.6) + threaded (0.0.4) + tzinfo (1.2.5) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + heroku_hatchet (>= 4.0.7) + parallel_tests + rake + rspec-expectations + rspec-retry + sem_version + +BUNDLED WITH + 1.16.1 diff --git a/hatchet.json b/hatchet.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/hatchet.json @@ -0,0 +1 @@ +{} diff --git a/hatchet.lock b/hatchet.lock new file mode 100644 index 000000000..dcd024e99 --- /dev/null +++ b/hatchet.lock @@ -0,0 +1 @@ +--- [] diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb new file mode 100644 index 000000000..b6cfcbe08 --- /dev/null +++ b/test/spec/spec_helper.rb @@ -0,0 +1,43 @@ +require 'rspec/core' +require 'hatchet' +require 'fileutils' +require 'hatchet' +require 'rspec/retry' +require 'date' +require 'json' +require 'sem_version' +require 'shellwords' + +ENV['RACK_ENV'] = 'test' + +def product_hash(hash) + hash.values[0].product(*hash.values[1..-1]).map{ |e| Hash[hash.keys.zip e] } +end + +RSpec.configure do |config| + config.filter_run focused: true unless ENV['IS_RUNNING_ON_TRAVIS'] + config.run_all_when_everything_filtered = true + config.alias_example_to :fit, focused: true + config.full_backtrace = true + config.verbose_retry = true # show retry status in spec process + config.default_retry_count = 2 if ENV['IS_RUNNING_ON_TRAVIS'] # retry all tests that fail again + config.expect_with :rspec do |c| + c.syntax = :expect + end +end + +def successful_body(app, options = {}) + retry_limit = options[:retry_limit] || 100 + path = options[:path] ? "/#{options[:path]}" : '' + Excon.get("http://#{app.name}.herokuapp.com#{path}", :idempotent => true, :expects => 200, :retry_limit => retry_limit).body +end + +def expect_exit(expect: :to, operator: :eq, code: 0) + raise ArgumentError, "Expected a block but none given" unless block_given? + output = yield + expect($?.exitstatus).method(expect).call( + method(operator).call(code), + "Expected exit code #{$?.exitstatus} #{expect} be #{operator} to #{code}; output:\n#{output}" + ) + output # so that can be tested too +end From 124b02a306ca44336fcbc7b95f576122c47ca674 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 12 Mar 2019 16:32:02 +0100 Subject: [PATCH 270/553] default PHP Hatchet tests --- test/fixtures/default/index.php | 1 + test/spec/php_default_spec.rb | 22 ++++++++++++++++++++++ test/spec/spec_helper.rb | 9 +++++++++ 3 files changed, 32 insertions(+) create mode 100644 test/fixtures/default/index.php create mode 100644 test/spec/php_default_spec.rb diff --git a/test/fixtures/default/index.php b/test/fixtures/default/index.php new file mode 100644 index 000000000..c4837a32b --- /dev/null +++ b/test/fixtures/default/index.php @@ -0,0 +1 @@ + Date: Tue, 12 Mar 2019 17:13:36 +0100 Subject: [PATCH 271/553] basic tests for each PHP series using separate files for each series so the tests are parallelizable --- .travis.yml | 2 +- test/spec/php_5.5_spec.rb | 5 +++++ test/spec/php_5.6_spec.rb | 5 +++++ test/spec/php_7.0_spec.rb | 5 +++++ test/spec/php_7.1_spec.rb | 5 +++++ test/spec/php_7.2_spec.rb | 5 +++++ test/spec/php_7.3_spec.rb | 5 +++++ test/spec/php_shared.rb | 17 +++++++++++++++++ test/spec/spec_helper.rb | 13 +++++++++++++ 9 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 test/spec/php_5.5_spec.rb create mode 100644 test/spec/php_5.6_spec.rb create mode 100644 test/spec/php_7.0_spec.rb create mode 100644 test/spec/php_7.1_spec.rb create mode 100644 test/spec/php_7.2_spec.rb create mode 100644 test/spec/php_7.3_spec.rb create mode 100644 test/spec/php_shared.rb diff --git a/.travis.yml b/.travis.yml index fb5f30790..ca8d130d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - bundle install before_script: - bundle exec hatchet ci:setup -script: bundle exec rspec test/spec/ +script: bundle exec parallel_rspec -n6 test/spec/ env: global: - HATCHET_RETRIES=3 diff --git a/test/spec/php_5.5_spec.rb b/test/spec/php_5.5_spec.rb new file mode 100644 index 000000000..38834440d --- /dev/null +++ b/test/spec/php_5.5_spec.rb @@ -0,0 +1,5 @@ +require_relative "php_shared" + +describe "A PHP 5.5 application with a composer.json", :requires_php_on_stack => "5.5" do + include_examples "A PHP application with a composer.json", "5.5" +end diff --git a/test/spec/php_5.6_spec.rb b/test/spec/php_5.6_spec.rb new file mode 100644 index 000000000..078a51746 --- /dev/null +++ b/test/spec/php_5.6_spec.rb @@ -0,0 +1,5 @@ +require_relative "php_shared" + +describe "A PHP 5.6 application with a composer.json", :requires_php_on_stack => "5.6" do + include_examples "A PHP application with a composer.json", "5.6" +end diff --git a/test/spec/php_7.0_spec.rb b/test/spec/php_7.0_spec.rb new file mode 100644 index 000000000..dd07c9c06 --- /dev/null +++ b/test/spec/php_7.0_spec.rb @@ -0,0 +1,5 @@ +require_relative "php_shared" + +describe "A PHP 7.0 application with a composer.json", :requires_php_on_stack => "7.0" do + include_examples "A PHP application with a composer.json", "7.0" +end diff --git a/test/spec/php_7.1_spec.rb b/test/spec/php_7.1_spec.rb new file mode 100644 index 000000000..1b5db7a3e --- /dev/null +++ b/test/spec/php_7.1_spec.rb @@ -0,0 +1,5 @@ +require_relative "php_shared" + +describe "A PHP 7.1 application with a composer.json", :requires_php_on_stack => "7.1" do + include_examples "A PHP application with a composer.json", "7.1" +end diff --git a/test/spec/php_7.2_spec.rb b/test/spec/php_7.2_spec.rb new file mode 100644 index 000000000..4bd945f74 --- /dev/null +++ b/test/spec/php_7.2_spec.rb @@ -0,0 +1,5 @@ +require_relative "php_shared" + +describe "A PHP 7.2 application with a composer.json", :requires_php_on_stack => "7.2" do + include_examples "A PHP application with a composer.json", "7.2" +end diff --git a/test/spec/php_7.3_spec.rb b/test/spec/php_7.3_spec.rb new file mode 100644 index 000000000..066de4f77 --- /dev/null +++ b/test/spec/php_7.3_spec.rb @@ -0,0 +1,5 @@ +require_relative "php_shared" + +describe "A PHP 7.3 application with a composer.json", :requires_php_on_stack => "7.3" do + include_examples "A PHP application with a composer.json", "7.3" +end diff --git a/test/spec/php_shared.rb b/test/spec/php_shared.rb new file mode 100644 index 000000000..69dbcdea4 --- /dev/null +++ b/test/spec/php_shared.rb @@ -0,0 +1,17 @@ +require_relative "spec_helper" + +shared_examples "A PHP application with a composer.json" do |series| + context "requiring PHP #{series}" do + let(:app) { + Hatchet::Runner.new('test/fixtures/default', stack: ENV["STACK"], + before_deploy: -> { system("composer require --quiet --no-update php '#{series}.*' && composer update --quiet --ignore-platform-reqs") or raise "Failed to require PHP version" } + ) + } + it "picks a version from the desired series" do + app.deploy do |app| + expect(app.output).to match(/- php \(#{Regexp.escape(series)}\./) + expect(app.run('php -v')).to match(/#{Regexp.escape(series)}\./) + end + end + end +end diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb index 8c32f3386..3c8579052 100644 --- a/test/spec/spec_helper.rb +++ b/test/spec/spec_helper.rb @@ -24,6 +24,7 @@ def product_hash(hash) config.expect_with :rspec do |c| c.syntax = :expect end + config.filter_run_excluding :requires_php_on_stack => lambda { |series| !php_on_stack?(series) } end def successful_body(app, options = {}) @@ -50,3 +51,15 @@ def expected_default_php(stack) "7.3" end end + +def php_on_stack?(series) + case ENV["STACK"] + when "cedar-14" + available = ["5.5", "5.6", "7.0", "7.1", "7.2", "7.3"] + when "heroku-16" + available = ["5.6", "7.0", "7.1", "7.2", "7.3"] + else + available = ["7.1", "7.2", "7.3"] + end + available.include?(series) +end From 96c507c8ac6e19a5146251a9c8b3ca85595a8a32 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 12 Mar 2019 17:17:42 +0100 Subject: [PATCH 272/553] PHP boot combinations test --- .../conf/apache2.server.include.broken | 1 + .../bootopts/conf/apache2.server.include.conf | 12 ++ .../apache2.server.include.dynamic.conf.php | 14 ++ .../fixtures/bootopts/conf/fpm.include.broken | 1 + test/fixtures/bootopts/conf/fpm.include.conf | 3 + .../conf/fpm.include.dynamic.conf.php | 3 + .../bootopts/conf/nginx.server.include.broken | 2 + .../bootopts/conf/nginx.server.include.conf | 15 ++ .../nginx.server.include.dynamic.conf.php | 8 ++ test/fixtures/bootopts/docroot/index.php | 1 + test/fixtures/bootopts/index.php | 1 + test/spec/php_shared.rb | 129 ++++++++++++++++++ 12 files changed, 190 insertions(+) create mode 100644 test/fixtures/bootopts/conf/apache2.server.include.broken create mode 100644 test/fixtures/bootopts/conf/apache2.server.include.conf create mode 100644 test/fixtures/bootopts/conf/apache2.server.include.dynamic.conf.php create mode 100644 test/fixtures/bootopts/conf/fpm.include.broken create mode 100644 test/fixtures/bootopts/conf/fpm.include.conf create mode 100644 test/fixtures/bootopts/conf/fpm.include.dynamic.conf.php create mode 100644 test/fixtures/bootopts/conf/nginx.server.include.broken create mode 100644 test/fixtures/bootopts/conf/nginx.server.include.conf create mode 100644 test/fixtures/bootopts/conf/nginx.server.include.dynamic.conf.php create mode 100644 test/fixtures/bootopts/docroot/index.php create mode 100644 test/fixtures/bootopts/index.php diff --git a/test/fixtures/bootopts/conf/apache2.server.include.broken b/test/fixtures/bootopts/conf/apache2.server.include.broken new file mode 100644 index 000000000..760d622eb --- /dev/null +++ b/test/fixtures/bootopts/conf/apache2.server.include.broken @@ -0,0 +1 @@ +RewriteEnBroken Wat? diff --git a/test/fixtures/bootopts/conf/apache2.server.include.conf b/test/fixtures/bootopts/conf/apache2.server.include.conf new file mode 100644 index 000000000..cbe1b0b6e --- /dev/null +++ b/test/fixtures/bootopts/conf/apache2.server.include.conf @@ -0,0 +1,12 @@ +RewriteEngine On + +RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ +RewriteRule ^(.*) - [E=BASE:%1] + +RewriteCond %{ENV:REDIRECT_STATUS} ^$ +RewriteRule ^index\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L] + +RewriteCond %{REQUEST_FILENAME} -f +RewriteRule .? - [L] + +RewriteRule .? %{ENV:BASE}/index.php [L] diff --git a/test/fixtures/bootopts/conf/apache2.server.include.dynamic.conf.php b/test/fixtures/bootopts/conf/apache2.server.include.dynamic.conf.php new file mode 100644 index 000000000..b18bf6019 --- /dev/null +++ b/test/fixtures/bootopts/conf/apache2.server.include.dynamic.conf.php @@ -0,0 +1,14 @@ +RewriteEngine On + +RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ +RewriteRule ^(.*) - [E=BASE:%1] + +RewriteCond %{ENV:REDIRECT_STATUS} ^$ +RewriteRule ^index\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L] + +RewriteCond %{REQUEST_FILENAME} -f +RewriteRule .? - [L] + +RewriteRule .? %{ENV:BASE}/index.php [L] + +ProxyTimeout diff --git a/test/fixtures/bootopts/conf/fpm.include.broken b/test/fixtures/bootopts/conf/fpm.include.broken new file mode 100644 index 000000000..b518f35b0 --- /dev/null +++ b/test/fixtures/bootopts/conf/fpm.include.broken @@ -0,0 +1 @@ +foobar = 0 diff --git a/test/fixtures/bootopts/conf/fpm.include.conf b/test/fixtures/bootopts/conf/fpm.include.conf new file mode 100644 index 000000000..739005d6c --- /dev/null +++ b/test/fixtures/bootopts/conf/fpm.include.conf @@ -0,0 +1,3 @@ +request_slowlog_timeout = 1 + +php_value[memory_limit] = 32M diff --git a/test/fixtures/bootopts/conf/fpm.include.dynamic.conf.php b/test/fixtures/bootopts/conf/fpm.include.dynamic.conf.php new file mode 100644 index 000000000..0cb5219c3 --- /dev/null +++ b/test/fixtures/bootopts/conf/fpm.include.dynamic.conf.php @@ -0,0 +1,3 @@ +request_slowlog_timeout = 1 + +php_value[memory_limit] = M diff --git a/test/fixtures/bootopts/conf/nginx.server.include.broken b/test/fixtures/bootopts/conf/nginx.server.include.broken new file mode 100644 index 000000000..d8613b3f8 --- /dev/null +++ b/test/fixtures/bootopts/conf/nginx.server.include.broken @@ -0,0 +1,2 @@ +location / { + erp diff --git a/test/fixtures/bootopts/conf/nginx.server.include.conf b/test/fixtures/bootopts/conf/nginx.server.include.conf new file mode 100644 index 000000000..775923a02 --- /dev/null +++ b/test/fixtures/bootopts/conf/nginx.server.include.conf @@ -0,0 +1,15 @@ +location / { + # try to serve file directly, fallback to index.php + try_files $uri /index.php$is_args$args; +} + +location ~ ^/index\.php(/|$) { + try_files @heroku-fcgi @heroku-fcgi; + internal; +} + +# return 404 for all other php files not matching the front controller +# this prevents access to other php files you don't want to be accessible. +location ~ \.php$ { + return 404; +} diff --git a/test/fixtures/bootopts/conf/nginx.server.include.dynamic.conf.php b/test/fixtures/bootopts/conf/nginx.server.include.dynamic.conf.php new file mode 100644 index 000000000..613854bbf --- /dev/null +++ b/test/fixtures/bootopts/conf/nginx.server.include.dynamic.conf.php @@ -0,0 +1,8 @@ +location / { + index index.php index.html index.htm; +} + +# for people with app root as doc root, restrict access to a few things +location ~ ^/(composer\.(json|lock|phar)$|Procfile$|/|/) { + deny all; +} diff --git a/test/fixtures/bootopts/docroot/index.php b/test/fixtures/bootopts/docroot/index.php new file mode 100644 index 000000000..c4837a32b --- /dev/null +++ b/test/fixtures/bootopts/docroot/index.php @@ -0,0 +1 @@ + { + 0 => [ + "heroku-php-apache2" + ], + '-C' => [ + nil, + "conf/apache2.server.include.conf", + "conf/apache2.server.include.dynamic.conf.php", + "conf/apache2.server.include.broken" + ], + '-F' => [ + nil, + "conf/fpm.include.conf", + "conf/fpm.include.dynamic.conf.php", + "conf/fpm.include.broken" + ], + 1 => [ # document root argument + nil, + "docroot/", + "brokendocroot/" + ] + }, + "nginx" => { + 0 => [ + "heroku-php-nginx" + ], + '-C' => [ + nil, + "conf/nginx.server.include.conf", + "conf/nginx.server.include.dynamic.conf.php", + "conf/nginx.server.include.broken" + ], + '-F' => [ + nil, + "conf/fpm.include.conf", + "conf/fpm.include.dynamic.conf.php", + "conf/fpm.include.broken" + ], + 1 => [ # document root argument + nil, + "docroot/", + "brokendocroot/" + ] + } + } + # generate combinations for given keys, or all if nil + def self.genmatrix(matrix, keys = nil) + product_hash(matrix.select {|k,v| !keys || keys.include?(k) }) + end + # generate command based on given combination info hash + def self.gencmd(args) + args.compact.map { |k,v| + if k.is_a? Numeric + ret = v.shellescape # it's an argument, so we want the value only + else + ret = k.shellescape + unless !!v == v # check if boolean + ret.concat(" #{v.shellescape}") # --foobar flags have no values + end + end + ret + }.join(" ").strip + end + + matrices.each do |server, matrix| + context "running PHP #{series} and the #{server} web server" do + before(:all) do + @app = Hatchet::Runner.new('test/fixtures/bootopts', stack: ENV["STACK"], + before_deploy: -> { system("composer require --quiet --no-update php '#{series}.*' && composer update --quiet --ignore-platform-reqs") or raise "Failed to require PHP version" } + ) + @app.deploy + # so we don't have to worry about overlapping dynos causing test failures because only one free is allowed at a time + @app.api_rate_limit.call.formation.update(@app.name, "web", {"size" => "Standard-1X"}) + end + + after(:all) do + # scale back down when we're done + # we should do this, because teardown! doesn't remove the app unless we're over the app limit + @app.api_rate_limit.call.formation.update(@app.name, "web", {"size" => "free"}) + @app.teardown! + end + + # we don't want to test all possible combinations of all arguments, as that'd be thousands + interesting = Array.new + interesting << [0, 1] # with and without document root + interesting << [0, '-C'] + interesting << [0, '-F'] + combinations = interesting.map {|v| genmatrix(matrix, v)}.flatten(1).uniq + # # a few more "manual" cases + combinations << {0 => "heroku-php-#{server}", "-C" => "conf/#{server}.server.include.conf", "-F" => "conf/fpm.include.conf"} + combinations.each do | combination | + cmd = gencmd(combination) + context "launching using `#{cmd}'" do + if combination.value?(false) or cmd.match("broken") + it "does not boot" do + # check if "timeout" exited with a status other than 124, which means the process exited (due to the expected error) before "timeout" stepped in after the given duration (five seconds) and terminated it + expect_exit(expect: :not_to, code: 124) { @app.run("timeout 5 #{cmd}") } + end + else + it "boots" do + # check if "timeout" exited with status 124, which means the process was still alive after the given duration (five seconds) and "timeout" terminated it as a result + expect_exit(expect: :to, code: 124) { @app.run("timeout 5 #{cmd}") } + end + end + end + end + + context "launching using too many arguments" do + it "fails to boot" do + expect_exit(expect: :not_to, code: 124) { @app.run("timeout 5 heroku-php-#{server} docroot/ anotherarg") } + end + end + + context "launching using unknown options" do + it "fails to boot" do + expect_exit(expect: :not_to, code: 124) { @app.run("timeout 5 heroku-php-#{server} --what -u erp") } + end + end + end + end end From 2ffde189b43c0cfc321960fef0a80afbe59339bb Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 11 Mar 2019 18:22:20 +0100 Subject: [PATCH 273/553] WEB_CONCURRENCY Hatchet tests --- test/fixtures/bootopts/conf/fpm.onegig.conf | 1 + test/fixtures/bootopts/docroot/.user.ini | 1 + .../bootopts/docroot/onegig/.user.ini | 1 + test/spec/php_shared.rb | 45 +++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 test/fixtures/bootopts/conf/fpm.onegig.conf create mode 100644 test/fixtures/bootopts/docroot/.user.ini create mode 100644 test/fixtures/bootopts/docroot/onegig/.user.ini diff --git a/test/fixtures/bootopts/conf/fpm.onegig.conf b/test/fixtures/bootopts/conf/fpm.onegig.conf new file mode 100644 index 000000000..f868e6690 --- /dev/null +++ b/test/fixtures/bootopts/conf/fpm.onegig.conf @@ -0,0 +1 @@ +php_value[memory_limit] = 1024M diff --git a/test/fixtures/bootopts/docroot/.user.ini b/test/fixtures/bootopts/docroot/.user.ini new file mode 100644 index 000000000..a09b94390 --- /dev/null +++ b/test/fixtures/bootopts/docroot/.user.ini @@ -0,0 +1 @@ +memory_limit=32M diff --git a/test/fixtures/bootopts/docroot/onegig/.user.ini b/test/fixtures/bootopts/docroot/onegig/.user.ini new file mode 100644 index 000000000..11304ebe0 --- /dev/null +++ b/test/fixtures/bootopts/docroot/onegig/.user.ini @@ -0,0 +1 @@ +memory_limit=1024M diff --git a/test/spec/php_shared.rb b/test/spec/php_shared.rb index e540ac24d..786e97484 100644 --- a/test/spec/php_shared.rb +++ b/test/spec/php_shared.rb @@ -141,6 +141,51 @@ def self.gencmd(args) expect_exit(expect: :not_to, code: 124) { @app.run("timeout 5 heroku-php-#{server} --what -u erp") } end end + + context "setting concurrency via .user.ini memory_limit" do + it "calculates concurrency correctly" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} docroot/") }) + .to match("16 processes at 32MB memory limit") + end + it "always launches at least one worker" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} docroot/onegig/") }) + .to match("1 processes at 1024MB memory limit") + end + it "is only done for a .user.ini directly in the document root" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server}") }) + .to match("4 processes at 128MB memory limit") + end + end + + context "setting concurrency via FPM config memory_limit" do + it "calculates concurrency correctly" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} -F conf/fpm.include.conf") }) + .to match("16 processes at 32MB memory limit") + end + it "always launches at least one worker" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} -F conf/fpm.onegig.conf") }) + .to match("1 processes at 1024MB memory limit") + end + it "takes precedence over a .user.ini memory_limit" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} -F conf/fpm.include.conf docroot/onegig/") }) + .to match("16 processes at 32MB memory limit") + end + end + + context "setting WEB_CONCURRENCY explicitly" do + it "uses the explicit value" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server}", nil, {:heroku => {:env => "WEB_CONCURRENCY=22"}}) }) + .to match "Using WEB_CONCURRENCY=22" + end + it "overrides a .user.ini memory_limit" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} docroot/onegig/", nil, {:heroku => {:env => "WEB_CONCURRENCY=22"}}) }) + .to match "Using WEB_CONCURRENCY=22" + end + it "overrides an FPM config memory_limit" do + expect(expect_exit(code: 124) { @app.run("timeout 5 heroku-php-#{server} -F conf/fpm.onegig.conf", nil, {:heroku => {:env => "WEB_CONCURRENCY=22"}}) }) + .to match "Using WEB_CONCURRENCY=22" + end + end end end end From f8d73283c982cc614c26afd9b6d531f3346e6e40 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 13 Mar 2019 18:58:25 +0100 Subject: [PATCH 274/553] helper to create hatchet app with stack and platform repo if in env --- test/spec/php_default_spec.rb | 2 +- test/spec/php_shared.rb | 4 ++-- test/spec/spec_helper.rb | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/test/spec/php_default_spec.rb b/test/spec/php_default_spec.rb index 70a589609..bfba00206 100644 --- a/test/spec/php_default_spec.rb +++ b/test/spec/php_default_spec.rb @@ -3,7 +3,7 @@ describe "A PHP application" do context "with just an index.php" do let(:app) { - Hatchet::Runner.new('test/fixtures/default', stack: ENV["STACK"]) + new_app_with_stack_and_platrepo('test/fixtures/default') } it "picks a default version from the expected series" do app.deploy do |app| diff --git a/test/spec/php_shared.rb b/test/spec/php_shared.rb index 786e97484..945dc0352 100644 --- a/test/spec/php_shared.rb +++ b/test/spec/php_shared.rb @@ -3,7 +3,7 @@ shared_examples "A PHP application with a composer.json" do |series| context "requiring PHP #{series}" do let(:app) { - Hatchet::Runner.new('test/fixtures/default', stack: ENV["STACK"], + new_app_with_stack_and_platrepo('test/fixtures/default', before_deploy: -> { system("composer require --quiet --no-update php '#{series}.*' && composer update --quiet --ignore-platform-reqs") or raise "Failed to require PHP version" } ) } @@ -90,7 +90,7 @@ def self.gencmd(args) matrices.each do |server, matrix| context "running PHP #{series} and the #{server} web server" do before(:all) do - @app = Hatchet::Runner.new('test/fixtures/bootopts', stack: ENV["STACK"], + @app = new_app_with_stack_and_platrepo('test/fixtures/bootopts', before_deploy: -> { system("composer require --quiet --no-update php '#{series}.*' && composer update --quiet --ignore-platform-reqs") or raise "Failed to require PHP version" } ) @app.deploy diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb index 3c8579052..d391e9994 100644 --- a/test/spec/spec_helper.rb +++ b/test/spec/spec_helper.rb @@ -63,3 +63,11 @@ def php_on_stack?(series) end available.include?(series) end + +def new_app_with_stack_and_platrepo(*args, **kwargs) + kwargs[:stack] ||= ENV["STACK"] + kwargs[:config] ||= {} + kwargs[:config]["HEROKU_PHP_PLATFORM_REPOSITORIES"] ||= ENV["HEROKU_PHP_PLATFORM_REPOSITORIES"] + kwargs[:config].compact! + Hatchet::Runner.new(*args, **kwargs) +end From 54855782205926ec156286f922c3c1569acfb3ec Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 20 Dec 2018 01:48:04 +0100 Subject: [PATCH 275/553] Restructure Nginx configs and loading A main.conf is now bundled with the buildpack, as well as updated fastcgi_params and mime.types. This main config is used for the server via -c (instead of the system default), and the previous "heroku.conf.php" config still gets included using a dynamic directive. This retains backwards compatibility for existing custom configs, but allows Nginx versions 1.9.3 and newer, which do not allow more than one "http" block, to work. Because changing the base config with "nginx -c" also resets the directory relative to which "include" lookups occur, we must bundle "fastcgi_params" and "mime.types", as they may be included in existing "heroku-php-nginx -c" or "heroku-php-nginx -C" situations. Fixes #198 --- CHANGELOG.md | 6 ++ bin/heroku-hhvm-nginx | 14 ++--- bin/heroku-php-nginx | 14 ++--- conf/nginx/fastcgi_params | 24 ++++++++ conf/nginx/main.conf | 9 +++ conf/nginx/mime.types | 89 ++++++++++++++++++++++++++++ support/build/_conf/nginx/nginx.conf | 36 ----------- support/build/nginx | 3 - 8 files changed, 142 insertions(+), 53 deletions(-) create mode 100644 conf/nginx/fastcgi_params create mode 100644 conf/nginx/main.conf create mode 100644 conf/nginx/mime.types delete mode 100644 support/build/_conf/nginx/nginx.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b5c6aba1..668b5b844 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v???? (2019-??-??) + +### CHG + +- Restructure Nginx configs and add compatibility with Nginx/1.9.3+ (#198) [David Zuelke] + ## v151 (2019-03-08) ### ADD diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx index 677dd9b4d..a564091ac 100755 --- a/bin/heroku-hhvm-nginx +++ b/bin/heroku-hhvm-nginx @@ -88,12 +88,10 @@ print_help() { [default: /conf/nginx/default_include.conf.php, or a more version-specific file from a subdirectory] -c The path to the full configuration file that is - included after Heroku's (or your local) Nginx config - is loaded. It must contain an 'http { ... }' block - with a 'server { ... }' inside that contains 'listen' - and 'root' (see option -C above), but no global, - directives (globals are read from the system's default - Nginx configuration files). + included after Heroku's main Nginx config has been + loaded. It must contain an 'http { ... }' block with a + 'server { ... }' inside that contains 'listen' and + 'root' (see option -C above) directives. [default: /conf/nginx/heroku.conf.php, or a more version-specific file from a subdirectory] -h, --help Display this help screen and exit. @@ -286,6 +284,8 @@ if [[ -n ${nginx_config:-} || ( ${nginx_config:=$(findconfig "$nginx_version" "$ fi nginx_config=$(php_passthrough "$nginx_config") +nginx_main=$(findconfig "$nginx_version" "$bp_dir/conf/nginx/main.conf") + if [[ -z ${WEB_CONCURRENCY:-} ]]; then maxprocs=$(ulimit -u) ram="512M" @@ -398,7 +398,7 @@ echo "Starting nginx..." >&2 trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - nginx -g "daemon off; include $nginx_config;" & pid=$! + nginx -c "$nginx_main" -g "include $nginx_config;" & pid=$! wait ) & pids+=($!) diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx index ed48c704f..bd7c47361 100755 --- a/bin/heroku-php-nginx +++ b/bin/heroku-php-nginx @@ -88,12 +88,10 @@ print_help() { [default: /conf/nginx/default_include.conf.php, or a more version-specific file from a subdirectory] -c The path to the full configuration file that is - included after Heroku's (or your local) Nginx config - is loaded. It must contain an 'http { ... }' block - with a 'server { ... }' inside that contains 'listen' - and 'root' (see option -C above), but no global, - directives (globals are read from the system's default - Nginx configuration files). + included after Heroku's main Nginx config has been + loaded. It must contain an 'http { ... }' block with a + 'server { ... }' inside that contains 'listen' and + 'root' (see option -C above) directives. [default: /conf/nginx/heroku.conf.php, or a more version-specific file from a subdirectory] -F The path to the configuration file to include at the @@ -298,6 +296,8 @@ if [[ -n ${nginx_config:-} || ( ${nginx_config:=$(findconfig "$nginx_version" "$ fi nginx_config=$(php_passthrough "$nginx_config") +nginx_main=$(findconfig "$nginx_version" "$bp_dir/conf/nginx/main.conf") + if [[ -z ${WEB_CONCURRENCY:-} ]]; then maxprocs=$(ulimit -u) ram="512M" @@ -429,7 +429,7 @@ echo "Starting nginx..." >&2 trap 'trap - TERM; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -TERM $BASHPID' TERM trap 'trap - USR1 EXIT; kill -TERM $pid 2> /dev/null || true & wait $pid 2> /dev/null || true; [[ ${BASHPID:-} ]] && kill -USR1 $BASHPID' USR1 - nginx -g "daemon off; include $nginx_config;" & pid=$! + nginx -c "$nginx_main" -g "include $nginx_config;" & pid=$! wait ) & pids+=($!) diff --git a/conf/nginx/fastcgi_params b/conf/nginx/fastcgi_params new file mode 100644 index 000000000..71e2c2e3b --- /dev/null +++ b/conf/nginx/fastcgi_params @@ -0,0 +1,24 @@ + +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; diff --git a/conf/nginx/main.conf b/conf/nginx/main.conf new file mode 100644 index 000000000..b0a0d93e2 --- /dev/null +++ b/conf/nginx/main.conf @@ -0,0 +1,9 @@ +daemon off; + +worker_processes auto; + +error_log stderr; + +events { + worker_connections 1024; +} diff --git a/conf/nginx/mime.types b/conf/nginx/mime.types new file mode 100644 index 000000000..89be9a4cd --- /dev/null +++ b/conf/nginx/mime.types @@ -0,0 +1,89 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; + + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/support/build/_conf/nginx/nginx.conf b/support/build/_conf/nginx/nginx.conf deleted file mode 100644 index 49589ef5c..000000000 --- a/support/build/_conf/nginx/nginx.conf +++ /dev/null @@ -1,36 +0,0 @@ - -#user nobody; -worker_processes auto; - -error_log stderr; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - server_tokens off; -} diff --git a/support/build/nginx b/support/build/nginx index 4ecac24c1..b1ab4d7b2 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -57,9 +57,6 @@ MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.nginx.sh\",\"profile\":\"bin/profile.nginx.sh\"}"}" -mkdir -p ${OUT_PREFIX}/etc/nginx -cp $(dirname $BASH_SOURCE)/_conf/nginx/nginx.conf ${OUT_PREFIX}/etc/nginx/nginx.conf - mkdir -p ${OUT_PREFIX}/bin # this gets sourced after package install, so that the buildpack and following buildpacks can invoke cat > ${OUT_PREFIX}/bin/export.nginx.sh <<'EOF' From f937731483a0a79ebc7778e44a5e4fd998053fee Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 27 Feb 2019 01:16:30 +0100 Subject: [PATCH 276/553] ngx_http_ssl_module, fixes #182 --- CHANGELOG.md | 1 + support/build/nginx | 3 ++- test/spec/nginx_spec.rb | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test/spec/nginx_spec.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 668b5b844..d3d966f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### CHG - Restructure Nginx configs and add compatibility with Nginx/1.9.3+ (#198) [David Zuelke] +- Build Nginx with `ngx_http_ssl_module` (#182) [David Zuelke] ## v151 (2019-03-08) diff --git a/support/build/nginx b/support/build/nginx index b1ab4d7b2..16986a162 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -42,7 +42,8 @@ VAR=${OUT_PREFIX}/var --http-scgi-temp-path=${VAR}/run/nginx/scgi_temp \ --http-log-path=${VAR}/log/nginx/access.log \ --error-log-path=${VAR}/log/nginx/error.log \ - --with-http_realip_module + --with-http_realip_module \ + --with-http_ssl_module make -s -j 9 make install -s find ${OUT_PREFIX} -type f \( -executable -o -name '*.a' \) -exec sh -c "file -i '{}' | grep -Eq 'application/x-(archive|executable|sharedlib); charset=binary'" \; -print | xargs strip --strip-unneeded diff --git a/test/spec/nginx_spec.rb b/test/spec/nginx_spec.rb new file mode 100644 index 000000000..2913d36cd --- /dev/null +++ b/test/spec/nginx_spec.rb @@ -0,0 +1,13 @@ +require_relative "spec_helper" + +describe "A PHP application" do + let(:app) { + new_app_with_stack_and_platrepo('test/fixtures/default') + } + it "installs nginx with OpenSSL support" do + app.deploy do |app| + expect(app.output).to match(/- nginx \((\d+\.\d+\.\d+)/) + expect(app.run('nginx -V')).to match(/^built with OpenSSL/) + end + end +end From ac308f69e5e831caa6bcd8821be2f198d144efc5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 27 Feb 2019 01:19:09 +0100 Subject: [PATCH 277/553] Nginx/1.14.2, fixes #241 and #285 --- CHANGELOG.md | 4 + bin/util/platform.php | 2 +- conf/nginx/fastcgi_params | 1 + conf/nginx/mime.types | 166 ++++++++++---------- support/build/nginx | 6 +- support/build/{nginx-1.8.1 => nginx-1.14.2} | 0 test/spec/nginx_spec.rb | 6 +- 7 files changed, 100 insertions(+), 85 deletions(-) rename support/build/{nginx-1.8.1 => nginx-1.14.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3d966f2d..258d9854c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v???? (2019-??-??) +### ADD + +- Nginx/1.14.2 (#241, #285) [David Zuelke] + ### CHG - Restructure Nginx configs and add compatibility with Nginx/1.9.3+ (#198) [David Zuelke] diff --git a/bin/util/platform.php b/bin/util/platform.php index c87abb542..38dea6140 100755 --- a/bin/util/platform.php +++ b/bin/util/platform.php @@ -163,7 +163,7 @@ function mkmetas($package, array &$metapaks, &$have_runtime_req = false) { } $require["heroku-sys/apache"] = "^2.4.10"; -$require["heroku-sys/nginx"] = "~1.8.0"; +$require["heroku-sys/nginx"] = "^1.8.0"; preg_match("#^([^-]+)(?:-([0-9]+))?\$#", $STACK, $stack); $provide = ["heroku-sys/".$stack[1] => (isset($stack[2])?$stack[2]:"1").gmdate(".Y.m.d")]; # cedar: 14.2016.02.16 etc diff --git a/conf/nginx/fastcgi_params b/conf/nginx/fastcgi_params index 71e2c2e3b..28decb955 100644 --- a/conf/nginx/fastcgi_params +++ b/conf/nginx/fastcgi_params @@ -9,6 +9,7 @@ fastcgi_param REQUEST_URI $request_uri; fastcgi_param DOCUMENT_URI $document_uri; fastcgi_param DOCUMENT_ROOT $document_root; fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; fastcgi_param HTTPS $https if_not_empty; fastcgi_param GATEWAY_INTERFACE CGI/1.1; diff --git a/conf/nginx/mime.types b/conf/nginx/mime.types index 89be9a4cd..8a2348ab0 100644 --- a/conf/nginx/mime.types +++ b/conf/nginx/mime.types @@ -1,89 +1,95 @@ types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; - image/png png; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - image/svg+xml svg svgz; - image/webp webp; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; - application/font-woff woff; - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.wap.wmlc wmlc; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; - application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; - application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; } diff --git a/support/build/nginx b/support/build/nginx index 16986a162..eed0879ec 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -25,8 +25,10 @@ curl -L ${dep_url} | tar xz pushd ${dep_dirname} -# patch a bunch of fallthrough cases with missing comments, which would error on GCC7 -curl -L https://github.com/nginx/nginx/commit/8449f750e62cd229026e9df3bd023ec7e073a7d4.patch | patch -p1 +if dpkg --compare-versions "$dep_version" "lt" 1.13.1; then + # patch a bunch of fallthrough cases with missing comments, which would error on GCC7 + curl -L https://github.com/nginx/nginx/commit/8449f750e62cd229026e9df3bd023ec7e073a7d4.patch | patch -p1 +fi ETC=${OUT_PREFIX}/etc VAR=${OUT_PREFIX}/var diff --git a/support/build/nginx-1.8.1 b/support/build/nginx-1.14.2 similarity index 100% rename from support/build/nginx-1.8.1 rename to support/build/nginx-1.14.2 diff --git a/test/spec/nginx_spec.rb b/test/spec/nginx_spec.rb index 2913d36cd..ef5cd7238 100644 --- a/test/spec/nginx_spec.rb +++ b/test/spec/nginx_spec.rb @@ -4,9 +4,11 @@ let(:app) { new_app_with_stack_and_platrepo('test/fixtures/default') } - it "installs nginx with OpenSSL support" do + it "installs a recent stable nginx with OpenSSL support" do app.deploy do |app| - expect(app.output).to match(/- nginx \((\d+\.\d+\.\d+)/) + nginx = app.output.match(/- nginx \((\d+\.\d*[02468]\.\d+)/) + expect(nginx).not_to be_nil, "expected nginx install line in build output" + expect(Gem::Dependency.new('nginx', '~> 1.14').match?('nginx', nginx[1])).to be == true, "expected nginx version compatible with selector '~> 1.14' but got #{nginx[1]}" expect(app.run('nginx -V')).to match(/^built with OpenSSL/) end end From 1b99af5b6677d8a3a251da564de7497756baddb5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 27 Feb 2019 01:48:49 +0100 Subject: [PATCH 278/553] Nginx MIME types for woff and woff2, fixes #286 --- CHANGELOG.md | 1 + conf/nginx/mime.types | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 258d9854c..ee354c5fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - Nginx/1.14.2 (#241, #285) [David Zuelke] +- Update Nginx MIME types for woff and woff2 formats (#286) [David Zuelke] ### CHG diff --git a/conf/nginx/mime.types b/conf/nginx/mime.types index 8a2348ab0..296125695 100644 --- a/conf/nginx/mime.types +++ b/conf/nginx/mime.types @@ -24,7 +24,9 @@ types { image/x-jng jng; image/x-ms-bmp bmp; - application/font-woff woff; + font/woff woff; + font/woff2 woff2; + application/java-archive jar war ear; application/json json; application/mac-binhex40 hqx; From df74222d9e52b0b517a5cd53fa6e6b434f8a78ff Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 13 Mar 2019 15:55:45 +0100 Subject: [PATCH 279/553] v152 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee354c5fd..41cfcb65c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v???? (2019-??-??) +## v152 (2019-03-13) ### ADD From ae4b8b106d4d4b96ecf9eea2e352f30ff68f258a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 15 Mar 2019 00:57:18 +0100 Subject: [PATCH 280/553] ext-newrelic/8.6.0.238 --- CHANGELOG.md | 6 ++++++ .../{newrelic-8.5.0.235 => newrelic-8.6.0.238} | 0 .../{newrelic-8.5.0.235 => newrelic-8.6.0.238} | 0 .../{newrelic-8.5.0.235 => newrelic-8.6.0.238} | 0 .../{newrelic-8.5.0.235 => newrelic-8.6.0.238} | 0 .../{newrelic-8.5.0.235 => newrelic-8.6.0.238} | 0 .../{newrelic-8.5.0.235 => newrelic-8.6.0.238} | 0 7 files changed, 6 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.5.0.235 => newrelic-8.6.0.238} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.5.0.235 => newrelic-8.6.0.238} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.5.0.235 => newrelic-8.6.0.238} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.5.0.235 => newrelic-8.6.0.238} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.5.0.235 => newrelic-8.6.0.238} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{newrelic-8.5.0.235 => newrelic-8.6.0.238} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cfcb65c..ed39ee9fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v153 (2019-03-??) + +### ADD + +- ext-newrelic/8.6.0.238 [David Zuelke] + ## v152 (2019-03-13) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.5.0.235 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.5.0.235 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.5.0.235 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.5.0.235 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.5.0.235 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/newrelic-8.5.0.235 rename to support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 From 261c8a98338419f55cd9d21f42ca91bfab479eb7 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 15 Mar 2019 00:58:06 +0100 Subject: [PATCH 281/553] ext-redis/4.3.0 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{redis-4.2.0 => redis-4.3.0} | 0 .../no-debug-non-zts-20131226/{redis-4.2.0 => redis-4.3.0} | 0 .../no-debug-non-zts-20151012/{redis-4.2.0 => redis-4.3.0} | 0 .../no-debug-non-zts-20160303/{redis-4.2.0 => redis-4.3.0} | 0 .../no-debug-non-zts-20170718/{redis-4.2.0 => redis-4.3.0} | 0 .../no-debug-non-zts-20180731/{redis-4.2.0 => redis-4.3.0} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{redis-4.2.0 => redis-4.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{redis-4.2.0 => redis-4.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{redis-4.2.0 => redis-4.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{redis-4.2.0 => redis-4.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{redis-4.2.0 => redis-4.3.0} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{redis-4.2.0 => redis-4.3.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed39ee9fd..2e742f00a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-newrelic/8.6.0.238 [David Zuelke] +- ext-redis/4.3.0 [David Zuelke] ## v152 (2019-03-13) diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/redis-4.2.0 rename to support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/redis-4.2.0 rename to support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/redis-4.2.0 rename to support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/redis-4.2.0 rename to support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/redis-4.2.0 rename to support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/redis-4.2.0 rename to support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 From d7e0cf7d2ca7519f7bd94b32198153e805a8d48f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 18 Mar 2019 23:20:01 +0100 Subject: [PATCH 282/553] v153 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e742f00a..a157ebd12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v153 (2019-03-??) +## v153 (2019-03-18) ### ADD From 1de503467fd7f51b877b69ca2c9a84d26d11cde8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 19 Mar 2019 00:54:10 +0100 Subject: [PATCH 283/553] [skip ci] do not test tags against dev platform repo in travis --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca8d130d0..004a13d02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,8 @@ matrix: - env: STACK=heroku-18 if: branch = master OR tag IS present - env: STACK=cedar-14 HEROKU_PHP_PLATFORM_REPOSITORIES="- https://lang-php.s3.amazonaws.com/dist-cedar-14-develop/" - if: branch != master + if: branch != master AND tag IS blank - env: STACK=heroku-16 HEROKU_PHP_PLATFORM_REPOSITORIES="- https://lang-php.s3.amazonaws.com/dist-heroku-16-develop/" - if: branch != master + if: branch != master AND tag IS blank - env: STACK=heroku-18 HEROKU_PHP_PLATFORM_REPOSITORIES="- https://lang-php.s3.amazonaws.com/dist-heroku-18-develop/" - if: branch != master + if: branch != master AND tag IS blank From f49cc33036e3522ac9db6746f7d840333e94044e Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 19 Mar 2019 17:15:42 +0100 Subject: [PATCH 284/553] more platform install details --- support/build/README.md | 127 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 121 insertions(+), 6 deletions(-) diff --git a/support/build/README.md b/support/build/README.md index 10b07852e..0bd15b5c9 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -1,18 +1,133 @@ # Building Custom Platform Packages and Repositories +**Please note that Heroku cannot provide support for issues related to custom platform repositories and packages.** + ## Introduction -**Please note that Heroku cannot provide support for issues related to custom platform repositories and packages.** +### Background + +PHP can be extended with so-called *extensions*, which are typically written in C and interface with the engine through specific APIs. These extensions most commonly provide bindings to native system libraries (e.g. `ext-amqp` for `libamqp`) to expose functionality to applications, but they can also hook into the PHP engine to enable certain features or insights (e.g. `ext-newrelic` for instrumentation). + +Unlike language ecosystems such as Python or Ruby, PHP has no widely established and standardized method of compiling installing native extensions on a per-project basis during installation of an application's dependencies. + +The [Composer](https://getcomposer.org) project is PHP's de-facto standard package manager. Through a `composer.json` file, applications express their dependencies; a dependency can be another user-land package, or a so-called *platform package*: a PHP runtime, or an extension. For user-land dependencies, the graph of requirements is reconciled at `composer update` time; platform package requirements are recorded separately. Together, they are written to the lock file, `composer.lock`, which enables reliable, stable installation of dependencies across environments. + +If a given platform dependency cannot be fulfilled during a `composer install` attempt, the operation will fail. It is therefore necessary to provide the PHP runtime version that fulfills all package's requirements, and enable any required extensions (via the [`extension=…`](http://php.net/manual/en/ini.core.php#ini.extension) directive in `php.ini` or a [`.ini` scan dir](http://php.net/manual/en/configuration.file.php#configuration.file.scan) config) ahead of a `composer install` attempt. + +On Heroku, when a PHP application is deployed, the `composer.lock` file is evaluated, and a new dependency graph that mirrors the application's platform dependencies (both direct ones and those required by other dependencies) is constructed. These requirements consist of special dependencies that contain actual platform packages, and this set of packages is then installed, before the regular installation of the application's dependencies (using a normal `composer install`) is performed. + +### How Heroku installs platform dependencies + +When an application is deployed, `bin/compile` extracts all platform dependencies from the application's `composer.lock` and constructs a new `composer.json`. This bulk of this process is performed in `bin/util/platform.php`. All platform requirements (for package `php`, `php-64bit`, and any package named `ext-…`) are extracted, their relative structure preserved, and all required package names are prefixed with "`heroku-sys/`" (so `php` becomes `heroku-sys/php`). + +The resulting `composer.json` gets written to `.heroku/php/` and is distinct from the application's `composer.json`. It now only holds information on required platform packages, as well as a few other details such as the custom repository to use. + +Assuming the following `composer.json` for an application: + + { + "require": { + "php": "~7.2", + "ext-mbstring": "*", + "mongodb/mongodb": "^1.4" + } + } + +The relevant parts of the corresponding `composer.lock` would look roughly like the following: + + { + "packages": [ + { + "name": "mongodb/mongodb", + "version": "1.4.2", + … + "require": { + "ext-hash": "*", + "ext-json": "*", + "ext-mongodb": "^1.5.0", + "php": ">=5.5" + } + }, + ], + "platform": { + "php": "~7.2", + "ext-mbstring": "*", + "ext-pq": "*" + } + } + +From this, the buildpack would create a "platform package" `.heroku/php/composer.json` like the following, with the main [packagist.org](https://packagist.org) repository disabled, and a few custom repositories as well as static package definitions added: + + { + "provide": { + "heroku-sys/heroku": "18.2019.03.19" + }, + "require": { + "composer.json/composer.lock": "dev-5f0dbc6293250a40259245759f113f27", + "mongodb/mongodb": "1.4.2" + }, + "repositories": [ + { + "packagist": false + }, + { + "type": "path", + "url": "…/support/installer/", + "options": { + "symlink": false + } + }, + { + "type": "composer", + "url": "https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/" + }, + { + "type": "package", + "package": [ + { + "type": "metapackage", + "name": "mongodb/mongodb", + "version": "1.4.2", + "require": { + "heroku-sys/ext-hash": "*", + "heroku-sys/ext-json": "*", + "heroku-sys/ext-mongodb": "^1.5.0", + "heroku-sys/php": ">=5.5" + } + }, + { + "type": "metapackage", + "name": "composer.json/composer.lock", + "version": "dev-5f0dbc6293250a40259245759f113f27", + "require": { + "heroku-sys/php": "~7.2", + "heroku-sys/ext-mbstring": "*", + "heroku-sys/ext-pq": "*" + } + } + ] + } + ] + } + +The structure of the originally required packages, such as `mongodb/mongodb`, is kept intact. This is done both to ensure that combinations requirements are taken into account the same way Composer does (two packages can have requirements for the same, say, `php` platform package), as well as to aid debugging: if, in the example above, `ext-mongodb` wasn't available on Heroku, then the error message from Composer would indicate that package `mongodb/mongodb` requires a non-existent package, and the user attempting the deploy would immediately understand why. + +The requirements from the main `composer.json`, which in `composer.lock` are located in the `platform` key, are moved to their own meta-package named "`composer.json/composer.lock`"; this is again to ensure that these dependencies are honored correctly in combination will all the other requirements, and that users would get an immediately readable error message if a required package isn't available. + +Also included, but omitted from the above example for brevity, are other packages such as the Nginx and Apache web servers, which users cannot directly specify as dependencies, but which are installed using the same mechanism as PHP or PHP extensions. + +The two special repositories listed are the so-called *platform repository*, hosted here on S3, which holds all the required packages, and the *platform installer*, which is pulled in from a relative path location in the buildpack itself. + +The custom Composer repository in the S3 bucket provides all of these magic `heroku-sys/…` packages; they are tarballs containing a binary build of PHP, or an extension, or a web server. Their metadata indicates their package type, download location, special installation hooks e.g. for activation of startup scripts, export instructions for e.g. `$PATH`, configuration files to copy on installation, and so forth. -### How it all works +The platform installer, implemented as a Heroku plugin, knows how to deal with all these details: it unpacks the binary tarballs, copies configuration files, prepares environment variable exports for `$PATH` so that binaries like `php` can be invoked. -When an application is deployed, `bin/compile` extracts all platform dependencies from the application's `composer.lock` and constructs a new `composer.json` (with all package names prefixed with `heroku-sys/`, so `php` becomes `heroku-sys/php`), which gets `composer install`ed using a custom Composer repository. +In the example above, the `ext-mbstring` extension is, for example, not a separate package, but provided by the `php` package. Unlike the `ext-json` and `ext-hash` requirements from `mongodb/mongodb`, which are also bundled with PHP, but always enabled, the `ext-mbstring` extension is built as a shared extension, and must explicitly be loaded. The metadata information for the `php` package contains the details of all provided extensions, so the installer knows, based on a list of requirements and Composer's internal installer and dependency state, that a `php.ini` include that explicitly loads the `mbstring.so` library must be generated for the application to function. -This `composer.json` gets written to `.heroku/php/` and is distinct from the application's `composer.json`. It only holds information on required platform packages. +The application also contains a requirement for the `ext-pq` PostgreSQL extension. This extension in turn internally requires `ext-raphf`. This dependency is contained in the platform repository that is used for installation, so the dependency graph will automatically contain this package, and it will be installed in the correct order: `ext-raphf` before `ext-pq`. As a result, the platform installer will generate the `extension=raphf.so` INI directive before the `extension=pq.so` INI directive, and PHP will start successfully. Were this not the case, PHP would fail to load `ext-pq` on startup, as `pq.so` could not find the `raphf.so` shared library it needs to function. -The custom Composer repository, running off an S3 bucket, provides all of these packages; the Composer installer plugin in `support/installer/` handles extraction, activation, configuration etc. +All these steps happen when the buildpack performs a simple `composer install` inside `.heroku/php/` - the generated `composer.json`, together with the repository and plugin information inside it, takes care of the rest. -### Custom platform packages and repositories +### Building custom platform packages and repositories To use custom platform packages (either new ones, or modifications of existing ones), a new Composer repository has to be created (see [the instructions in the main README](../../README.md#custom-platform-repositories) for usage info). All the tooling in here is designed to work with S3, since it is reliable and cheap. The bucket permissions should be set up so that a public listing is allowed. From f026ecd98c02656002c8e2555f3ed513f0b1b475 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 19 Mar 2019 17:32:01 +0100 Subject: [PATCH 285/553] update custom build instructions to only use Docker, and bump a few versions etc in examples --- support/build/README.md | 91 +++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 54 deletions(-) diff --git a/support/build/README.md b/support/build/README.md index 0bd15b5c9..89c9c06ba 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -137,11 +137,11 @@ These build formulae can have dependencies (e.g. an extension formula depends on The build formulae are also expected to generate a [manifest](#about-manifests), which is a `composer.json` containing all relevant information about a package. -In `support/build/_util`, three scripts (`deploy.sh` to deploy a package with its [manifest](#about-manifests), `mkrepo.sh` to (re-)generate a [repository](#about-repositories) from all existing manifests, and `sync.sh` to [sync between repos](#syncing-repositories)) take care of most of the heavy lifting. +In `support/build/_util`, three scripts (`deploy.sh` to deploy a package with its [manifest](#about-manifests), `mkrepo.sh` to (re-)generate a [repository](#about-repositories) from all existing manifests, and `sync.sh` to [sync between repos](#syncing-repositories)) take care of most of the heavy lifting. The directory is added to `$PATH` in `Dockerfile`, so the helpers can be invoked directly. ## Preparations -You may either build packages on a Heroku dyno, or locally using a Docker container. The instructions below use `heroku run`; simply replace them with the appropriate `docker run` call if you are using Docker. +Packages for a platform repository are best built using a Docker container (either locally, or using on a platform like Heroku). The instructions below use `docker run…` locally. The following environment variables are required: @@ -149,12 +149,15 @@ The following environment variables are required: - `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` with credentials for the S3 bucket - `S3_BUCKET` with the name of the S3 bucket to use for builds - `S3_PREFIX` (just a slash, or a prefix directory name **with a trailing, but no leading, slash**) -- `STACK` (currently, only "`cedar-14`" makes any sense) +- `STACK` (currently, only "`cedar-14`", "`heroku-16`" or "`heroku-18`" make any sense) The following environment variables are highly recommended (see section *Understanding Upstream Buckets*): - `UPSTREAM_S3_BUCKET` where dependencies are pulled from if they can't be found in `S3_BUCKET+S3_PREFIX`, should probably be set to "`lang-php`", the official Heroku bucket -- `UPSTREAM_S3_PREFIX`, where dependencies are pulled from if they can't be found in `S3_BUCKET+S3_PREFIX` should probably be set to "`dist-cedar-14-stable/`", the official Heroku stable repository prefix for the [cedar-14 stack](https://devcenter.heroku.com/articles/stack#cedar). +- `UPSTREAM_S3_PREFIX`, where dependencies are pulled from if they can't be found in `S3_BUCKET+S3_PREFIX` should probably be set to + - "`dist-cedar-14-stable/`", the official Heroku stable repository prefix for the [cedar-14 stack](https://devcenter.heroku.com/articles/stack). + - "`dist-heroku-16-stable/`", the official Heroku stable repository prefix for the [heroku-16 stack](https://devcenter.heroku.com/articles/stack). + - "`dist-heroku-18-stable/`", the official Heroku stable repository prefix for the [heroku-18 stack](https://devcenter.heroku.com/articles/stack). The following environment variables are optional: @@ -162,7 +165,7 @@ The following environment variables are optional: ### Understanding Prefixes -It is recommended to use a prefix like "`dist-cedar-14-develop/`" for `$S3_PREFIX`. The contents of this prefix will act as a development repository, where all building happens. The `support/build/_util/sync.sh` helper can later be used to synchronize to another prefix, e.g. "`dist-cedar-14-stable/`" that is used for production. For more info, see the [section on syncing repositories](#syncing-repositories) further below. +It is recommended to use a prefix like "`dist-heroku-18-develop/`" for `$S3_PREFIX`. The contents of this prefix will act as a development repository, where all building happens. The `sync.sh` helper can later be used to synchronize to another prefix, e.g. "`dist-heroku-18-stable/`" that is used for production. For more info, see the [section on syncing repositories](#syncing-repositories) further below. ### Understanding Upstream Buckets @@ -170,57 +173,38 @@ If you want to, for example, host only a few PECL extensions in a custom reposit Due to the order in which Composer looks up packages from repositories, including PHP builds in your custom repositories may lead to those builds getting used on deploy, which is not what you want - you want to use Heroku's official PHP builds, but still have access to your custom-built extensions. -That's where the `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX` env vars come into play; you'll usually set them to "`lang-php`" and "`dist-cedar-14-stable/`", respectively. +That's where the `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX` env vars documented above come into play; you'll usually set them to "`lang-php`" and "`dist-heroku-18-stable/`", respectively (or whatever stack you're trying to build for). That way, if your Bob formula for an extension contains e.g. this dependency declaration at the top: - # Build Path: /app/.heroku/php/ - # Build Deps: php-7.0.4 + # Build Path: /app/.heroku/php + # Build Deps: php-7.3.3 -then on build, Bob will first look for "`php-7.0.4`" in your S3 bucket, and then fall back to pulling it from the upstream bucket. This frees you of the burden of hosting and maintaining unnecessary packages yourself. +then on build, Bob will first look for "`php-7.3.3`" in your S3 bucket, and then fall back to pulling it from the upstream bucket. This frees you of the burden of hosting and maintaining unnecessary packages yourself. ### Build Environment Setup -#### Using Heroku - -To get started, create a Python app (*Bob* is a Python application) on Heroku inside a clone of this repository, and set your S3 config vars: - - $ heroku create --buildpack heroku/python - $ heroku config:set WORKSPACE_DIR=/app/support/build - $ heroku config:set AWS_ACCESS_KEY_ID= - $ heroku config:set AWS_SECRET_ACCESS_KEY= - $ heroku config:set S3_BUCKET= - $ heroku config:set S3_PREFIX= - $ heroku config:set UPSTREAM_S3_BUCKET=lang-php - $ heroku config:set UPSTREAM_S3_PREFIX=dist-cedar-14-stable/ - $ heroku config:set STACK=cedar-14 - $ git push heroku master - $ heroku ps:scale web=0 - -#### Using Docker - Refer to the [README in `support/build/_docker/`](_docker/README.md) for setup instructions. ## Building a Package To verify a formula, `bob build` can be used to build it: - $ heroku run bash - Running `bash` attached to terminal... up, run.6880 - ~ $ bob build extensions/no-debug-non-zts-20121212/yourextension-1.2.3 + $ docker run -ti --rm bash + ~ $ bob build extensions/no-debug-non-zts-20180731/yourextension-1.2.3 Fetching dependencies... found 1: - - php-5.5.31 - Building formula extensions/no-debug-non-zts-20121212/yourextension-1.2.3 + - php-7.3.3 + Building formula extensions/no-debug-non-zts-20180731/yourextension-1.2.3 ... If that works, a `bob deploy` would build it first, and then upload it to your bucket (you can specify `--overwrite` to overwrite existing packages). However, that alone is not enough - the *manifest* needs to be in place as well, and using that manifest, you can then generate a Composer repository metadata file. -The next two sections contain important info about manifests and repositories; the *tl;dr* is: **do not use `bob deploy`, but `support/build/_util/deploy.sh`, to deploy a package**, because it will take care of manifest uploading: +The next two sections contain important info about manifests and repositories; the *tl;dr* is: **do not use `bob deploy`, but `deploy.sh`, to deploy a package**, because it will take care of manifest uploading: - $ support/build/_util/deploy.sh extensions/no-debug-non-zts-20121212/yourextension-1.2.3 + ~ $ deploy.sh extensions/no-debug-non-zts-20180731/yourextension-1.2.3 In addition to an `--overwrite` option, the `deploy.sh` script also accepts a `--publish` option that will cause the package to immediately be published into the repository by [re-generating that repo](#re-generating-repositories). **This should be used with caution**, as several parallel `deploy.sh` invocations could result in a race condition when re-generating the repository. @@ -228,9 +212,9 @@ In addition to an `--overwrite` option, the `deploy.sh` script also accepts a `- After a `bob build` or `bob deploy`, you'll be prompted to upload a manifest. It obviously only makes sense to perform this upload after a `bob deploy`. -To perform the deploy and the manifest upload in one step, **the `deploy.sh` utility in `support/build/_util/` should be used instead of `bob deploy`**: +To perform the deploy and the manifest upload in one step, **the `deploy.sh` utility (it's on `$PATH`) should be used instead of `bob deploy`**: - $ support/build/_util/deploy.sh extensions/no-debug-non-zts-20121212/yourextension-1.2.3 + ~ $ deploy.sh extensions/no-debug-non-zts-20180731/yourextension-1.2.3 This will upload the manifest to the S3 bucket if the package build and deploy succeeded. Like `bob deploy`, this script accepts a `--overwrite` flag. @@ -240,7 +224,7 @@ All packages in the official Heroku S3 bucket use manifests, even for packages t ### Manifest Contents -A manifest looks roughly like this (example is for `ext-apcu/5.1.3` for PHP 7): +A manifest looks roughly like this (example is for `ext-apcu/5.1.17` for PHP 7.3 on stack `heroku-18`): { "conflict": { @@ -248,24 +232,24 @@ A manifest looks roughly like this (example is for `ext-apcu/5.1.3` for PHP 7): }, "dist": { "type": "heroku-sys-tar", - "url": "https://lang-php.s3.amazonaws.com/dist-cedar-14-stable/extensions/no-debug-non-zts-20151012/apcu-5.1.3.tar.gz" + "url": "https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20180731/apcu-5.1.17.tar.gz" }, "name": "heroku-sys/ext-apcu", "require": { - "heroku-sys/cedar": "^14.0.0", - "heroku-sys/php": "7.0.*", + "heroku-sys/heroku": "^18.0.0", + "heroku-sys/php": "7.3.*", "heroku/installer-plugin": "^1.2.0" }, - "time": "2016-02-16 01:18:50", + "time": "2019-02-16 01:18:50", "type": "heroku-sys-php-extension", - "version": "5.1.3" + "version": "5.1.17" } Package `name`s must be prefixed with "`heroku-sys/`". Possible `type`s are `heroku-sys-php`, `heroku-sys-hhvm`, `heroku-sys-php-extension` or `heroku-sys-webserver`. The `dist` type must be "`heroku-sys-tar`". If the package is a `heroku-sys-php-extension`, it's important to specify a `conflict` with "`heroku-sys/hhvm`". The special package type `heroku-sys-php-package` is used for generic packages that should not be available to applications during app deploys (such as vendored libraries used to build PHP or an extension). -The `require`d package `heroku/installer-plugin` will be available during install. Package `heroku-sys/cedar` is a virtual package `provide`d by the platform `composer.json` generated in `bin/compile` and has the right stack version; the selector for `heroku-sys/php` ensures that the package only applies to PHP 7.0.x. +The `require`d package `heroku/installer-plugin` will be available during install. Package `heroku-sys/heroku` is a virtual package `provide`d by the platform `composer.json` generated in `bin/compile` and has the right stack version (either "`16`" or "`18`"); the selector for `heroku-sys/php` ensures that the package only applies to PHP 7.0.x. ### Manifest Helpers @@ -279,25 +263,25 @@ The repository is a `packages.json` of all manifests, which can be used by Compo ### (Re-)generating Repositories -The normal flow is to run `support/build/_util/deploy.sh` first to deploy one or more packages, and then to use `support/build/_util/mkrepo.sh` to re-generate the repo: +The normal flow is to run `deploy.sh` first to deploy one or more packages, and then to use `mkrepo.sh` to re-generate the repo: - $ support/build/_util/mkrepo.sh --upload + ~ $ mkrepo.sh --upload This will generate `packages.json` and upload it right away, or, if the `--upload` is not given, print upload instructions for `s3cmd`. Alternatively, `deploy.sh` can be called with `--publish` as the first argument, in which case `mkrepo.sh --upload` will be called after the package deploy and manifest upload was successful: - $ support/build/_util/deploy.sh --publish php-6.0.0 + ~ $ deploy.sh --publish php-6.0.0 **This should be used with caution, as several parallel `deploy.sh` invocations could result in a race condition when re-generating the repository.** ### Syncing Repositories -It is often desirable to have a bucket with two repositories under different prefixes, e.g. `dist-cedar-14-develop/` and `dist-cedar-14-stable/`, with the latter usually used by apps for deploys. The "develop" bucket prefix would be set via `S3_PREFIX` on the Heroku package builder app or Docker container, so all builds would always end up there. +It is often desirable to have a bucket with two repositories under different prefixes, e.g. `dist-heroku-18-develop/` and `dist-heroku-18-stable/`, with the latter usually used by apps for deploys. The "develop" bucket prefix would be set via `S3_PREFIX` on the Heroku package builder app or Docker container, so all builds would always end up there. -After testing builds, the contents of that "develop" repository can then be synced to "stable" using `support/build/_util/sync.sh`: +After testing builds, the contents of that "develop" repository can then be synced to "stable" using `sync.sh`: - $ support/build/_util/sync.sh my-bucket dist-cedar-14-stable/ my-bucket dist-cedar-14-develop/ + ~ $ sync.sh my-bucket dist-heroku-18-stable/ my-bucket dist-heroku-18-develop/ *The `sync.sh` script takes destination bucket info as arguments first, then source bucket info*. @@ -309,13 +293,13 @@ You will usually use an [Upstream Bucket](#understanding-upstream-buckets) to en However, in rare circumstances, such as when you want to fully host all platform packages including PHP yourself and have the official repository disabled for your app, you either need to build all packages from scratch, or sync the Heroku builds from the official repository: - $ heroku run "support/build/_util/sync.sh $S3_BUCKET $S3_PREFIX $UPSTREAM_S3_BUCKET $UPSTREAM_S3_PREFIX" + ~ $ sync.sh $S3_BUCKET $S3_PREFIX $UPSTREAM_S3_BUCKET $UPSTREAM_S3_PREFIX ### Removing Packages -The `support/build/_util/remove.sh` helper removes a package manifest and its tarball from a bucket, and re-generates the repository. It accepts one or more names of a JSON manifest file from the bucket (optionally without "`.composer.json`" suffix) as arguments: +The `remove.sh` helper removes a package manifest and its tarball from a bucket, and re-generates the repository. It accepts one or more names of a JSON manifest file from the bucket (optionally without "`.composer.json`" suffix) as arguments: - $ support/build/_util/remove.sh ext-imagick-3.3.0_php-5.5.composer.json ext-imagick-3.3.0_php-5.6.composer.json + ~ $ remove.sh ext-imagick-3.3.0_php-5.5.composer.json ext-imagick-3.3.0_php-5.6.composer.json Unless the `--no-publish` option is given, the repository will be re-generated immediately after removal. Otherwise, the manifests and tarballs would be removed, but the main repository would remain in place, pointing to non-existing packages, so usage of this flag is only recommended for debugging purposes or similar. @@ -325,6 +309,5 @@ Please refer to [the instructions in the main README](../../README.md#custom-pla ## Tips & Tricks -- To speed things up drastically during compilation, it'll usually be a good idea to `heroku run bash --size Performance-L`. -- All manifests generated by Bob formulas, by `support/build/_util/mkrepo.sh` and by `support/build/_util/sync.sh` use an S3 region of "s3" by default, so resulting URLs look like "`https://your-bucket.s3.amazonaws.com/your-prefix/...`". You can `heroku config:set S3_REGION` to change "s3" to another region such as "s3-eu-west-1". +- All manifests generated by Bob formulas, by `mkrepo.sh` and by `sync.sh` use an S3 region of "s3" by default, so resulting URLs look like "`https://your-bucket.s3.amazonaws.com/your-prefix/...`". You can `heroku config:set S3_REGION` to change "s3" to another region such as "s3-eu-west-1". - If any dependencies are not yet deployed, you need to deploy them first, or use `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX` (recommended). From 2226f823dae8cdd13253787cfad876019359d248 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 21 Mar 2019 23:50:25 +0100 Subject: [PATCH 286/553] small heading structure shuffle --- support/build/README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/support/build/README.md b/support/build/README.md index 89c9c06ba..bcb1b9945 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -127,7 +127,13 @@ The application also contains a requirement for the `ext-pq` PostgreSQL extensio All these steps happen when the buildpack performs a simple `composer install` inside `.heroku/php/` - the generated `composer.json`, together with the repository and plugin information inside it, takes care of the rest. -### Building custom platform packages and repositories +## Usage in Applications + +Please refer to [the instructions in the main README](../../README.md#custom-platform-repositories) for details on how to use a custom repository during application builds. + +## Building Custom Platform Packages + +### Overview To use custom platform packages (either new ones, or modifications of existing ones), a new Composer repository has to be created (see [the instructions in the main README](../../README.md#custom-platform-repositories) for usage info). All the tooling in here is designed to work with S3, since it is reliable and cheap. The bucket permissions should be set up so that a public listing is allowed. @@ -139,10 +145,12 @@ The build formulae are also expected to generate a [manifest](#about-manifests), In `support/build/_util`, three scripts (`deploy.sh` to deploy a package with its [manifest](#about-manifests), `mkrepo.sh` to (re-)generate a [repository](#about-repositories) from all existing manifests, and `sync.sh` to [sync between repos](#syncing-repositories)) take care of most of the heavy lifting. The directory is added to `$PATH` in `Dockerfile`, so the helpers can be invoked directly. -## Preparations +### Preparations Packages for a platform repository are best built using a Docker container (either locally, or using on a platform like Heroku). The instructions below use `docker run…` locally. +Refer to the [README in `support/build/_docker/`](_docker/README.md) for setup instructions. + The following environment variables are required: - `WORKSPACE_DIR`, must be "`/app/support/build`" @@ -163,11 +171,11 @@ The following environment variables are optional: - `S3_REGION`, to be set to the AWS region name (e.g. "`s3-eu-west-1`") for any non-standard region, otherwise "`s3`" (for region "us-east-1") -### Understanding Prefixes +#### Understanding Prefixes It is recommended to use a prefix like "`dist-heroku-18-develop/`" for `$S3_PREFIX`. The contents of this prefix will act as a development repository, where all building happens. The `sync.sh` helper can later be used to synchronize to another prefix, e.g. "`dist-heroku-18-stable/`" that is used for production. For more info, see the [section on syncing repositories](#syncing-repositories) further below. -### Understanding Upstream Buckets +#### Understanding Upstream Buckets If you want to, for example, host only a few PECL extensions in a custom repository, your bucket would still have to contain the build-time dependencies for those extensions - that's PHP in its various versions. @@ -182,11 +190,7 @@ That way, if your Bob formula for an extension contains e.g. this dependency dec then on build, Bob will first look for "`php-7.3.3`" in your S3 bucket, and then fall back to pulling it from the upstream bucket. This frees you of the burden of hosting and maintaining unnecessary packages yourself. -### Build Environment Setup - -Refer to the [README in `support/build/_docker/`](_docker/README.md) for setup instructions. - -## Building a Package +### Building a Package To verify a formula, `bob build` can be used to build it: @@ -303,10 +307,6 @@ The `remove.sh` helper removes a package manifest and its tarball from a bucket, Unless the `--no-publish` option is given, the repository will be re-generated immediately after removal. Otherwise, the manifests and tarballs would be removed, but the main repository would remain in place, pointing to non-existing packages, so usage of this flag is only recommended for debugging purposes or similar. -## Usage in Applications - -Please refer to [the instructions in the main README](../../README.md#custom-platform-repositories) for details on how to use a custom repository during application builds. - ## Tips & Tricks - All manifests generated by Bob formulas, by `mkrepo.sh` and by `sync.sh` use an S3 region of "s3" by default, so resulting URLs look like "`https://your-bucket.s3.amazonaws.com/your-prefix/...`". You can `heroku config:set S3_REGION` to change "s3" to another region such as "s3-eu-west-1". From cf2dfde263e54e5b99d0e567f17bde4b874a3331 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 22 Mar 2019 01:24:58 +0100 Subject: [PATCH 287/553] more platform package manifest docs --- support/build/README.md | 116 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/support/build/README.md b/support/build/README.md index bcb1b9945..34c2d5084 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -259,6 +259,122 @@ The `require`d package `heroku/installer-plugin` will be available during instal All formulae use the `manifest.py` helper to generate the information above. **Use it for maximum reliability!** You can take a look at the existing formulae and the script to get a feeling for how it works. +For example, the Apache HTTPD web server is built roughly as follows: + + source $(dirname $BASH_SOURCE)/_util/include/manifest.sh + curl … # download httpd + ./configure --prefix="$1" … + make && make install + + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{}"}" + MANIFEST_CONFLICT="${MANIFEST_CONFLICT:-"{}"}" + MANIFEST_REPLACE="${MANIFEST_REPLACE:-"{}"}" + MANIFEST_PROVIDE="${MANIFEST_PROVIDE:-"{}"}" + MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"export\":\"bin/export.apache2.sh\",\"profile\":\"bin/profile.apache2.sh\"}"}" + + # this gets sourced after package install, so that the buildpack and following buildpacks can invoke + cat > ${OUT_PREFIX}/bin/export.apache2.sh <<'EOF' + export PATH="/app/.heroku/php/bin:/app/.heroku/php/sbin:$PATH" + EOF + # this gets sourced on dyno boot + cat > ${OUT_PREFIX}/bin/profile.apache2.sh <<'EOF' + export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" + EOF + + python $(dirname $BASH_SOURCE)/_util/include/manifest.py "heroku-sys-webserver" "heroku-sys/${dep_name}" "$dep_version" "${dep_formula}.tar.gz" "$MANIFEST_REQUIRE" "$MANIFEST_CONFLICT" "$MANIFEST_REPLACE" "$MANIFEST_PROVIDE" "$MANIFEST_EXTRA" > $dep_manifest + + print_or_export_manifest_cmd "$(generate_manifest_cmd "$dep_manifest")" + +In this example, after building the program from source and "installing" it to the right prefix, two scripts are added that take care of adding HTTPD's `bin/` and `sbin/` directories to `$PATH` during build (for following buildpacks to access), and during dyno boot (for the application to work at runtime). + +Afterwards, `manifest.py` is passed several JSON objects as arguments for the various parts that make up the manifest. The `print_or_export_manifest_cmd` is then used to automatically either output instructions (when the formula is invoked via a `bob build` or `bob deploy`) on how to upload the manifest, or export the necessary manifest upload commands for automatic execution (when the formula is invoked via `deploy.sh`). + +### Manifest Specification + +The manifest for a package follows the [Composer package schema](https://getcomposer.org/doc/04-schema.md), with the following changes or additions. + +#### Minimum Information + +A package must at minimum expose the following details in its manifest: + +- `name` +- `type` +- `dist` (with download type and URL) +- `time` +- `require` + +The `require` key must contain dependencies on at least the following packages: + +- `heroku/installer-plugin`, version 1.2.0 or newer (use version selector `^1.2.0`) + +If a package is built against a specific (or multiple) stacks, there must be a dependency on the following packages: + +- `heroku-sys/heroku`, version "16" for `heroku-16` or version "18" for `heroku-18` (use version selectors `^16.0.0` or `^18.0.0`, or a valid Composer combination) + +If a package is of type `heroku-php-extension`, there must be a dependency on the following packages to ensure that the right PHP extension API is targeted during installs: + +- `heroku-sys/php`, with major.minor version parts specified for the PHP version series in question (either as e.g. `7.3.*`, or as `~7.3.0`) + +Additional dependencies can be expressed as well; for example, if an extension requires another extension at runtime, it may be listed in `require`, with its full `heroku-sys/ext-…` name and a suitable version (often "`*`"). + +#### Package Name + +The name of a package must begin with "`heroku-sys/`", and the part after this suffix must be the name Composer expects for the corresponding platform package. A PHP runtime package must thus be named "`heroku-sys/php`", and a "foobar" extension, known to Composer as "`ext-foobar`", must be named "`heroku-sys/ext-foobar`". + +#### Package Type + +The `type` of a package must be one of the following: + +- 'heroku-sys-library', for a system library +- 'heroku-sys-php', for a PHP runtime +- 'heroku-sys-php-extension', for a PHP extension +- 'heroku-sys-webserver', for a web server + +#### Dist Type and URL + +The `dist` key must contain a struct with key `type` set to "`heroku-sys-tar`", and key `url` set to the `.tar.gz` tarball URL of the package. + +#### Replaces + +Composer packages may replace other packages. In the case of platform packages, this is useful mostly in case of a runtime. PHP is bundled with many extensions out of the box, so the manifest for the PHP package must indicate that it contains `ext-standard`, `ext-dom`, and so forth, and thus its manifest contains a long list of `heroku-sys/ext-…` entries under the `replace` key. + +#### Extra: Config + +A package of type `heroku-sys-php-extension` may contain a `config` key inside the `extra` struct holding a string with a config filename. If this key is not given, an automatic config that only loads the extension `.so` is generated. Otherwise, the given config file is used; it is then also responsible for loading the extension `.so` itself. + +This feature can be used if an extension should have default configuration in place. For instance, when building an extension named "`foobar`" that you want some default INI settings to use, write a file named `$1/etc/php/conf.d/foobar.ini-dist` in your formula, with the following contents: + + extension=foobar.so + foobar.some_default = different + +If `extra`.`config` in the manifest is then set to "`etc/php/conf.d/memcached.ini-dist`", this config file will be used. + +#### Extra: Export & Profile + +Any package may generate shell scripts that are evaluated during app build, and during dyno startup, respectively. This is most commonly used for ensuring that built binaries are available on `$PATH` (for both cases), and for e.g. launching a sidecar process such as a proxy or agent (for the dyno startup case). + +For example, a PHP runtime will want to make its `bin/` (for `php`) and `sbin/` (for `php-fpm`) available on `$PATH` both during a build (so that something like `composer install` can work at all during a build, or so a subsequent buildpack can invoke PHP), as well as on dyno startup (so that the application may function). + +To achieve this, the formula would write a `bin/export.sh` with the following contents (the `/app` user directory must explicitly be given here): + + export PATH="/app/.heroku/php/bin:/app/.heroku/php/sbin:$PATH" + +If the `extra`.`export` key in the manifest is then set to a string value of "`bin/export.sh`", the platform installer will ensure all packages have their export instructions executed after platform installation is complete. + +In addition, a `bin/profile.sh` would also be necessary, with similar contents (but this time using `$HOME` instead of `/app`, for portability): + + export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" + +If the `extra`.`profile` key in the manifest is then set to a string value of "`bin/profile.sh`", the platform installer will ensure that this script is executed, together with scripts from any other packages, during the startup of a dyno. + +For most packages, the `export` key is never needed; the `profile` key is sometimes used to perform operations during dyno boot. For example, the `newrelic` extension uses it to start the `newrelic-daemon` background process. + +#### Extra: Shared + +As package of type `heroku-sys-php` may come bundled with a bunch of extensions, it must list these extensions in the `replace` section of its manifest. However, not all of these bundled extensions may be built into the engine, but instead may have been built as `shared`, meaning their `.so` needs to be loaded into the engine using an [`extension=…`](http://php.net/manual/en/ini.core.php#ini.extension) INI directive. + +In order for the custom platform installer to know that an extension is built as shared, the names of all shared extensions (in full "`heroku-sys/ext-…`" format) must be listed inside the `extra`.`shared` struct as keys, each with a value of boolean `true`. + ## About Repositories The repository is a `packages.json` of all manifests, which can be used by Composer as a `packagist` repository type. See [Usage in Applications](#usage-in-applications) for instructions on how to use such a repository with an application. From 1d6aefb4aa97c8e3d9346306533fdf2639a95fdc Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 22 Mar 2019 02:20:55 +0100 Subject: [PATCH 288/553] examples (curl pipe to jq) for manifest docs --- support/build/README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/support/build/README.md b/support/build/README.md index 34c2d5084..b52b768a8 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -249,6 +249,8 @@ A manifest looks roughly like this (example is for `ext-apcu/5.1.17` for PHP 7.3 "version": "5.1.17" } +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php-extension" and .name == "heroku-sys/ext-apcu") ] | .[0]'`* + Package `name`s must be prefixed with "`heroku-sys/`". Possible `type`s are `heroku-sys-php`, `heroku-sys-hhvm`, `heroku-sys-php-extension` or `heroku-sys-webserver`. The `dist` type must be "`heroku-sys-tar`". If the package is a `heroku-sys-php-extension`, it's important to specify a `conflict` with "`heroku-sys/hhvm`". The special package type `heroku-sys-php-package` is used for generic packages that should not be available to applications during app deploys (such as vendored libraries used to build PHP or an extension). @@ -307,16 +309,24 @@ The `require` key must contain dependencies on at least the following packages: - `heroku/installer-plugin`, version 1.2.0 or newer (use version selector `^1.2.0`) +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php") ][0] | {require}'`* + If a package is built against a specific (or multiple) stacks, there must be a dependency on the following packages: - `heroku-sys/heroku`, version "16" for `heroku-16` or version "18" for `heroku-18` (use version selectors `^16.0.0` or `^18.0.0`, or a valid Composer combination) +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php") ][0] | {require}'`* + If a package is of type `heroku-php-extension`, there must be a dependency on the following packages to ensure that the right PHP extension API is targeted during installs: - `heroku-sys/php`, with major.minor version parts specified for the PHP version series in question (either as e.g. `7.3.*`, or as `~7.3.0`) +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php-extension") ][0] | {require}'`* + Additional dependencies can be expressed as well; for example, if an extension requires another extension at runtime, it may be listed in `require`, with its full `heroku-sys/ext-…` name and a suitable version (often "`*`"). +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.name == "heroku-sys/ext-pq") ][0] | {require}'`* + #### Package Name The name of a package must begin with "`heroku-sys/`", and the part after this suffix must be the name Composer expects for the corresponding platform package. A PHP runtime package must thus be named "`heroku-sys/php`", and a "foobar" extension, known to Composer as "`ext-foobar`", must be named "`heroku-sys/ext-foobar`". @@ -334,10 +344,14 @@ The `type` of a package must be one of the following: The `dist` key must contain a struct with key `type` set to "`heroku-sys-tar`", and key `url` set to the `.tar.gz` tarball URL of the package. +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php") ][0] | {dist}'`* + #### Replaces Composer packages may replace other packages. In the case of platform packages, this is useful mostly in case of a runtime. PHP is bundled with many extensions out of the box, so the manifest for the PHP package must indicate that it contains `ext-standard`, `ext-dom`, and so forth, and thus its manifest contains a long list of `heroku-sys/ext-…` entries under the `replace` key. +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php") ][0] | {replace}'`* + #### Extra: Config A package of type `heroku-sys-php-extension` may contain a `config` key inside the `extra` struct holding a string with a config filename. If this key is not given, an automatic config that only loads the extension `.so` is generated. Otherwise, the given config file is used; it is then also responsible for loading the extension `.so` itself. @@ -349,6 +363,8 @@ This feature can be used if an extension should have default configuration in pl If `extra`.`config` in the manifest is then set to "`etc/php/conf.d/memcached.ini-dist`", this config file will be used. +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.name == "heroku-sys/ext-newrelic") ][0] | {extra: {config: .extra.config}}'`* + #### Extra: Export & Profile Any package may generate shell scripts that are evaluated during app build, and during dyno startup, respectively. This is most commonly used for ensuring that built binaries are available on `$PATH` (for both cases), and for e.g. launching a sidecar process such as a proxy or agent (for the dyno startup case). @@ -359,22 +375,30 @@ To achieve this, the formula would write a `bin/export.sh` with the following co export PATH="/app/.heroku/php/bin:/app/.heroku/php/sbin:$PATH" +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-webserver") ][0] | {extra: {export: .extra.export}}'`* + If the `extra`.`export` key in the manifest is then set to a string value of "`bin/export.sh`", the platform installer will ensure all packages have their export instructions executed after platform installation is complete. In addition, a `bin/profile.sh` would also be necessary, with similar contents (but this time using `$HOME` instead of `/app`, for portability): export PATH="$HOME/.heroku/php/bin:$HOME/.heroku/php/sbin:$PATH" +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-webserver") ][0] | {extra: {profile: .extra.profile}}'`* + If the `extra`.`profile` key in the manifest is then set to a string value of "`bin/profile.sh`", the platform installer will ensure that this script is executed, together with scripts from any other packages, during the startup of a dyno. For most packages, the `export` key is never needed; the `profile` key is sometimes used to perform operations during dyno boot. For example, the `newrelic` extension uses it to start the `newrelic-daemon` background process. +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.name == "heroku-sys/ext-newrelic") ][0] | {extra: {profile: .extra.profile}}'`* + #### Extra: Shared As package of type `heroku-sys-php` may come bundled with a bunch of extensions, it must list these extensions in the `replace` section of its manifest. However, not all of these bundled extensions may be built into the engine, but instead may have been built as `shared`, meaning their `.so` needs to be loaded into the engine using an [`extension=…`](http://php.net/manual/en/ini.core.php#ini.extension) INI directive. In order for the custom platform installer to know that an extension is built as shared, the names of all shared extensions (in full "`heroku-sys/ext-…`" format) must be listed inside the `extra`.`shared` struct as keys, each with a value of boolean `true`. +*Example: `curl -s https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/packages.json | jq '[ .packages[][] | select(.type == "heroku-sys-php") ][0] | {extra: {shared: .extra.shared}}'`* + ## About Repositories The repository is a `packages.json` of all manifests, which can be used by Composer as a `packagist` repository type. See [Usage in Applications](#usage-in-applications) for instructions on how to use such a repository with an application. From 2593450c577232193899efaa4f2ae754da8c94db Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 22 Mar 2019 01:31:20 +0100 Subject: [PATCH 289/553] a tiny bit about repositories --- support/build/README.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/support/build/README.md b/support/build/README.md index b52b768a8..a69efae03 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -403,7 +403,26 @@ In order for the custom platform installer to know that an extension is built as The repository is a `packages.json` of all manifests, which can be used by Composer as a `packagist` repository type. See [Usage in Applications](#usage-in-applications) for instructions on how to use such a repository with an application. -**Important: due to a limitation of Composer, extensions of identical version but for different PHP versions must be ordered within the repository in descending PHP version order, i.e. `ext-mongodb:1.1.2` for `php:7.0.*` must appear before `ext-mongodb:1.1.2` for `php:5.6.*`. Otherwise, deploys may select a lower PHP version than possible. The `mkrepo.sh` script takes care of this ordering.** +The structure of a `packagist` type repository is a struct with a single key "`packages`", which is an array containing another array (!) which is a list of all the manifest structs: + + { + "packages": [ + [ + { + "name": "heroku-sys/php" + … + }, + … + { + "name": "heroku-sys/ext-foobar" + … + } + ] + ] + } + + +**Important: due to a peculiarity of Composer's dependency solver, extensions of identical version but for different PHP versions must be ordered within the repository in descending PHP version order, i.e. `ext-foobar:1.2.3` for `php:7.3.*` must appear before `ext-foobar:1.2.3` for `php:7.2.*`. Otherwise, deploys may select a lower PHP version than possible. The `mkrepo.sh` script takes care of this ordering.** ### (Re-)generating Repositories From 0f025fd4db2d0485ddcf786c845afeac648c98b7 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 22 Mar 2019 04:52:54 +0100 Subject: [PATCH 290/553] some notes on stacks and repos --- support/build/README.md | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/support/build/README.md b/support/build/README.md index a69efae03..76e0e58b1 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -424,6 +424,95 @@ The structure of a `packagist` type repository is a struct with a single key "`p **Important: due to a peculiarity of Composer's dependency solver, extensions of identical version but for different PHP versions must be ordered within the repository in descending PHP version order, i.e. `ext-foobar:1.2.3` for `php:7.3.*` must appear before `ext-foobar:1.2.3` for `php:7.2.*`. Otherwise, deploys may select a lower PHP version than possible. The `mkrepo.sh` script takes care of this ordering.** +### Repositories and Stacks + +In principle, a single repository can contain multiple, stack-specific versions of the same package. Consider the following condensed example for two identical versions of `ext-pq`, but for two PHP runtimes, on the `heroku-18` stack: + + { + "name": "heroku-sys/ext-pq", + "version": "2.1.5", + "require": { + "heroku-sys/heroku": "^18.0.0", + "heroku-sys/php": "7.3.*" + } + }, + { + "name": "heroku-sys/ext-pq", + "version": "2.1.5", + "require": { + "heroku-sys/heroku": "^18.0.0", + "heroku-sys/php": "7.2.*" + } + } + +There is no reason why there couldn't be two additional packages, but with a `heroku-sys/heroku` dependency of "`^16.0.0`", in the same repository, like so: + + { + "name": "heroku-sys/ext-pq", + "version": "2.1.5", + "require": { + "heroku-sys/heroku": "^16.0.0", + "heroku-sys/php": "7.3.*" + } + }, + { + "name": "heroku-sys/ext-pq", + "version": "2.1.5", + "require": { + "heroku-sys/heroku": "^16.0.0", + "heroku-sys/php": "7.2.*" + } + }, + { + "name": "heroku-sys/ext-pq", + "version": "2.1.5", + "require": { + "heroku-sys/heroku": "^18.0.0", + "heroku-sys/php": "7.3.*" + } + }, + { + "name": "heroku-sys/ext-pq", + "version": "2.1.5", + "require": { + "heroku-sys/heroku": "^18.0.0", + "heroku-sys/php": "7.2.*" + } + } + +Composer would be able to resolve the right variant of the `ext-pq/2.1.5` package when it's requested as a dependency, just like how it does for the `heroku-sys/php` dependency. + +Heroku's own platform repositories are kept separately per stack. This is mostly in the interest of keeping the list of available packages small, both for resolution at installation time, and for the purpose of faster synchronization (see further below). + +Maintainers of custom repositories with a smaller number of packages may find it advantageous to keep all stacks together. The advantage of this is that developers using such a repository do not have to update the repository URL after changing the stack on an application. + +In some cases, a package may be able to run on several stacks. This is usually the case when the underlying library ABIs are very stable and do not change across Heroku stack versions, or when a package is built statically with libraries included, or when other measures have been taken to ensure a library can use multiple versions of a library. + +For example, the `newrelic` extension formula only downloads a pre-built binary extension `.so` and packages it for use on Heroku. It works on all modern Linux versions, so it could theoretically be supplied in a single version for all stacks. + +This could either be done by omitting the stack requirement entirely: + + { + "name": "heroku-sys/ext-newrelic", + "version": "8.6.0.238", + "require": { + "heroku-sys/php": "7.3.*" + } + } + +Or by targeting several possible values for `heroku-sys/heroku`: + + { + "name": "heroku-sys/ext-newrelic", + "version": "8.6.0.238", + "require": { + "heroku-sys/heroku": "^16.0.0 | ^18.0.0", + "heroku-sys/php": "7.3.*" + } + } + +However, as many of Heroku's other packages are stack-specific in their library usage, separate repositories have to be kept anyway, so the `newrelic` extension is treated the same way as all other packages. + ### (Re-)generating Repositories The normal flow is to run `deploy.sh` first to deploy one or more packages, and then to use `mkrepo.sh` to re-generate the repo: From 8b763a82a2b72efcd0d83b41a395c7e47f7f3b08 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 22 Mar 2019 14:24:18 -0700 Subject: [PATCH 291/553] custom repo examples --- support/build/README.md | 236 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) diff --git a/support/build/README.md b/support/build/README.md index 76e0e58b1..7cbb46ff2 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -555,6 +555,242 @@ The `remove.sh` helper removes a package manifest and its tarball from a bucket, Unless the `--no-publish` option is given, the repository will be re-generated immediately after removal. Otherwise, the manifests and tarballs would be removed, but the main repository would remain in place, pointing to non-existing packages, so usage of this flag is only recommended for debugging purposes or similar. +## Examples + +### Building a Different Nginx Version Using A Buildpack Fork + +#### Approach + +In this example, you will fork the buildpack and add your own formula to it. **The fork is only used for building the package and publishing the repository, it is not used to build and run applications.** + +Both the `heroku-16` and the `heroku-18` stack variants of the package will be hosted in the same repository. + +A development and a stable S3 bucket prefix are used for the repository, and helpers are used for synchronization between them. + +The package in this example is a mainline release of Nginx, whose formula simply re-uses the existing Nginx base formula. + +#### Prerequisites + +- Docker +- An S3 bucket with public read (and ideally public list) permissions +- A fork of https://github.com/heroku/heroku-buildpack-php + +#### Preparations + +First, create, in a secure location on your file system, a `heroku-php-s3.dockerenv` file with the following contents: + + AWS_ACCESS_KEY_ID= + AWS_SECRET_ACCESS_KEY= + S3_BUCKET= + S3_PREFIX=dist-develop/ # overriding the Dockerfile default here, which contains the stack + S3_REGION=… # only needed if you want to use a region other than "dist-$STACK-" + +Have your Git fork ready: + + $ git clone + $ cd heroku-buildpack-php + +#### Formula Creation + +Next, make and commit your change; it's enough to simply copy the existing stable nginx formula stub (take a look inside it to understand why): + + $ cp support/build/nginx-{1.14.2,1.15.4} # or whatever versions are applicable + $ git add support/build/ + $ git commit -m "new nginx version" + +The versions in the example above may have to be updated to reflect newer releases. + +Finally, build the containers for each stack: + + $ docker build --pull --tag heroku-php-build-heroku-18 --file $(pwd)/support/build/_docker/heroku-18.Dockerfile . + $ docker build --pull --tag heroku-php-build-heroku-16 --file $(pwd)/support/build/_docker/heroku-16.Dockerfile . + +#### Building and Deploying + +Verify that the build works: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv heroku-php-build-heroku-18 bob build nginx-1.15.4 + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv heroku-php-build-heroku-16 bob build nginx-1.15.4 + +If all went well, deploy it using the helper script: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv heroku-php-build-heroku-18 deploy.sh nginx-1.15.4 + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv heroku-php-build-heroku-16 deploy.sh nginx-1.15.4 + +#### Repository Creation + +From the two manifests that are now in your S3 bucket, make a repository: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv heroku-php-build-heroku-18 mkrepo.sh --upload + +You can now test this repository on a Heroku app: + + $ heroku config:set HEROKU_PHP_PLATFORM_REPOSITORIES="https://.s3.amazonaws.com/dist-develop/" + $ git commit --allow-empty -m "test new nginx" + $ git push heroku master + +#### Repository Synchronization + +You deployed to the prefix `dist-develop/` in your bucket; as that one is your test environment, you should also have a stable prefix, which you can synchronize to: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv heroku-php-build-heroku-18 sync.sh dist-stable/ + +You can then use that repository: + + $ heroku config:set HEROKU_PHP_PLATFORM_REPOSITORIES="https://.s3.amazonaws.com/dist-stable/" + +### Building a New Extension Using Heroku Tooling and Composer + +#### Approach + +The Heroku PHP buildpack will be pulled in as a Composer dependency. Its build `Dockerfile`s are built and tagged locally, and a custom `Dockerfile` for each targeted stack builds upon those tagged images. + +Both the `heroku-16` and the `heroku-18` stack variants of the package will be hosted in the same repository. + +The package in this example is the Xdebug extension. The extension formula can re-use an existing buildpack base formula for PECL extensions. + +#### Preparations + +First, create, in a secure location on your file system, a `heroku-php-s3.dockerenv` file with the following contents: + + AWS_ACCESS_KEY_ID= + AWS_SECRET_ACCESS_KEY= + S3_BUCKET= + S3_PREFIX=dist-stable/ # overriding the Dockerfile default here, which contains the stack + S3_REGION=… # only needed if you want to use a region other than "dist-$STACK-" + +Pull in the buildpack as a Composer dependency: + + $ composer require heroku/heroku-buildpack-php:* + +Build the base Docker images from the buildpack for stacks `heroku-16` and `heroku-18`: + + $ cd vendor/heroku/heroku-buildpack-php + $ docker build --pull --tag php-heroku-18 --file $(pwd)/support/build/_docker/heroku-18.Dockerfile . + $ docker build --pull --tag php-heroku-16 --file $(pwd)/support/build/_docker/heroku-16.Dockerfile . + $ cd - + +#### Creating Custom Dockerfiles + +Create a `heroku-18.Dockerfile` with the following contents: + + FROM formulatest-heroku-18:latest + ENV WORKSPACE_DIR=/app + ENV UPSTREAM_S3_BUCKET=lang-php + ENV UPSTREAM_S3_PREFIX=dist-heroku-18-stable/ + COPY . /app + +Create a `heroku-16.Dockerfile` with the following contents: + + FROM formulatest-heroku-16:latest + ENV WORKSPACE_DIR=/app + ENV UPSTREAM_S3_BUCKET=lang-php + ENV UPSTREAM_S3_PREFIX=dist-heroku-16-stable/ + COPY . /app + +Both set the correct upstream S3 bucket and prefix, so that formula dependencies like PHP are pulled from the official Heroku S3 locations. + +#### Create an Extension Base Formula + +In the project root directory, create a file named `xdebug` with the following contents: + + #!/usr/bin/env bash + + dep_name=$(basename $BASH_SOURCE) + source $(dirname $BASH_SOURCE)/vendor/heroku/heroku-buildpack-php/support/build/extensions/pecl + +#### Create Extension Formulae per Version and PHP Series + +For each PHP version, create a separate directory, and in there, create a formula for the specific version. + +For instance, for PHP 7.3 and Xdebug version 2.7.0, have a `php-7.3/xdebug-2.7.0` with the following contents: + + #!/usr/bin/env bash + # Build Path: /app/.heroku/php + # Build Deps: php-7.3.3 + + source $(dirname $0)/../xdebug + +The `php-7.3.3` dependency will not be found in the current S3 bucket and prefix, so Bob will fall back to `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX`. + +It's possible that the `php-…` version in the example above no longer exists, so it may have to be adjusted to a newer version. + +#### Build Dockerfiles + +Build one Docker image for each stack: + + $ docker build --tag xdebug-heroku-18 --file heroku-18.Dockerfile . + $ docker build --tag xdebug-heroku-16 --file heroku-16.Dockerfile . + +#### Building and Deploying + +Verify that the build works by building a specific formula for a specific PHP version: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv xdebug-heroku-18 bob build php-7.3/xdebug-2.7.0 + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv xdebug-heroku-16 bob build php-7.3/xdebug-2.7.0 + +If all went well, deploy it using the helper script: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv xdebug-heroku-18 deploy.sh php-7.3/xdebug-2.7.0 + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv xdebug-heroku-16 deploy.sh php-7.3/xdebug-2.7.0 + +#### Repository Creation + +From the two manifests that are now in your S3 bucket, make a repository: + + $ docker run --rm -ti --env-file=../heroku-php-s3.dockerenv xdebug-heroku-18 mkrepo.sh --upload + +You can now test this repository on a Heroku app by pushing an app that requires `ext-xdebug` in `composer.json`: + + $ heroku config:set HEROKU_PHP_PLATFORM_REPOSITORIES="https://.s3.amazonaws.com/dist-stable/" + $ composer require "ext-xdebug:*" + $ git add composer.{json,lock} + $ git commit -m "require xdebug" + $ git push heroku master + +### Hosting a Proprietary Extension Using Custom Tooling + +Let's say you already have your proprietary extension, "`myext`", built as `.so` files for each PHP runtime series. All you would like to do is make them available for installation. Let's say your extension is currently at version 1.2.3, and you would like to host the repository for Heroku at `https://download.example.com/heroku/`. For this example, we will package a PHP 7.3 version only. + +If your extension filename is `myext-1.2.3_php-7.3_linux-x64.so`, make a tarball with the `.so` file renamed to only `myext.so`, in a directory named `lib/php/extensions/no-debug-non-zts-20180731` (`20180731` is the PHP extension API version for PHP 7.3), so the tarball only contains a single file: + + lib/php/extensions/no-debug-non-zts-20180731/myext.so + +Name this tarball `ext-myext-1.2.3_php-7.3.tar.gz` and make it available at `https://download.example.com/heroku/ext-myext-1.2.3_php-7.3.tar.gz` + +Assuming that the extension has no stack-specific requirements (meaning it can run on any stack), you can then have a repository at `https://download.example.com/heroku/packages.json` with the following contents: + + { + "packages": [ + [ + { + "name": "heroku-sys/ext-myext", + "version": "1.2.3", + "type": "heroku-sys-php-extension", + "require": { + "php": "7.3.*", + "heroku/installer-plugin": "^1.2.0", + }, + "dist": { + "type": "heroku-sys-tar", + "url": "https://download.example.com/heroku/ext-myext-1.2.3_php-7.3.tar.gz", + }, + "time": "WHEN DID MCFLY COME BACK FROM THE FUTURE", + } + ] + ] + } + +**Remember the warning above about version ordering: the PHP 7.3 variant of `ext-myext` version 1.2.3 must be listed before the PHP 7.2 variant, and so forth, to ensure Composer picks the highest possible PHP version.** + +The extension is then ready for use in applications by requiring it in `composer.json` and instructing the Heroku app to use your custom repository: + + $ composer require ext-myext:* + $ git add composer.{json,lock} + $ git commit -m "use ext-myext" + $ heroku config:set HEROKU_PHP_PLATFORM_REPOSITORIES="https://download.example.com/heroku/" + $ git push heroku master + ## Tips & Tricks - All manifests generated by Bob formulas, by `mkrepo.sh` and by `sync.sh` use an S3 region of "s3" by default, so resulting URLs look like "`https://your-bucket.s3.amazonaws.com/your-prefix/...`". You can `heroku config:set S3_REGION` to change "s3" to another region such as "s3-eu-west-1". From 336e693c4ea5992ffc8e94fc0e6fc5a5c7bc82cf Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Mar 2019 12:02:17 -0700 Subject: [PATCH 292/553] move bob dep decls to wildcards where possible supported by bob-builder/0.0.15+ --- requirements.txt | 2 +- support/build/README.md | 12 +++++------- support/build/composer-1.8.4 | 2 +- .../extensions/no-debug-non-zts-20121212/apcu-4.0.11 | 2 +- .../no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- .../extensions/no-debug-non-zts-20121212/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20121212/event-2.4.3 | 2 +- .../no-debug-non-zts-20121212/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20121212/memcached-2.2.0 | 2 +- .../no-debug-non-zts-20121212/mongo-1.6.16 | 2 +- .../no-debug-non-zts-20121212/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20121212/oauth-1.2.3 | 2 +- .../no-debug-non-zts-20121212/phalcon-2.0.13 | 2 +- .../no-debug-non-zts-20121212/phalcon-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20121212/pq-1.1.1 | 2 +- .../extensions/no-debug-non-zts-20121212/raphf-1.1.2 | 2 +- .../no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20121212/redis-3.1.6 | 2 +- .../extensions/no-debug-non-zts-20121212/redis-4.3.0 | 2 +- .../extensions/no-debug-non-zts-20131226/amqp-1.9.4 | 2 +- .../extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- .../no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20131226/event-2.4.3 | 2 +- .../no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- .../no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../no-debug-non-zts-20131226/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../no-debug-non-zts-20131226/phalcon-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- .../extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- .../extensions/no-debug-non-zts-20131226/redis-4.3.0 | 2 +- .../extensions/no-debug-non-zts-20151012/amqp-1.9.4 | 2 +- .../extensions/no-debug-non-zts-20151012/apcu-5.1.17 | 2 +- .../no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20151012/event-2.4.3 | 2 +- .../no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20151012/memcached-3.1.3 | 2 +- .../no-debug-non-zts-20151012/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20151012/oauth-2.0.3 | 2 +- .../no-debug-non-zts-20151012/phalcon-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20151012/pq-2.1.5 | 2 +- .../extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- .../extensions/no-debug-non-zts-20151012/redis-4.3.0 | 2 +- .../extensions/no-debug-non-zts-20160303/amqp-1.9.4 | 2 +- .../extensions/no-debug-non-zts-20160303/apcu-5.1.17 | 2 +- .../no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20160303/event-2.4.3 | 2 +- .../no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20160303/memcached-3.1.3 | 2 +- .../no-debug-non-zts-20160303/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20160303/oauth-2.0.3 | 2 +- .../no-debug-non-zts-20160303/phalcon-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20160303/pq-2.1.5 | 2 +- .../extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- .../extensions/no-debug-non-zts-20160303/redis-4.3.0 | 2 +- .../extensions/no-debug-non-zts-20170718/amqp-1.9.4 | 2 +- .../extensions/no-debug-non-zts-20170718/apcu-5.1.17 | 2 +- .../no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20170718/event-2.4.3 | 2 +- .../no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20170718/memcached-3.1.3 | 2 +- .../no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../no-debug-non-zts-20170718/phalcon-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20170718/pq-2.1.5 | 2 +- .../extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- .../extensions/no-debug-non-zts-20170718/redis-4.3.0 | 2 +- .../extensions/no-debug-non-zts-20180731/amqp-1.9.4 | 2 +- .../extensions/no-debug-non-zts-20180731/apcu-5.1.17 | 2 +- .../no-debug-non-zts-20180731/cassandra-1.3.2 | 2 +- .../extensions/no-debug-non-zts-20180731/ev-1.0.4 | 2 +- .../extensions/no-debug-non-zts-20180731/event-2.4.3 | 2 +- .../no-debug-non-zts-20180731/imagick-3.4.3 | 2 +- .../no-debug-non-zts-20180731/memcached-3.1.3 | 2 +- .../no-debug-non-zts-20180731/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20180731/oauth-2.0.3 | 2 +- .../no-debug-non-zts-20180731/phalcon-3.4.3 | 2 +- .../extensions/no-debug-non-zts-20180731/pq-2.1.5 | 2 +- .../extensions/no-debug-non-zts-20180731/raphf-2.0.0 | 2 +- .../no-debug-non-zts-20180731/rdkafka-3.0.5 | 2 +- .../extensions/no-debug-non-zts-20180731/redis-4.3.0 | 2 +- 95 files changed, 99 insertions(+), 101 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3e3754e80..494870cd7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -bob-builder>=0.0.10 +bob-builder>=0.0.15 s3cmd>=1.6.0 diff --git a/support/build/README.md b/support/build/README.md index 7cbb46ff2..7451c2282 100644 --- a/support/build/README.md +++ b/support/build/README.md @@ -186,9 +186,9 @@ That's where the `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX` env vars document That way, if your Bob formula for an extension contains e.g. this dependency declaration at the top: # Build Path: /app/.heroku/php - # Build Deps: php-7.3.3 + # Build Deps: php-7.3.* -then on build, Bob will first look for "`php-7.3.3`" in your S3 bucket, and then fall back to pulling it from the upstream bucket. This frees you of the burden of hosting and maintaining unnecessary packages yourself. +then on build, Bob will first look for "`php-7.3.*`" in your S3 bucket, and then fall back to pulling it from the upstream bucket. This frees you of the burden of hosting and maintaining unnecessary packages yourself. ### Building a Package @@ -198,7 +198,7 @@ To verify a formula, `bob build` can be used to build it: ~ $ bob build extensions/no-debug-non-zts-20180731/yourextension-1.2.3 Fetching dependencies... found 1: - - php-7.3.3 + - php-7.3.* Building formula extensions/no-debug-non-zts-20180731/yourextension-1.2.3 ... @@ -707,13 +707,11 @@ For instance, for PHP 7.3 and Xdebug version 2.7.0, have a `php-7.3/xdebug-2.7.0 #!/usr/bin/env bash # Build Path: /app/.heroku/php - # Build Deps: php-7.3.3 + # Build Deps: php-7.3.* source $(dirname $0)/../xdebug -The `php-7.3.3` dependency will not be found in the current S3 bucket and prefix, so Bob will fall back to `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX`. - -It's possible that the `php-…` version in the example above no longer exists, so it may have to be adjusted to a newer version. +The `php-7.3.*` dependency will not be found in the current S3 bucket and prefix, so Bob will fall back to `UPSTREAM_S3_BUCKET` and `UPSTREAM_S3_PREFIX`. #### Build Dockerfiles diff --git a/support/build/composer-1.8.4 b/support/build/composer-1.8.4 index 4d9682918..2411db526 100755 --- a/support/build/composer-1.8.4 +++ b/support/build/composer-1.8.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-min-7.3.3 +# Build Deps: php-min-* source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 index 6ca0887d2..c73d269db 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index 278db04a7..cb4992940 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libcassandra-2.9.0 +# Build Deps: php-5.5.*, libraries/libcassandra-2.* source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 index 723183aeb..300374939 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/ev diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 index 8d00bf426..4408eeadb 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/event diff --git a/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 index 41d19e895..8259cfd76 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/imagick diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 index 153ff32f5..8157f0695 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/libmemcached-1.0.18 +# Build Deps: php-5.5.*, libraries/libmemcached-1.0.18 source $(dirname $0)/memcached diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 index 9316497af..887db169b 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/mongo diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 index 6d7e8f6de..90af99b48 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 index 58ec38f81..2307fb77d 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/oauth diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 index 397c47899..a8d281954 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 index 397c47899..a8d281954 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 index 5cf133f5e..c7b86c41f 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, extensions/no-debug-non-zts-20121212/raphf-1.1.2 +# Build Deps: php-5.5.*, extensions/no-debug-non-zts-20121212/raphf-1.* source $(dirname $0)/pq diff --git a/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 index 35c4abab5..dc67f4137 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/raphf diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index 18b7332fc..3b76b412f 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38, libraries/librdkafka-0.11.6 +# Build Deps: php-5.5.*, libraries/librdkafka-0.* source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 index 5148c25cc..13df2f365 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/redis diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 index 5148c25cc..13df2f365 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.5.38 +# Build Deps: php-5.5.* source $(dirname $0)/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 index 637244651..281d14a5e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index e909aac94..afcf52ed7 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index e06ff217c..56bdb611c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40, libraries/libcassandra-2.9.0 +# Build Deps: php-5.6.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 1087a5d90..291c98b79 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 index b75ca3c49..c3a0c0634 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index f707c4171..4ce87e7a9 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index 22ea342b8..a87a8de3c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40, libraries/libmemcached-1.0.18 +# Build Deps: php-5.6.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index b9f0a4158..c6e91a79e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 index dff49f411..9cb040b70 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 60e698cb4..114a9f68e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index c53b2ef9d..f53b8d725 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 index c53b2ef9d..f53b8d725 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 92d3cd1d1..7b2f933b4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40, extensions/no-debug-non-zts-20131226/raphf-1.1.2 +# Build Deps: php-5.6.*, extensions/no-debug-non-zts-20131226/raphf-1.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index 15fa2bb14..a884c16dd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index b188964e1..283c85efe 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40, libraries/librdkafka-0.11.6 +# Build Deps: php-5.6.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index 9f6c5bf65..2ef43cafd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 index 9f6c5bf65..2ef43cafd 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-5.6.40 +# Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 index 7f597ee5d..dadb933b0 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 index c30a7fb4e..58cd589d8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index 7eb033b5a..bc6dd815f 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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.33, libraries/libcassandra-2.9.0 +# Build Deps: php-7.0.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index a3fd7302b..2046f2ad6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 index f26489c2a..084c80332 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 52adcbffd..2997ecdc6 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 index fccce3a69..6f6c2a361 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33, libraries/libmemcached-1.0.18 +# Build Deps: php-7.0.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 index 691bc288e..aec303e35 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 index c2a75e674..e32175502 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 index d65f0c62f..2ef62b7f1 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 index ce61395cb..19e66c523 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33, extensions/no-debug-non-zts-20151012/raphf-2.0.0 +# Build Deps: php-7.0.*, extensions/no-debug-non-zts-20151012/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index cbc6ab9ba..8bd3e6f28 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 339995c8a..25e950fe7 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33, libraries/librdkafka-0.11.6 +# Build Deps: php-7.0.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index ac9457e77..ab350be0d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 index ac9457e77..ab350be0d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.0.33 +# Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 index a42df580b..7d0470d68 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 index 25bf5df51..3edf09b3b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index d9986d9f3..0769784f9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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.27, libraries/libcassandra-2.9.0 +# Build Deps: php-7.1.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 332ae7dd5..535fe8f4c 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 index fa78b9ccf..e3c99874a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index f01f481b6..822cb8f94 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 index 17ae9ac30..a757c4bb3 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27, libraries/libmemcached-1.0.18 +# Build Deps: php-7.1.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 index 4c4f4b833..f85c312b5 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 index 16abc4e49..465e586d6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 index 446f072b8..887273d3d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 index ecef4311d..85c89d8ae 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27, extensions/no-debug-non-zts-20160303/raphf-2.0.0 +# Build Deps: php-7.1.*, extensions/no-debug-non-zts-20160303/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 0c27cb643..14cf3c089 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 4dafd5033..58fecc25f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27, libraries/librdkafka-0.11.6 +# Build Deps: php-7.1.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index a4270574d..f596fb611 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 index a4270574d..f596fb611 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.1.27 +# Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 index 19c9aeb82..6f6eeab25 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 index 56f489683..93fcbb183 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 952b0f628..5020b7afc 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16, libraries/libcassandra-2.9.0 +# Build Deps: php-7.2.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index b0be43a68..bbdd9a205 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 index 1d718b310..9c0d7f8bf 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index 898213b0d..de46e2ebb 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 index bcb130a57..5c45c4309 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16, libraries/libmemcached-1.0.18 +# Build Deps: php-7.2.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index 8fbcd5ba8..b76f8d1fa 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index 916fd1615..0da8a6837 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 index 0d4916294..7a9f3601a 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 index c92af3c46..5bd592ae2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16, extensions/no-debug-non-zts-20170718/raphf-2.0.0 +# Build Deps: php-7.2.*, extensions/no-debug-non-zts-20170718/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index e448a94cf..e646ea15f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 558248b0e..9c09216b3 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16, libraries/librdkafka-0.11.6 +# Build Deps: php-7.2.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 67615dcf7..14c0d3ef1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 index 67615dcf7..14c0d3ef1 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.2.16 +# Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 index 1d4140ac8..a896f331b 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 index 0f2bb2c77..c03576628 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 index df01564f3..65916dc21 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3, libraries/libcassandra-2.9.0 +# Build Deps: php-7.3.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 index 057b680fa..cb9a623f6 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 index 918f91110..a46f5d281 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 index 24254c215..03032d339 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 index 785489b70..6bd92c57b 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3, libraries/libmemcached-1.0.18 +# Build Deps: php-7.3.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 index 028ad4425..912db1a92 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 index e660392fd..d061c9e5b 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 index cd3360fc9..a89252686 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 index 4474ed41e..194c5c93b 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3, extensions/no-debug-non-zts-20180731/raphf-2.0.0 +# Build Deps: php-7.3.*, extensions/no-debug-non-zts-20180731/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 index 7319761df..315cb2363 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 index f5c188b71..0b3571216 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3, libraries/librdkafka-0.11.6 +# Build Deps: php-7.3.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 index d0261b899..9241247dc 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php/ -# Build Deps: php-7.3.3 +# Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/redis From 0cedcfa873b6d3314203a4c1ebad6eb52ad84199 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Mar 2019 16:47:43 -0700 Subject: [PATCH 293/553] drop trailing slash from build prefix in formulae --- support/build/apache | 2 +- support/build/apache-2.4.38 | 2 +- support/build/composer | 2 +- support/build/composer-1.8.4 | 2 +- support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 | 2 +- .../build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 | 2 +- .../build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 | 2 +- support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 | 2 +- support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 | 2 +- .../build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 | 2 +- support/build/extensions/no-debug-non-zts-20121212/newrelic | 2 +- .../extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 | 2 +- support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 | 2 +- support/build/extensions/no-debug-non-zts-20121212/phalcon | 2 +- .../build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 | 2 +- .../build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 | 2 +- support/build/extensions/no-debug-non-zts-20131226/blackfire | 2 +- .../build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 | 2 +- .../build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 | 2 +- support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 | 2 +- .../build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 | 2 +- support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 | 2 +- .../build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 | 2 +- support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 | 2 +- support/build/extensions/no-debug-non-zts-20151012/blackfire | 2 +- .../build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 | 2 +- .../build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 | 2 +- support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 | 2 +- support/build/extensions/no-debug-non-zts-20160303/blackfire | 2 +- .../build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 | 2 +- .../build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 | 2 +- support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 | 2 +- support/build/extensions/no-debug-non-zts-20170718/blackfire | 2 +- .../build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 | 2 +- .../build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 | 2 +- support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 | 2 +- support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 | 2 +- support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 | 2 +- support/build/extensions/no-debug-non-zts-20180731/blackfire | 2 +- .../build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 | 2 +- .../build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 | 2 +- support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 | 2 +- support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 | 2 +- .../extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 | 2 +- support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 | 2 +- .../build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 | 2 +- support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 | 2 +- .../build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 | 2 +- support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 | 2 +- support/build/hhvm | 2 +- support/build/hhvm-3.5.1 | 2 +- support/build/libraries/libc-client | 2 +- support/build/libraries/libc-client-2007f | 2 +- support/build/libraries/libcassandra | 2 +- support/build/libraries/libcassandra-2.9.0 | 2 +- support/build/libraries/libmcrypt | 2 +- support/build/libraries/libmcrypt-2.5.8 | 2 +- support/build/libraries/libmemcached | 2 +- support/build/libraries/libmemcached-1.0.18 | 2 +- support/build/libraries/librdkafka-0.11.6 | 2 +- support/build/nginx | 2 +- support/build/nginx-1.14.2 | 2 +- support/build/php | 2 +- support/build/php-5.5.38 | 2 +- support/build/php-5.6.40 | 2 +- support/build/php-7.0.33 | 2 +- support/build/php-7.1.27 | 2 +- support/build/php-7.2.16 | 2 +- support/build/php-7.3.3 | 2 +- support/build/php-min | 2 +- support/build/php-min-7.3.3 | 2 +- 137 files changed, 137 insertions(+), 137 deletions(-) diff --git a/support/build/apache b/support/build/apache index b58d895ca..f7fbdb41e 100755 --- a/support/build/apache +++ b/support/build/apache @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/apache-2.4.38 b/support/build/apache-2.4.38 index bb636eadc..b8385e9da 100755 --- a/support/build/apache-2.4.38 +++ b/support/build/apache-2.4.38 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/apache diff --git a/support/build/composer b/support/build/composer index bf7faa837..d5294e607 100755 --- a/support/build/composer +++ b/support/build/composer @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/composer-1.8.4 b/support/build/composer-1.8.4 index 2411db526..9e1cfd3c5 100755 --- a/support/build/composer-1.8.4 +++ b/support/build/composer-1.8.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-min-* source $(dirname $0)/composer diff --git a/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 index c73d269db..08fc8c1cc 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20121212/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 index e093375c3..25946dc78 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 +++ b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 index cb4992940..e2204b2ec 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/cassandra-1.2.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.*, libraries/libcassandra-2.* source $(dirname $0)/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 index 300374939..081e04983 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/ev diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 index 4408eeadb..05986276a 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/event diff --git a/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 index 8259cfd76..7bae6a64d 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/imagick diff --git a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 index 8157f0695..b39eff032 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20121212/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.*, libraries/libmemcached-1.0.18 source $(dirname $0)/memcached diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 index 887db169b..7be20564f 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20121212/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/mongo diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 index 90af99b48..e06ecca5b 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index 03969dcb6..dc774bfcf 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 index 04e8b308b..f8376aca2 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/newrelic diff --git a/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 index 2307fb77d..5bff36272 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/oauth diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon b/support/build/extensions/no-debug-non-zts-20121212/phalcon index c46847344..2e634a23c 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 index a8d281954..6b223ba41 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 index a8d281954..6b223ba41 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 index c7b86c41f..a4bc1d755 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20121212/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.*, extensions/no-debug-non-zts-20121212/raphf-1.* source $(dirname $0)/pq diff --git a/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 index dc67f4137..4f237eb6b 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20121212/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/raphf diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index 3b76b412f..7054a62f1 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.*, libraries/librdkafka-0.* source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 index 13df2f365..2edabb1bb 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20121212/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/redis diff --git a/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 index 13df2f365..2edabb1bb 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20121212/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.5.* source $(dirname $0)/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 index 281d14a5e..185cdced4 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/amqp diff --git a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 index afcf52ed7..140986f4f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 +++ b/support/build/extensions/no-debug-non-zts-20131226/apcu-4.0.11 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/apcu diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire b/support/build/extensions/no-debug-non-zts-20131226/blackfire index 153289a11..881506c65 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/blackfire +++ b/support/build/extensions/no-debug-non-zts-20131226/blackfire @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 index e093375c3..25946dc78 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 index 56bdb611c..5b5b94538 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 index 291c98b79..0b173fc4e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 index c3a0c0634..ab4bff2b3 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 index 4ce87e7a9..631671e09 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 index a87a8de3c..8e227753a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/memcached-2.2.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 index c6e91a79e..57f0c2a5c 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongo-1.6.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/mongo diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 index 9cb040b70..4c08c606e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 index 42faa757d..2e1592d32 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 +++ b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/newrelic diff --git a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 index 114a9f68e..f16c77f09 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/oauth-1.2.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 index f53b8d725..17b8c84ca 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-2.0.13 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 index f53b8d725..17b8c84ca 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 index 7b2f933b4..051f05f7f 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 +++ b/support/build/extensions/no-debug-non-zts-20131226/pq-1.1.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.*, extensions/no-debug-non-zts-20131226/raphf-1.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 index a884c16dd..8d555ea0a 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 +++ b/support/build/extensions/no-debug-non-zts-20131226/raphf-1.1.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 283c85efe..2e236a5b9 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 index 2ef43cafd..2a652520e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 index 2ef43cafd..2a652520e 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20131226/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-5.6.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 index dadb933b0..08aeef2ec 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 index 58cd589d8..e1417c148 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20151012/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/apcu diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire b/support/build/extensions/no-debug-non-zts-20151012/blackfire index 153289a11..881506c65 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/blackfire +++ b/support/build/extensions/no-debug-non-zts-20151012/blackfire @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 index e093375c3..25946dc78 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 +++ b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 index bc6dd815f..8cd8a686e 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/cassandra-1.3.2 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.0.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 index 2046f2ad6..41371b074 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 index 084c80332..3aab42123 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 index 2997ecdc6..cbcc35e57 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 index 6f6c2a361..761698529 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 index aec303e35..d90835227 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 index 42faa757d..2e1592d32 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 +++ b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/newrelic diff --git a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 index e32175502..ad7b42de8 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 index 2ef62b7f1..b5ce6a6f0 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 index 19e66c523..07149793b 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.*, extensions/no-debug-non-zts-20151012/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 index 8bd3e6f28..fcf4fba5d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/raphf-2.0.0 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 25e950fe7..9d71b841d 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 index ab350be0d..56c06fdfd 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 index ab350be0d..56c06fdfd 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.0.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 index 7d0470d68..4fc4d3ad8 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 index 3edf09b3b..e0f62e7b6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20160303/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire b/support/build/extensions/no-debug-non-zts-20160303/blackfire index 153289a11..881506c65 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/blackfire +++ b/support/build/extensions/no-debug-non-zts-20160303/blackfire @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 index e093375c3..25946dc78 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 +++ b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 index 0769784f9..d5fd3c21a 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/cassandra-1.3.2 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.1.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 index 535fe8f4c..a2d43cdb7 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 index e3c99874a..b2b0f239d 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 index 822cb8f94..06b1713ae 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 index a757c4bb3..b200963e6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 index f85c312b5..a860a3132 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 index 42faa757d..2e1592d32 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 +++ b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/newrelic diff --git a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 index 465e586d6..a520c3cab 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 index 887273d3d..0a276ea3f 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 index 85c89d8ae..96f0285f6 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.*, extensions/no-debug-non-zts-20160303/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 index 14cf3c089..69a671343 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/raphf-2.0.0 +++ b/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 Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index 58fecc25f..a4b10af9b 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 index f596fb611..2213ba8b9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 index f596fb611..2213ba8b9 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.1.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 index 6f6eeab25..11ace78ac 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 index 93fcbb183..be715c2d9 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20170718/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire b/support/build/extensions/no-debug-non-zts-20170718/blackfire index 153289a11..881506c65 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/blackfire +++ b/support/build/extensions/no-debug-non-zts-20170718/blackfire @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 index e093375c3..25946dc78 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 index 5020b7afc..6a1ec04ee 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20170718/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 index bbdd9a205..6bc911a32 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 index 9c0d7f8bf..410a92a45 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 index de46e2ebb..d6606792f 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 index 5c45c4309..3a8e46a10 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 index b76f8d1fa..3c24c927e 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 index 42faa757d..2e1592d32 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 +++ b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/newrelic diff --git a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 index 0da8a6837..dbf4238e2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 index 7a9f3601a..456061915 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 index 5bd592ae2..ed984d047 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.*, extensions/no-debug-non-zts-20170718/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 index e646ea15f..97dce5750 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index 9c09216b3..aa7dea6b2 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 index 14c0d3ef1..f02fb806d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-3.1.6 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 index 14c0d3ef1..f02fb806d 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.2.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 index a896f331b..d26554e79 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/amqp-1.9.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20131226/amqp diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 index c03576628..23e2a770e 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 +++ b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.17 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20151012/apcu diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire b/support/build/extensions/no-debug-non-zts-20180731/blackfire index 153289a11..881506c65 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/blackfire +++ b/support/build/extensions/no-debug-non-zts-20180731/blackfire @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 index e093375c3..25946dc78 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/blackfire diff --git a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 index 65916dc21..c838b4daf 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 +++ b/support/build/extensions/no-debug-non-zts-20180731/cassandra-1.3.2 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.*, libraries/libcassandra-2.* source $(dirname $0)/../no-debug-non-zts-20121212/cassandra diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 index cb9a623f6..aa32bf0e9 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 +++ b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/ev diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 index a46f5d281..69ed7e198 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/event diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 index 03032d339..b648bbf85 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/imagick diff --git a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 index 6bd92c57b..708fd3a33 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/memcached-3.1.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.*, libraries/libmemcached-1.0.18 source $(dirname $0)/../no-debug-non-zts-20121212/memcached diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 index 912db1a92..2232496b1 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/mongodb diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 index 42faa757d..2e1592d32 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 +++ b/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/../no-debug-non-zts-20121212/newrelic diff --git a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 index d061c9e5b..fa75c7e78 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/oauth-2.0.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/oauth diff --git a/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 index a89252686..4b65e2e09 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 +++ b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/phalcon diff --git a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 index 194c5c93b..787ba474e 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/pq-2.1.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.*, extensions/no-debug-non-zts-20180731/raphf-2.* source $(dirname $0)/../no-debug-non-zts-20121212/pq diff --git a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 index 315cb2363..d6e3755f8 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/raphf-2.0.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/raphf diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 index 0b3571216..fb57834bc 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.*, libraries/librdkafka-0.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 index 9241247dc..954c08931 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-4.3.0 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: php-7.3.* source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/hhvm b/support/build/hhvm index ff8af047a..4cc6c0f36 100755 --- a/support/build/hhvm +++ b/support/build/hhvm @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/hhvm-3.5.1 b/support/build/hhvm-3.5.1 index 3a7479106..fa43c3317 100755 --- a/support/build/hhvm-3.5.1 +++ b/support/build/hhvm-3.5.1 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Depends: # binutils diff --git a/support/build/libraries/libc-client b/support/build/libraries/libc-client index 1fdc8465a..7d1de9b8e 100755 --- a/support/build/libraries/libc-client +++ b/support/build/libraries/libc-client @@ -1,5 +1,5 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libc-client-2007f b/support/build/libraries/libc-client-2007f index e81faddc3..b4fde3487 100755 --- a/support/build/libraries/libc-client-2007f +++ b/support/build/libraries/libc-client-2007f @@ -1,4 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/libc-client diff --git a/support/build/libraries/libcassandra b/support/build/libraries/libcassandra index 5a4a88152..3cfb3f8aa 100755 --- a/support/build/libraries/libcassandra +++ b/support/build/libraries/libcassandra @@ -1,5 +1,5 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libcassandra-2.9.0 b/support/build/libraries/libcassandra-2.9.0 index 78a8d187c..e2deefdf5 100755 --- a/support/build/libraries/libcassandra-2.9.0 +++ b/support/build/libraries/libcassandra-2.9.0 @@ -1,4 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/libcassandra diff --git a/support/build/libraries/libmcrypt b/support/build/libraries/libmcrypt index cd9fe8159..352c85392 100755 --- a/support/build/libraries/libmcrypt +++ b/support/build/libraries/libmcrypt @@ -1,5 +1,5 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libmcrypt-2.5.8 b/support/build/libraries/libmcrypt-2.5.8 index 4f23e8f5a..9b79abc66 100755 --- a/support/build/libraries/libmcrypt-2.5.8 +++ b/support/build/libraries/libmcrypt-2.5.8 @@ -1,4 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/libmcrypt diff --git a/support/build/libraries/libmemcached b/support/build/libraries/libmemcached index eb7175c86..86248299b 100755 --- a/support/build/libraries/libmemcached +++ b/support/build/libraries/libmemcached @@ -1,5 +1,5 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libmemcached-1.0.18 b/support/build/libraries/libmemcached-1.0.18 index 4495a90f4..fc5bf4a32 100755 --- a/support/build/libraries/libmemcached-1.0.18 +++ b/support/build/libraries/libmemcached-1.0.18 @@ -1,4 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/libmemcached diff --git a/support/build/libraries/librdkafka-0.11.6 b/support/build/libraries/librdkafka-0.11.6 index 89ee18133..c1e222c6f 100755 --- a/support/build/libraries/librdkafka-0.11.6 +++ b/support/build/libraries/librdkafka-0.11.6 @@ -1,4 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/librdkafka diff --git a/support/build/nginx b/support/build/nginx index eed0879ec..505d4bd86 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/nginx-1.14.2 b/support/build/nginx-1.14.2 index b69627606..ade056bda 100755 --- a/support/build/nginx-1.14.2 +++ b/support/build/nginx-1.14.2 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/nginx diff --git a/support/build/php b/support/build/php index 64446de40..d905f410b 100755 --- a/support/build/php +++ b/support/build/php @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/php-5.5.38 b/support/build/php-5.5.38 index 919e4a9f1..049e67755 100755 --- a/support/build/php-5.5.38 +++ b/support/build/php-5.5.38 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: libraries/libmcrypt-2.5.8, libraries/libc-client-2007f source $(dirname $0)/php diff --git a/support/build/php-5.6.40 b/support/build/php-5.6.40 index 919e4a9f1..049e67755 100755 --- a/support/build/php-5.6.40 +++ b/support/build/php-5.6.40 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: libraries/libmcrypt-2.5.8, libraries/libc-client-2007f source $(dirname $0)/php diff --git a/support/build/php-7.0.33 b/support/build/php-7.0.33 index 919e4a9f1..049e67755 100755 --- a/support/build/php-7.0.33 +++ b/support/build/php-7.0.33 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: libraries/libmcrypt-2.5.8, libraries/libc-client-2007f source $(dirname $0)/php diff --git a/support/build/php-7.1.27 b/support/build/php-7.1.27 index 919e4a9f1..049e67755 100755 --- a/support/build/php-7.1.27 +++ b/support/build/php-7.1.27 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: libraries/libmcrypt-2.5.8, libraries/libc-client-2007f source $(dirname $0)/php diff --git a/support/build/php-7.2.16 b/support/build/php-7.2.16 index 788f4a78c..83935f099 100755 --- a/support/build/php-7.2.16 +++ b/support/build/php-7.2.16 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: libraries/libc-client-2007f source $(dirname $0)/php diff --git a/support/build/php-7.3.3 b/support/build/php-7.3.3 index 788f4a78c..83935f099 100755 --- a/support/build/php-7.3.3 +++ b/support/build/php-7.3.3 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php # Build Deps: libraries/libc-client-2007f source $(dirname $0)/php diff --git a/support/build/php-min b/support/build/php-min index 736350b1f..967eeeda9 100755 --- a/support/build/php-min +++ b/support/build/php-min @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php-min/ +# Build Path: /app/.heroku/php-min # fail hard set -o pipefail diff --git a/support/build/php-min-7.3.3 b/support/build/php-min-7.3.3 index ae248ca37..8498fddfb 100755 --- a/support/build/php-min-7.3.3 +++ b/support/build/php-min-7.3.3 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php/ +# Build Path: /app/.heroku/php source $(dirname $0)/php-min From 45843f9d0b7369b91553ae4384e99db4804848f8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Mar 2019 17:01:01 -0700 Subject: [PATCH 294/553] fix php-min build path --- support/build/php-min-7.3.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/build/php-min-7.3.3 b/support/build/php-min-7.3.3 index 8498fddfb..86ac7cce6 100755 --- a/support/build/php-min-7.3.3 +++ b/support/build/php-min-7.3.3 @@ -1,4 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php +# Build Path: /app/.heroku/php-min source $(dirname $0)/php-min From bb94f63882167d3f6ffe708744c5e41391a842d5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 26 Mar 2019 17:59:41 -0700 Subject: [PATCH 295/553] drop bob annotations from base formulae --- support/build/apache | 1 - support/build/composer | 1 - support/build/extensions/no-debug-non-zts-20121212/newrelic | 1 - support/build/extensions/no-debug-non-zts-20121212/phalcon | 1 - support/build/hhvm | 1 - support/build/libraries/libc-client | 1 - support/build/libraries/libcassandra | 1 - support/build/libraries/libmcrypt | 1 - support/build/libraries/libmemcached | 1 - support/build/nginx | 1 - support/build/php | 1 - support/build/php-min | 1 - 12 files changed, 12 deletions(-) diff --git a/support/build/apache b/support/build/apache index f7fbdb41e..8372fdb93 100755 --- a/support/build/apache +++ b/support/build/apache @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/composer b/support/build/composer index d5294e607..4dca9d609 100755 --- a/support/build/composer +++ b/support/build/composer @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic b/support/build/extensions/no-debug-non-zts-20121212/newrelic index dc774bfcf..99ba1c1b5 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/newrelic +++ b/support/build/extensions/no-debug-non-zts-20121212/newrelic @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon b/support/build/extensions/no-debug-non-zts-20121212/phalcon index 2e634a23c..516339290 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/hhvm b/support/build/hhvm index 4cc6c0f36..bd6451d99 100755 --- a/support/build/hhvm +++ b/support/build/hhvm @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libc-client b/support/build/libraries/libc-client index 7d1de9b8e..b0bd7271c 100755 --- a/support/build/libraries/libc-client +++ b/support/build/libraries/libc-client @@ -1,5 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libcassandra b/support/build/libraries/libcassandra index 3cfb3f8aa..4f9f7100c 100755 --- a/support/build/libraries/libcassandra +++ b/support/build/libraries/libcassandra @@ -1,5 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libmcrypt b/support/build/libraries/libmcrypt index 352c85392..d1d5dcf05 100755 --- a/support/build/libraries/libmcrypt +++ b/support/build/libraries/libmcrypt @@ -1,5 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/libraries/libmemcached b/support/build/libraries/libmemcached index 86248299b..4a1462942 100755 --- a/support/build/libraries/libmemcached +++ b/support/build/libraries/libmemcached @@ -1,5 +1,4 @@ #!/bin/bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/nginx b/support/build/nginx index 505d4bd86..6ee8ac1f4 100755 --- a/support/build/nginx +++ b/support/build/nginx @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/php b/support/build/php index d905f410b..8d3f6a299 100755 --- a/support/build/php +++ b/support/build/php @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php # fail hard set -o pipefail diff --git a/support/build/php-min b/support/build/php-min index 967eeeda9..225e37d4b 100755 --- a/support/build/php-min +++ b/support/build/php-min @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Build Path: /app/.heroku/php-min # fail hard set -o pipefail From d182d7210a0618632c8134cc587454506b9ff0e5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Apr 2019 15:30:22 +0200 Subject: [PATCH 296/553] Update to Hatchet/4.0.8 and use app name isolation feature --- .travis.yml | 3 +++ Gemfile | 2 +- Gemfile.lock | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 004a13d02..f2e146f00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ install: before_script: - bundle exec hatchet ci:setup script: bundle exec parallel_rspec -n6 test/spec/ +after_script: +- bundle exec hatchet destroy --all env: global: - HATCHET_RETRIES=3 @@ -16,6 +18,7 @@ env: - HEROKU_APP_LIMIT=9999 - HATCHET_DEPLOY_STRATEGY=git - HATCHET_BUILDPACK_BASE="https://github.com/heroku/heroku-buildpack-php" + - HATCHET_APP_PREFIX="htcht-${TRAVIS_JOB_ID}-" matrix: include: - env: STACK=cedar-14 diff --git a/Gemfile b/Gemfile index e8c32c76f..1b7f1a8ea 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem 'heroku_hatchet', ">=4.0.7" +gem 'heroku_hatchet', ">=4.0.8" gem 'rspec-retry' gem 'rspec-expectations' gem 'sem_version' diff --git a/Gemfile.lock b/Gemfile.lock index bff0b3496..813c7feec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.2) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) diff-lcs (1.3) erubis (2.7.0) excon (0.62.0) @@ -15,7 +15,7 @@ GEM excon moneta multi_json (>= 1.9.2) - heroku_hatchet (4.0.7) + heroku_hatchet (4.0.8) excon (~> 0) minitest-retry (~> 0.1.9) platform-api (~> 2) @@ -30,7 +30,7 @@ GEM minitest (>= 5.0) moneta (1.0.0) multi_json (1.13.1) - parallel (1.14.0) + parallel (1.17.0) parallel_tests (2.28.0) parallel platform-api (2.2.0) @@ -59,7 +59,7 @@ PLATFORMS ruby DEPENDENCIES - heroku_hatchet (>= 4.0.7) + heroku_hatchet (>= 4.0.8) parallel_tests rake rspec-expectations From a95628b0e29c963c44844b828176d85be7b8cea7 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Apr 2019 16:53:26 +0200 Subject: [PATCH 297/553] PHP/7.2.17 --- CHANGELOG.md | 6 ++++++ support/build/{php-7.2.16 => php-7.2.17} | 0 2 files changed, 6 insertions(+) rename support/build/{php-7.2.16 => php-7.2.17} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a157ebd12..2be93273c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v154 (2019-04-04) + +### ADD + +- PHP/7.2.17 [David Zuelke] + ## v153 (2019-03-18) ### ADD diff --git a/support/build/php-7.2.16 b/support/build/php-7.2.17 similarity index 100% rename from support/build/php-7.2.16 rename to support/build/php-7.2.17 From 761cabcd306bfa90da29031cb289898d62653b08 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Apr 2019 16:54:07 +0200 Subject: [PATCH 298/553] PHP/7.3.4 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{php-7.3.3 => php-7.3.4} | 0 support/build/{php-min-7.3.3 => php-min-7.3.4} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{php-7.3.3 => php-7.3.4} (100%) rename support/build/{php-min-7.3.3 => php-min-7.3.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be93273c..cfbc14f5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.2.17 [David Zuelke] +- PHP/7.3.4 [David Zuelke] ## v153 (2019-03-18) diff --git a/bin/compile b/bin/compile index 4650f275b..035ad6c09 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.3.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.4.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/php-7.3.3 b/support/build/php-7.3.4 similarity index 100% rename from support/build/php-7.3.3 rename to support/build/php-7.3.4 diff --git a/support/build/php-min-7.3.3 b/support/build/php-min-7.3.4 similarity index 100% rename from support/build/php-min-7.3.3 rename to support/build/php-min-7.3.4 From b919ed155fde2e82b4cf17735d1622b1251ad0aa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Apr 2019 16:57:13 +0200 Subject: [PATCH 299/553] librdkafka/1.0.0 --- CHANGELOG.md | 4 ++++ support/build/extensions/no-debug-non-zts-20121212/rdkafka | 2 +- .../build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 | 2 +- .../build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 | 2 +- .../build/libraries/{librdkafka-0.11.6 => librdkafka-1.0.0} | 0 9 files changed, 11 insertions(+), 7 deletions(-) rename support/build/libraries/{librdkafka-0.11.6 => librdkafka-1.0.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfbc14f5e..b94577189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ - PHP/7.2.17 [David Zuelke] - PHP/7.3.4 [David Zuelke] +### CHG + +- librdkafka/1.0.0 [David Zuelke] + ## v153 (2019-03-18) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka b/support/build/extensions/no-debug-non-zts-20121212/rdkafka index d6bd52869..fa5d7f3bf 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka @@ -11,7 +11,7 @@ dep_version=${dep_formula##*"/${dep_name}-"} series=$(php-config --version | cut -d. -f1,2) # get "5.5", "5.6", "7.0" etc for the php requirement in the manifest case "$dep_version" in *) - MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/librdkafka\":\"~0.9\",\"heroku-sys/librdkafka-abi\":\"^1\"}"}" + MANIFEST_REQUIRE="${MANIFEST_REQUIRE:-"{\"heroku-sys/php\":\"${series}.*\",\"heroku-sys/librdkafka\":\"^1.0.0\",\"heroku-sys/librdkafka-abi\":\"^1\"}"}" ;; esac diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 index 7054a62f1..427d3629a 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php -# Build Deps: php-5.5.*, libraries/librdkafka-0.* +# Build Deps: php-5.5.*, libraries/librdkafka-1.* source $(dirname $0)/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 index 2e236a5b9..9fe07b5d8 100755 --- a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php -# Build Deps: php-5.6.*, libraries/librdkafka-0.* +# Build Deps: php-5.6.*, libraries/librdkafka-1.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 index 9d71b841d..074abe8ee 100755 --- a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php -# Build Deps: php-7.0.*, libraries/librdkafka-0.* +# Build Deps: php-7.0.*, libraries/librdkafka-1.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 index a4b10af9b..88fb6e299 100755 --- a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php -# Build Deps: php-7.1.*, libraries/librdkafka-0.* +# Build Deps: php-7.1.*, libraries/librdkafka-1.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 index aa7dea6b2..f0f8c224c 100755 --- a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php -# Build Deps: php-7.2.*, libraries/librdkafka-0.* +# Build Deps: php-7.2.*, libraries/librdkafka-1.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 index fb57834bc..889d3ee6b 100755 --- a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 +++ b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 @@ -1,5 +1,5 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/php -# Build Deps: php-7.3.*, libraries/librdkafka-0.* +# Build Deps: php-7.3.*, libraries/librdkafka-1.* source $(dirname $0)/../no-debug-non-zts-20121212/rdkafka diff --git a/support/build/libraries/librdkafka-0.11.6 b/support/build/libraries/librdkafka-1.0.0 similarity index 100% rename from support/build/libraries/librdkafka-0.11.6 rename to support/build/libraries/librdkafka-1.0.0 From 7cc0e5a320b9f3537e1a7d5790c30dd7fd492353 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Apr 2019 17:00:23 +0200 Subject: [PATCH 300/553] libcassandra/2.11.0 --- CHANGELOG.md | 1 + support/build/libraries/libcassandra-2.11.0 | 9 +++++++++ support/build/libraries/libcassandra-2.9.0 | 5 +++++ 3 files changed, 15 insertions(+) create mode 100755 support/build/libraries/libcassandra-2.11.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index b94577189..bd9a00fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### CHG - librdkafka/1.0.0 [David Zuelke] +- libcassandra/2.11.0 [David Zuelke] ## v153 (2019-03-18) diff --git a/support/build/libraries/libcassandra-2.11.0 b/support/build/libraries/libcassandra-2.11.0 new file mode 100755 index 000000000..cc7df2286 --- /dev/null +++ b/support/build/libraries/libcassandra-2.11.0 @@ -0,0 +1,9 @@ +#!/bin/bash +# Build Path: /app/.heroku/php + +if [[ $STACK == "cedar-14" ]]; then + echo "Cannot build on cedar-14, please build an older version" + exit 1 +fi + +source $(dirname $0)/libcassandra diff --git a/support/build/libraries/libcassandra-2.9.0 b/support/build/libraries/libcassandra-2.9.0 index e2deefdf5..fe67bfcd3 100755 --- a/support/build/libraries/libcassandra-2.9.0 +++ b/support/build/libraries/libcassandra-2.9.0 @@ -1,4 +1,9 @@ #!/bin/bash # Build Path: /app/.heroku/php +if [[ $STACK != "cedar-14" ]]; then + echo "Please build a newer version on stacks other than cedar-14" + exit 1 +fi + source $(dirname $0)/libcassandra From a2e2838289a33754bcc6204c5709467899bf0036 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Apr 2019 17:01:15 +0200 Subject: [PATCH 301/553] Apache/2.4.39 --- CHANGELOG.md | 1 + support/build/{apache-2.4.38 => apache-2.4.39} | 0 2 files changed, 1 insertion(+) rename support/build/{apache-2.4.38 => apache-2.4.39} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd9a00fef..d902eafe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.2.17 [David Zuelke] - PHP/7.3.4 [David Zuelke] +- Apache/2.4.39 [David Zuelke] ### CHG diff --git a/support/build/apache-2.4.38 b/support/build/apache-2.4.39 similarity index 100% rename from support/build/apache-2.4.38 rename to support/build/apache-2.4.39 From 287afd9baa2e7218908bad8657a5d9d02d60215d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 4 Apr 2019 21:00:51 +0200 Subject: [PATCH 302/553] PHP/7.1.28 --- CHANGELOG.md | 1 + support/build/{php-7.1.27 => php-7.1.28} | 0 2 files changed, 1 insertion(+) rename support/build/{php-7.1.27 => php-7.1.28} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d902eafe6..6d9816f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.2.17 [David Zuelke] - PHP/7.3.4 [David Zuelke] - Apache/2.4.39 [David Zuelke] +- PHP/7.1.28 [David Zuelke] ### CHG diff --git a/support/build/php-7.1.27 b/support/build/php-7.1.28 similarity index 100% rename from support/build/php-7.1.27 rename to support/build/php-7.1.28 From 837df40f0203c7f9acdf48aaaa3ebf8b91ae78ac Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 11 Apr 2019 19:06:20 +0200 Subject: [PATCH 303/553] Composer/1.8.5 --- CHANGELOG.md | 6 ++++++ bin/compile | 2 +- support/build/{composer-1.8.4 => composer-1.8.5} | 0 3 files changed, 7 insertions(+), 1 deletion(-) rename support/build/{composer-1.8.4 => composer-1.8.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d9816f30..8ea4cd1c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v155 (2019-05-??) + +### CHG + +- Composer/1.8.5 [David Zuelke] + ## v154 (2019-04-04) ### ADD diff --git a/bin/compile b/bin/compile index 035ad6c09..cb2b6fb81 100755 --- a/bin/compile +++ b/bin/compile @@ -231,7 +231,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.8.4.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.8.5.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.8.4 b/support/build/composer-1.8.5 similarity index 100% rename from support/build/composer-1.8.4 rename to support/build/composer-1.8.5 From e8cb9de1fa2dfdb722837b783658acbb50b0897e Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 18 Apr 2019 18:15:57 +0200 Subject: [PATCH 304/553] ext-rdkafka/3.1.0 --- CHANGELOG.md | 4 ++++ .../{rdkafka-3.0.5 => rdkafka-3.1.0} | 0 .../{rdkafka-3.0.5 => rdkafka-3.1.0} | 0 .../{rdkafka-3.0.5 => rdkafka-3.1.0} | 0 .../{rdkafka-3.0.5 => rdkafka-3.1.0} | 0 .../{rdkafka-3.0.5 => rdkafka-3.1.0} | 0 .../{rdkafka-3.0.5 => rdkafka-3.1.0} | 0 7 files changed, 4 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{rdkafka-3.0.5 => rdkafka-3.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{rdkafka-3.0.5 => rdkafka-3.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{rdkafka-3.0.5 => rdkafka-3.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{rdkafka-3.0.5 => rdkafka-3.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{rdkafka-3.0.5 => rdkafka-3.1.0} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{rdkafka-3.0.5 => rdkafka-3.1.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ea4cd1c3..dee42ce38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v155 (2019-05-??) +### ADD + +- ext-rdkafka/3.1.0 [David Zuelke] + ### CHG - Composer/1.8.5 [David Zuelke] diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.0.5 rename to support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.0.5 rename to support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.0.5 rename to support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.0.5 rename to support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.0.5 rename to support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.1.0 diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.1.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.0.5 rename to support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.1.0 From e55992cef3c07839f9bedceb47e3ddefd3823494 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 19 Apr 2019 17:08:56 +0200 Subject: [PATCH 305/553] ext-event/2.4.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.4.3 => event-2.4.4} | 0 .../no-debug-non-zts-20131226/{event-2.4.3 => event-2.4.4} | 0 .../no-debug-non-zts-20151012/{event-2.4.3 => event-2.4.4} | 0 .../no-debug-non-zts-20160303/{event-2.4.3 => event-2.4.4} | 0 .../no-debug-non-zts-20170718/{event-2.4.3 => event-2.4.4} | 0 .../no-debug-non-zts-20180731/{event-2.4.3 => event-2.4.4} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.4.3 => event-2.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.4.3 => event-2.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.4.3 => event-2.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.4.3 => event-2.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.4.3 => event-2.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.4.3 => event-2.4.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dee42ce38..145787027 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-rdkafka/3.1.0 [David Zuelke] +- ext-event/2.4.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20121212/event-2.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.4.3 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20131226/event-2.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.4.3 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20151012/event-2.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.4.3 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20160303/event-2.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.4.3 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20170718/event-2.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.4.3 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 b/support/build/extensions/no-debug-non-zts-20180731/event-2.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.4.3 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.4.4 From e01cccefb8e77f242dcc3ebc8a103c247eb5ccfe Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 22 Apr 2019 17:31:13 +0200 Subject: [PATCH 306/553] libcassandra/2.12.0 --- CHANGELOG.md | 1 + .../build/libraries/{libcassandra-2.11.0 => libcassandra-2.12.0} | 0 2 files changed, 1 insertion(+) rename support/build/libraries/{libcassandra-2.11.0 => libcassandra-2.12.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 145787027..2dc649f21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### CHG - Composer/1.8.5 [David Zuelke] +- libcassandra/2.12.0 [David Zuelke] ## v154 (2019-04-04) diff --git a/support/build/libraries/libcassandra-2.11.0 b/support/build/libraries/libcassandra-2.12.0 similarity index 100% rename from support/build/libraries/libcassandra-2.11.0 rename to support/build/libraries/libcassandra-2.12.0 From e6d1c4f5eae6e075efce014283a1ca0dd1c9472a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Mon, 29 Apr 2019 01:03:46 +0200 Subject: [PATCH 307/553] ext-event/2.5.0 --- CHANGELOG.md | 2 +- .../no-debug-non-zts-20121212/{event-2.4.4 => event-2.5.0} | 0 .../no-debug-non-zts-20131226/{event-2.4.4 => event-2.5.0} | 0 .../no-debug-non-zts-20151012/{event-2.4.4 => event-2.5.0} | 0 .../no-debug-non-zts-20160303/{event-2.4.4 => event-2.5.0} | 0 .../no-debug-non-zts-20170718/{event-2.4.4 => event-2.5.0} | 0 .../no-debug-non-zts-20180731/{event-2.4.4 => event-2.5.0} | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.4.4 => event-2.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.4.4 => event-2.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.4.4 => event-2.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.4.4 => event-2.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.4.4 => event-2.5.0} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.4.4 => event-2.5.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dc649f21..f64216245 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### ADD - ext-rdkafka/3.1.0 [David Zuelke] -- ext-event/2.4.4 [David Zuelke] +- ext-event/2.5.0 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.4.4 b/support/build/extensions/no-debug-non-zts-20121212/event-2.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.4.4 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.4.4 b/support/build/extensions/no-debug-non-zts-20131226/event-2.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.4.4 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.4.4 b/support/build/extensions/no-debug-non-zts-20151012/event-2.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.4.4 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.4.4 b/support/build/extensions/no-debug-non-zts-20160303/event-2.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.4.4 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.4.4 b/support/build/extensions/no-debug-non-zts-20170718/event-2.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.4.4 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.5.0 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.4.4 b/support/build/extensions/no-debug-non-zts-20180731/event-2.5.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.4.4 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.5.0 From fd68666cb9fdcb1dcc7125533e9b7336431d3395 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 9 May 2019 19:06:55 +0200 Subject: [PATCH 308/553] ext-imagick/3.4.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{imagick-3.4.3 => imagick-3.4.4} | 0 .../no-debug-non-zts-20131226/{imagick-3.4.3 => imagick-3.4.4} | 0 .../no-debug-non-zts-20151012/{imagick-3.4.3 => imagick-3.4.4} | 0 .../no-debug-non-zts-20160303/{imagick-3.4.3 => imagick-3.4.4} | 0 .../no-debug-non-zts-20170718/{imagick-3.4.3 => imagick-3.4.4} | 0 .../no-debug-non-zts-20180731/{imagick-3.4.3 => imagick-3.4.4} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{imagick-3.4.3 => imagick-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{imagick-3.4.3 => imagick-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{imagick-3.4.3 => imagick-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{imagick-3.4.3 => imagick-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{imagick-3.4.3 => imagick-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{imagick-3.4.3 => imagick-3.4.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f64216245..1e494f361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-rdkafka/3.1.0 [David Zuelke] - ext-event/2.5.0 [David Zuelke] +- ext-imagick/3.4.4 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.3 rename to support/build/extensions/no-debug-non-zts-20121212/imagick-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.3 rename to support/build/extensions/no-debug-non-zts-20131226/imagick-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.3 rename to support/build/extensions/no-debug-non-zts-20151012/imagick-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.3 rename to support/build/extensions/no-debug-non-zts-20160303/imagick-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.3 rename to support/build/extensions/no-debug-non-zts-20170718/imagick-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.3 rename to support/build/extensions/no-debug-non-zts-20180731/imagick-3.4.4 From c25673bb1ab49165114cf9d64a1f0155abc3b60d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 9 May 2019 19:10:40 +0200 Subject: [PATCH 309/553] PHP/7.1.29 --- CHANGELOG.md | 1 + support/build/{php-7.1.28 => php-7.1.29} | 0 2 files changed, 1 insertion(+) rename support/build/{php-7.1.28 => php-7.1.29} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e494f361..3a3a895c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-rdkafka/3.1.0 [David Zuelke] - ext-event/2.5.0 [David Zuelke] - ext-imagick/3.4.4 [David Zuelke] +- PHP/7.1.29 [David Zuelke] ### CHG diff --git a/support/build/php-7.1.28 b/support/build/php-7.1.29 similarity index 100% rename from support/build/php-7.1.28 rename to support/build/php-7.1.29 From 495dbfa09f44035f6ce263643866574f3ed94313 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 9 May 2019 19:11:22 +0200 Subject: [PATCH 310/553] PHP/7.2.18 --- CHANGELOG.md | 1 + support/build/{php-7.2.17 => php-7.2.18} | 0 2 files changed, 1 insertion(+) rename support/build/{php-7.2.17 => php-7.2.18} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a3a895c2..4b776c151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - ext-event/2.5.0 [David Zuelke] - ext-imagick/3.4.4 [David Zuelke] - PHP/7.1.29 [David Zuelke] +- PHP/7.2.18 [David Zuelke] ### CHG diff --git a/support/build/php-7.2.17 b/support/build/php-7.2.18 similarity index 100% rename from support/build/php-7.2.17 rename to support/build/php-7.2.18 From e0bb51668c5cf8e8eaacc644e4d36cece0dda713 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 9 May 2019 19:12:05 +0200 Subject: [PATCH 311/553] PHP/7.3.5 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{php-7.3.4 => php-7.3.5} | 0 support/build/{php-min-7.3.4 => php-min-7.3.5} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{php-7.3.4 => php-7.3.5} (100%) rename support/build/{php-min-7.3.4 => php-min-7.3.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b776c151..46145b73c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - ext-imagick/3.4.4 [David Zuelke] - PHP/7.1.29 [David Zuelke] - PHP/7.2.18 [David Zuelke] +- PHP/7.3.5 [David Zuelke] ### CHG diff --git a/bin/compile b/bin/compile index cb2b6fb81..e5236c1d3 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.4.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.5.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/php-7.3.4 b/support/build/php-7.3.5 similarity index 100% rename from support/build/php-7.3.4 rename to support/build/php-7.3.5 diff --git a/support/build/php-min-7.3.4 b/support/build/php-min-7.3.5 similarity index 100% rename from support/build/php-min-7.3.4 rename to support/build/php-min-7.3.5 From 6b16642bd88164aa1e8abc299125aa39ca09291d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 9 May 2019 20:52:34 +0200 Subject: [PATCH 312/553] v155 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46145b73c..fd8bab279 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v155 (2019-05-??) +## v155 (2019-05-09) ### ADD From 917ad4e504012377013bb0300665e4c5a72bd8fd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:39:42 +0200 Subject: [PATCH 313/553] PHP/7.1.30 --- CHANGELOG.md | 6 ++++++ support/build/{php-7.1.29 => php-7.1.30} | 0 2 files changed, 6 insertions(+) rename support/build/{php-7.1.29 => php-7.1.30} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd8bab279..628ba8763 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v156 (2019-05-??) + +### ADD + +- PHP/7.1.30 [David Zuelke] + ## v155 (2019-05-09) ### ADD diff --git a/support/build/php-7.1.29 b/support/build/php-7.1.30 similarity index 100% rename from support/build/php-7.1.29 rename to support/build/php-7.1.30 From ffbcc721ef83260caa0dce0e04dca266cd2291dc Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:40:04 +0200 Subject: [PATCH 314/553] PHP/7.2.19 --- CHANGELOG.md | 1 + support/build/{php-7.2.18 => php-7.2.19} | 0 2 files changed, 1 insertion(+) rename support/build/{php-7.2.18 => php-7.2.19} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628ba8763..2f1d8f39d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.1.30 [David Zuelke] +- PHP/7.2.19 [David Zuelke] ## v155 (2019-05-09) diff --git a/support/build/php-7.2.18 b/support/build/php-7.2.19 similarity index 100% rename from support/build/php-7.2.18 rename to support/build/php-7.2.19 From 20e409cd2e0e8d9ebc7e3f4fb543a21c2abed618 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:40:42 +0200 Subject: [PATCH 315/553] PHP/7.3.6 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{php-7.3.5 => php-7.3.6} | 0 support/build/{php-min-7.3.5 => php-min-7.3.6} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{php-7.3.5 => php-7.3.6} (100%) rename support/build/{php-min-7.3.5 => php-min-7.3.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f1d8f39d..70fda97d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.1.30 [David Zuelke] - PHP/7.2.19 [David Zuelke] +- PHP/7.3.6 [David Zuelke] ## v155 (2019-05-09) diff --git a/bin/compile b/bin/compile index e5236c1d3..197673e39 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.5.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.6.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/php-7.3.5 b/support/build/php-7.3.6 similarity index 100% rename from support/build/php-7.3.5 rename to support/build/php-7.3.6 diff --git a/support/build/php-min-7.3.5 b/support/build/php-min-7.3.6 similarity index 100% rename from support/build/php-min-7.3.5 rename to support/build/php-min-7.3.6 From bdbaddb8cc8e6f39c1d2917a4a27ad6d7bd25639 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:41:11 +0200 Subject: [PATCH 316/553] Nginx/1.16.0 --- support/build/{nginx-1.14.2 => nginx-1.16.0} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename support/build/{nginx-1.14.2 => nginx-1.16.0} (100%) diff --git a/support/build/nginx-1.14.2 b/support/build/nginx-1.16.0 similarity index 100% rename from support/build/nginx-1.14.2 rename to support/build/nginx-1.16.0 From 285bd315db93682e8e53268214279fe5bf87ad5d Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:43:14 +0200 Subject: [PATCH 317/553] ext-ev/1.0.6 --- CHANGELOG.md | 1 + .../extensions/no-debug-non-zts-20121212/{ev-1.0.4 => ev-1.0.6} | 0 .../extensions/no-debug-non-zts-20131226/{ev-1.0.4 => ev-1.0.6} | 0 .../extensions/no-debug-non-zts-20151012/{ev-1.0.4 => ev-1.0.6} | 0 .../extensions/no-debug-non-zts-20160303/{ev-1.0.4 => ev-1.0.6} | 0 .../extensions/no-debug-non-zts-20170718/{ev-1.0.4 => ev-1.0.6} | 0 .../extensions/no-debug-non-zts-20180731/{ev-1.0.4 => ev-1.0.6} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{ev-1.0.4 => ev-1.0.6} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{ev-1.0.4 => ev-1.0.6} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{ev-1.0.4 => ev-1.0.6} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{ev-1.0.4 => ev-1.0.6} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{ev-1.0.4 => ev-1.0.6} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{ev-1.0.4 => ev-1.0.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70fda97d6..c3bd4fd77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.1.30 [David Zuelke] - PHP/7.2.19 [David Zuelke] - PHP/7.3.6 [David Zuelke] +- ext-ev/1.0.6 [David Zuelke] ## v155 (2019-05-09) diff --git a/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20121212/ev-1.0.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/ev-1.0.4 rename to support/build/extensions/no-debug-non-zts-20121212/ev-1.0.6 diff --git a/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20131226/ev-1.0.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/ev-1.0.4 rename to support/build/extensions/no-debug-non-zts-20131226/ev-1.0.6 diff --git a/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20151012/ev-1.0.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/ev-1.0.4 rename to support/build/extensions/no-debug-non-zts-20151012/ev-1.0.6 diff --git a/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20160303/ev-1.0.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/ev-1.0.4 rename to support/build/extensions/no-debug-non-zts-20160303/ev-1.0.6 diff --git a/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20170718/ev-1.0.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/ev-1.0.4 rename to support/build/extensions/no-debug-non-zts-20170718/ev-1.0.6 diff --git a/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 b/support/build/extensions/no-debug-non-zts-20180731/ev-1.0.6 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/ev-1.0.4 rename to support/build/extensions/no-debug-non-zts-20180731/ev-1.0.6 From 3605557276e16c4b1edd0f7c62336583b97c12e3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:43:49 +0200 Subject: [PATCH 318/553] ext-event/2.5.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.5.0 => event-2.5.1} | 0 .../no-debug-non-zts-20131226/{event-2.5.0 => event-2.5.1} | 0 .../no-debug-non-zts-20151012/{event-2.5.0 => event-2.5.1} | 0 .../no-debug-non-zts-20160303/{event-2.5.0 => event-2.5.1} | 0 .../no-debug-non-zts-20170718/{event-2.5.0 => event-2.5.1} | 0 .../no-debug-non-zts-20180731/{event-2.5.0 => event-2.5.1} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.5.0 => event-2.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.5.0 => event-2.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.5.0 => event-2.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.5.0 => event-2.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.5.0 => event-2.5.1} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.5.0 => event-2.5.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3bd4fd77..b8472eed2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.2.19 [David Zuelke] - PHP/7.3.6 [David Zuelke] - ext-ev/1.0.6 [David Zuelke] +- ext-event/2.5.1 [David Zuelke] ## v155 (2019-05-09) diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.5.0 b/support/build/extensions/no-debug-non-zts-20121212/event-2.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.5.0 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.5.0 b/support/build/extensions/no-debug-non-zts-20131226/event-2.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.5.0 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.5.0 b/support/build/extensions/no-debug-non-zts-20151012/event-2.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.5.0 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.5.0 b/support/build/extensions/no-debug-non-zts-20160303/event-2.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.5.0 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.5.0 b/support/build/extensions/no-debug-non-zts-20170718/event-2.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.5.0 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.5.1 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.5.0 b/support/build/extensions/no-debug-non-zts-20180731/event-2.5.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.5.0 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.5.1 From c031a07f592017be96f79d225d2d4a18fda912e4 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:44:51 +0200 Subject: [PATCH 319/553] librdkafka/1.0.1 --- CHANGELOG.md | 4 ++++ .../build/libraries/{librdkafka-1.0.0 => librdkafka-1.0.1} | 0 2 files changed, 4 insertions(+) rename support/build/libraries/{librdkafka-1.0.0 => librdkafka-1.0.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8472eed2..ba46d99d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ - ext-ev/1.0.6 [David Zuelke] - ext-event/2.5.1 [David Zuelke] +### CHG + +- librdkafka/1.0.1 [David Zuelke] + ## v155 (2019-05-09) ### ADD diff --git a/support/build/libraries/librdkafka-1.0.0 b/support/build/libraries/librdkafka-1.0.1 similarity index 100% rename from support/build/libraries/librdkafka-1.0.0 rename to support/build/libraries/librdkafka-1.0.1 From 8b1f02ff56477a86135aa04c90a2568caf3d3521 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 May 2019 21:23:23 +0200 Subject: [PATCH 320/553] Match upstream production default php.ini files We now use the php.ini-production file that ships with PHP for each release, then apply our own defaults via conf.d/ Also update error_reporting to `E_ALL & ~E_STRICT` for all runtime versions. Fixes several inconsistencies with INI directives such as `serialize_precision` or `zend.assertions` having wrong or outdated values, as we used a very old php.ini with defaults from PHP 5.3 times for some directives until now. Also fixes #242. --- CHANGELOG.md | 11 + .../build/_conf/php/5/conf.d/000-heroku.ini | 17 + support/build/_conf/php/7/0/000-heroku.ini | 17 + support/build/_conf/php/conf.d/000-heroku.ini | 20 + support/build/_conf/php/php.ini | 1900 ----------------- support/build/php | 3 + test/spec/php_shared.rb | 32 +- 7 files changed, 93 insertions(+), 1907 deletions(-) create mode 100644 support/build/_conf/php/5/conf.d/000-heroku.ini create mode 100644 support/build/_conf/php/7/0/000-heroku.ini create mode 100644 support/build/_conf/php/conf.d/000-heroku.ini delete mode 100644 support/build/_conf/php/php.ini diff --git a/CHANGELOG.md b/CHANGELOG.md index ba46d99d1..e40723167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,17 @@ ### CHG - librdkafka/1.0.1 [David Zuelke] +- Use bundled `php.ini-production` as the standard PHP config and apply Heroku settings via `conf.d/` include [David Zuelke] +- Update `error_reporting` to `E_ALL & ~E_STRICT` for all runtime versions [David Zuelke] + +### FIX + +- `mail.add_x_header` INI directive is set to an outdated default value for some PHP versions [David Zuelke] +- `serialize_precision` INI directive is set to an outdated default value for some PHP versions [David Zuelke] +- `session.entropy_length` INI directive is set to an outdated default value for some PHP versions [David Zuelke] +- `session.sid_bits_per_character` INI directive is set to a non-recommended default value for some PHP versions [David Zuelke] +- `url_rewriter.tags` INI directive is set to an outdated default value for some PHP versions [David Zuelke] +- PHP assertions should be disabled in prod mode (#242) [David Zuelke] ## v155 (2019-05-09) diff --git a/support/build/_conf/php/5/conf.d/000-heroku.ini b/support/build/_conf/php/5/conf.d/000-heroku.ini new file mode 100644 index 000000000..5e2f79f81 --- /dev/null +++ b/support/build/_conf/php/5/conf.d/000-heroku.ini @@ -0,0 +1,17 @@ +; in line with Heroku dynos' TZ +date.timezone = UTC + +; we want users to see E_DEPRECATED warnings, as it's not uncommon to accidentally run PHP series newer than on local dev +error_reporting = E_ALL & ~E_STRICT + +; do not expose PHP via headers (just like we don't with web servers) +expose_php = Off + +; legacy +short_open_tag = On + +; dyno filesystems are ephemeral, so there is no point in checking for .user.ini changes +user_ini.cache_ttl = 86400 + +; we need environment variables included in superglobals, as they're used for configuration +variables_order = EGPCS diff --git a/support/build/_conf/php/7/0/000-heroku.ini b/support/build/_conf/php/7/0/000-heroku.ini new file mode 100644 index 000000000..5e2f79f81 --- /dev/null +++ b/support/build/_conf/php/7/0/000-heroku.ini @@ -0,0 +1,17 @@ +; in line with Heroku dynos' TZ +date.timezone = UTC + +; we want users to see E_DEPRECATED warnings, as it's not uncommon to accidentally run PHP series newer than on local dev +error_reporting = E_ALL & ~E_STRICT + +; do not expose PHP via headers (just like we don't with web servers) +expose_php = Off + +; legacy +short_open_tag = On + +; dyno filesystems are ephemeral, so there is no point in checking for .user.ini changes +user_ini.cache_ttl = 86400 + +; we need environment variables included in superglobals, as they're used for configuration +variables_order = EGPCS diff --git a/support/build/_conf/php/conf.d/000-heroku.ini b/support/build/_conf/php/conf.d/000-heroku.ini new file mode 100644 index 000000000..957c9ea53 --- /dev/null +++ b/support/build/_conf/php/conf.d/000-heroku.ini @@ -0,0 +1,20 @@ +; in line with Heroku dynos' TZ +date.timezone = UTC + +; we want users to see E_DEPRECATED warnings, as it's not uncommon to accidentally run PHP series newer than on local dev +error_reporting = E_ALL & ~E_STRICT + +; do not expose PHP via headers (just like we don't with web servers) +expose_php = Off + +; 32 or more is recommended and always has been the default for PHP 7 on Heroku +session.sid_length = 32 + +; legacy +short_open_tag = On + +; dyno filesystems are ephemeral, so there is no point in checking for .user.ini changes +user_ini.cache_ttl = 86400 + +; we need environment variables included in superglobals, as they're used for configuration +variables_order = EGPCS diff --git a/support/build/_conf/php/php.ini b/support/build/_conf/php/php.ini deleted file mode 100644 index e0a2591e9..000000000 --- a/support/build/_conf/php/php.ini +++ /dev/null @@ -1,1900 +0,0 @@ -[PHP] - -;;;;;;;;;;;;;;;;;;; -; About php.ini ; -;;;;;;;;;;;;;;;;;;; -; PHP's initialization file, generally called php.ini, is responsible for -; configuring many of the aspects of PHP's behavior. - -; PHP attempts to find and load this configuration from a number of locations. -; The following is a summary of its search order: -; 1. SAPI module specific location. -; 2. The PHPRC environment variable. (As of PHP 5.2.0) -; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) -; 4. Current working directory (except CLI) -; 5. The web server's directory (for SAPI modules), or directory of PHP -; (otherwise in Windows) -; 6. The directory from the --with-config-file-path compile time option, or the -; Windows directory (C:\windows or C:\winnt) -; See the PHP docs for more specific information. -; http://php.net/configuration.file - -; The syntax of the file is extremely simple. Whitespace and Lines -; beginning with a semicolon are silently ignored (as you probably guessed). -; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. - -; Directives following the section heading [PATH=/www/mysite] only -; apply to PHP files in the /www/mysite directory. Directives -; following the section heading [HOST=www.example.com] only apply to -; PHP files served from www.example.com. Directives set in these -; special sections cannot be overridden by user-defined INI files or -; at runtime. Currently, [PATH=] and [HOST=] sections only work under -; CGI/FastCGI. -; http://php.net/ini.sections - -; Directives are specified using the following syntax: -; directive = value -; Directive names are *case sensitive* - foo=bar is different from FOO=bar. -; Directives are variables used to configure PHP or PHP extensions. -; There is no name validation. If PHP can't find an expected -; directive because it is not set or is mistyped, a default value will be used. - -; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one -; of the INI constants (On, Off, True, False, Yes, No and None) or an expression -; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a -; previously set variable or directive (e.g. ${foo}) - -; Expressions in the INI file are limited to bitwise operators and parentheses: -; | bitwise OR -; ^ bitwise XOR -; & bitwise AND -; ~ bitwise NOT -; ! boolean NOT - -; Boolean flags can be turned on using the values 1, On, True or Yes. -; They can be turned off using the values 0, Off, False or No. - -; An empty string can be denoted by simply not writing anything after the equal -; sign, or by using the None keyword: - -; foo = ; sets foo to an empty string -; foo = None ; sets foo to an empty string -; foo = "None" ; sets foo to the string 'None' - -; If you use constants in your value, and these constants belong to a -; dynamically loaded extension (either a PHP extension or a Zend extension), -; you may only use these constants *after* the line that loads the extension. - -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; PHP comes packaged with two INI files. One that is recommended to be used -; in production environments and one that is recommended to be used in -; development environments. - -; php.ini-production contains settings which hold security, performance and -; best practices at its core. But please be aware, these settings may break -; compatibility with older or less security conscience applications. We -; recommending using the production ini in production and testing environments. - -; php.ini-development is very similar to its production variant, except it's -; much more verbose when it comes to errors. We recommending using the -; development version only in development environments as errors shown to -; application users can inadvertently leak otherwise secure information. - -;;;;;;;;;;;;;;;;;;; -; Quick Reference ; -;;;;;;;;;;;;;;;;;;; -; The following are all the settings which are different in either the production -; or development versions of the INIs with respect to PHP's default behavior. -; Please see the actual settings later in the document for more details as to why -; we recommend these changes in PHP's behavior. - -; allow_call_time_pass_reference -; Default Value: On -; Development Value: Off -; Production Value: Off - -; display_errors -; Default Value: On -; Development Value: On -; Production Value: Off - -; display_startup_errors -; Default Value: Off -; Development Value: On -; Production Value: Off - -; error_reporting -; Default Value: E_ALL & ~E_NOTICE -; Development Value: E_ALL | E_STRICT -; Production Value: E_ALL & ~E_DEPRECATED - -; html_errors -; Default Value: On -; Development Value: On -; Production value: Off - -; log_errors -; Default Value: Off -; Development Value: On -; Production Value: On - -; magic_quotes_gpc -; Default Value: On -; Development Value: Off -; Production Value: Off - -; max_input_time -; Default Value: -1 (Unlimited) -; Development Value: 60 (60 seconds) -; Production Value: 60 (60 seconds) - -; output_buffering -; Default Value: Off -; Development Value: 4096 -; Production Value: 4096 - -; register_argc_argv -; Default Value: On -; Development Value: Off -; Production Value: Off - -; register_long_arrays -; Default Value: On -; Development Value: Off -; Production Value: Off - -; request_order -; Default Value: None -; Development Value: "GP" -; Production Value: "GP" - -; session.bug_compat_42 -; Default Value: On -; Development Value: On -; Production Value: Off - -; session.bug_compat_warn -; Default Value: On -; Development Value: On -; Production Value: Off - -; session.gc_divisor -; Default Value: 100 -; Development Value: 1000 -; Production Value: 1000 - -; session.hash_bits_per_character -; Default Value: 4 -; Development Value: 5 -; Production Value: 5 - -; short_open_tag -; Default Value: On -; Development Value: Off -; Production Value: Off - -; track_errors -; Default Value: Off -; Development Value: On -; Production Value: Off - -; url_rewriter.tags -; Default Value: "a=href,area=href,frame=src,form=,fieldset=" -; Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry" -; Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry" - -; variables_order -; Default Value: "EGPCS" -; Development Value: "GPCS" -; Production Value: "GPCS" - -;;;;;;;;;;;;;;;;;;;; -; php.ini Options ; -;;;;;;;;;;;;;;;;;;;; -; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini" -;user_ini.filename = ".user.ini" - -; To disable this feature set this option to empty value -;user_ini.filename = - -; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes) -user_ini.cache_ttl = 86400 - -;;;;;;;;;;;;;;;;;;;; -; Language Options ; -;;;;;;;;;;;;;;;;;;;; - -; Enable the PHP scripting language engine under Apache. -; http://php.net/engine -engine = On - -; This directive determines whether or not PHP will recognize code between -; tags as PHP source which should be processed as such. It's been -; recommended for several years that you not use the short tag "short cut" and -; instead to use the full tag combination. With the wide spread use -; of XML and use of these tags by other languages, the server can become easily -; confused and end up parsing the wrong code in the wrong context. But because -; this short cut has been a feature for such a long time, it's currently still -; supported for backwards compatibility, but we recommend you don't use them. -; Default Value: On -; Development Value: Off -; Production Value: Off -; http://php.net/short-open-tag -short_open_tag = On - -; Allow ASP-style <% %> tags. -; http://php.net/asp-tags -asp_tags = Off - -; The number of significant digits displayed in floating point numbers. -; http://php.net/precision -precision = 14 - -; Enforce year 2000 compliance (will cause problems with non-compliant browsers) -; http://php.net/y2k-compliance -y2k_compliance = On - -; Output buffering is a mechanism for controlling how much output data -; (excluding headers and cookies) PHP should keep internally before pushing that -; data to the client. If your application's output exceeds this setting, PHP -; will send that data in chunks of roughly the size you specify. -; Turning on this setting and managing its maximum buffer size can yield some -; interesting side-effects depending on your application and web server. -; You may be able to send headers and cookies after you've already sent output -; through print or echo. You also may see performance benefits if your server is -; emitting less packets due to buffered output versus PHP streaming the output -; as it gets it. On production servers, 4096 bytes is a good setting for performance -; reasons. -; Note: Output buffering can also be controlled via Output Buffering Control -; functions. -; Possible Values: -; On = Enabled and buffer is unlimited. (Use with caution) -; Off = Disabled -; Integer = Enables the buffer and sets its maximum size in bytes. -; Note: This directive is hardcoded to Off for the CLI SAPI -; Default Value: Off -; Development Value: 4096 -; Production Value: 4096 -; http://php.net/output-buffering -output_buffering = 4096 - -; You can redirect all of the output of your scripts to a function. For -; example, if you set output_handler to "mb_output_handler", character -; encoding will be transparently converted to the specified encoding. -; Setting any output handler automatically turns on output buffering. -; Note: People who wrote portable scripts should not depend on this ini -; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script -; is doing. -; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" -; and you cannot use both "ob_gzhandler" and "zlib.output_compression". -; Note: output_handler must be empty if this is set 'On' !!!! -; Instead you must use zlib.output_handler. -; http://php.net/output-handler -;output_handler = - -; Transparent output compression using the zlib library -; Valid values for this option are 'off', 'on', or a specific buffer size -; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better -; performance, enable output_buffering in addition. -; Note: You need to use zlib.output_handler instead of the standard -; output_handler, or otherwise the output will be corrupted. -; http://php.net/zlib.output-compression -zlib.output_compression = Off - -; http://php.net/zlib.output-compression-level -;zlib.output_compression_level = -1 - -; You cannot specify additional output handlers if zlib.output_compression -; is activated here. This setting does the same as output_handler but in -; a different order. -; http://php.net/zlib.output-handler -;zlib.output_handler = - -; Implicit flush tells PHP to tell the output layer to flush itself -; automatically after every output block. This is equivalent to calling the -; PHP function flush() after each and every call to print() or echo() and each -; and every HTML block. Turning this option on has serious performance -; implications and is generally recommended for debugging purposes only. -; http://php.net/implicit-flush -; Note: This directive is hardcoded to On for the CLI SAPI -implicit_flush = Off - -; The unserialize callback function will be called (with the undefined class' -; name as parameter), if the unserializer finds an undefined class -; which should be instantiated. A warning appears if the specified function is -; not defined, or if the function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a -; callback-function. -unserialize_callback_func = - -; When floats & doubles are serialized store serialize_precision significant -; digits after the floating point. The default value ensures that when floats -; are decoded with unserialize, the data will remain the same. -serialize_precision = 17 - -; This directive allows you to enable and disable warnings which PHP will issue -; if you pass a value by reference at function call time. Passing values by -; reference at function call time is a deprecated feature which will be removed -; from PHP at some point in the near future. The acceptable method for passing a -; value by reference to a function is by declaring the reference in the functions -; definition, not at call time. This directive does not disable this feature, it -; only determines whether PHP will warn you about it or not. These warnings -; should enabled in development environments only. -; Default Value: On (Suppress warnings) -; Development Value: Off (Issue warnings) -; Production Value: Off (Issue warnings) -; http://php.net/allow-call-time-pass-reference -allow_call_time_pass_reference = Off - -; Safe Mode -; http://php.net/safe-mode -safe_mode = Off - -; By default, Safe Mode does a UID compare check when -; opening files. If you want to relax this to a GID compare, -; then turn on safe_mode_gid. -; http://php.net/safe-mode-gid -safe_mode_gid = Off - -; When safe_mode is on, UID/GID checks are bypassed when -; including files from this directory and its subdirectories. -; (directory must also be in include_path or full path must -; be used when including) -; http://php.net/safe-mode-include-dir -safe_mode_include_dir = - -; When safe_mode is on, only executables located in the safe_mode_exec_dir -; will be allowed to be executed via the exec family of functions. -; http://php.net/safe-mode-exec-dir -safe_mode_exec_dir = - -; Setting certain environment variables may be a potential security breach. -; This directive contains a comma-delimited list of prefixes. In Safe Mode, -; the user may only alter environment variables whose names begin with the -; prefixes supplied here. By default, users will only be able to set -; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). -; Note: If this directive is empty, PHP will let the user modify ANY -; environment variable! -; http://php.net/safe-mode-allowed-env-vars -safe_mode_allowed_env_vars = PHP_ - -; This directive contains a comma-delimited list of environment variables that -; the end user won't be able to change using putenv(). These variables will be -; protected even if safe_mode_allowed_env_vars is set to allow to change them. -; http://php.net/safe-mode-protected-env-vars -safe_mode_protected_env_vars = LD_LIBRARY_PATH - -; open_basedir, if set, limits all file operations to the defined directory -; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -; http://php.net/open-basedir -;open_basedir = - -; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -; http://php.net/disable-functions -disable_functions = - -; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -; http://php.net/disable-classes -disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; would work. -; http://php.net/syntax-highlighting -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - -; If enabled, the request will be allowed to complete even if the user aborts -; the request. Consider enabling it if executing long requests, which may end up -; being interrupted by the user or a browser timing out. PHP's default behavior -; is to disable this feature. -; http://php.net/ignore-user-abort -;ignore_user_abort = On - -; Determines the size of the realpath cache to be used by PHP. This value should -; be increased on systems where PHP opens many files to reflect the quantity of -; the file operations performed. -; http://php.net/realpath-cache-size -;realpath_cache_size = 16k - -; Duration of time, in seconds for which to cache realpath information for a given -; file or directory. For systems with rarely changing files, consider increasing this -; value. -; http://php.net/realpath-cache-ttl -;realpath_cache_ttl = 120 - -;;;;;;;;;;;;;;;;; -; Miscellaneous ; -;;;;;;;;;;;;;;;;; - -; Decides whether PHP may expose the fact that it is installed on the server -; (e.g. by adding its signature to the Web server header). It is no security -; threat in any way, but it makes it possible to determine whether you use PHP -; on your server or not. -; http://php.net/expose-php -expose_php = Off - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - -; Maximum execution time of each script, in seconds -; http://php.net/max-execution-time -; Note: This directive is hardcoded to 0 for the CLI SAPI -max_execution_time = 30 - -; Maximum amount of time each script may spend parsing request data. It's a good -; idea to limit this time on productions servers in order to eliminate unexpectedly -; long running scripts. -; Note: This directive is hardcoded to -1 for the CLI SAPI -; Default Value: -1 (Unlimited) -; Development Value: 60 (60 seconds) -; Production Value: 60 (60 seconds) -; http://php.net/max-input-time -max_input_time = 60 - -; Maximum input variable nesting level -; http://php.net/max-input-nesting-level -;max_input_nesting_level = 64 - -; Maximum amount of memory a script may consume (128MB) -; http://php.net/memory-limit -memory_limit = 128M - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; This directive informs PHP of which errors, warnings and notices you would like -; it to take action for. The recommended way of setting values for this -; directive is through the use of the error level constants and bitwise -; operators. The error level constants are below here for convenience as well as -; some common settings and their meanings. -; By default, PHP is set to take action on all errors, notices and warnings EXCEPT -; those related to E_NOTICE and E_STRICT, which together cover best practices and -; recommended coding standards in PHP. For performance reasons, this is the -; recommend error reporting setting. Your production server shouldn't be wasting -; resources complaining about best practices and coding standards. That's what -; development servers and development settings are for. -; Note: The php.ini-development file has this setting as E_ALL | E_STRICT. This -; means it pretty much reports everything which is exactly what you want during -; development and early testing. -; -; Error Level Constants: -; E_ALL - All errors and warnings (includes E_STRICT as of PHP 6.0.0) -; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; E_DEPRECATED - warn about code that will not work in future versions -; of PHP -; E_USER_DEPRECATED - user-generated deprecation warnings -; -; Common Values: -; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.) -; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices) -; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) -; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.) -; Default Value: E_ALL & ~E_NOTICE -; Development Value: E_ALL | E_STRICT -; Production Value: E_ALL & ~E_DEPRECATED -; http://php.net/error-reporting -error_reporting = E_ALL & ~E_NOTICE - -; This directive controls whether or not and where PHP will output errors, -; notices and warnings too. Error output is very useful during development, but -; it could be very dangerous in production environments. Depending on the code -; which is triggering the error, sensitive information could potentially leak -; out of your application such as database usernames and passwords or worse. -; It's recommended that errors be logged on production servers rather than -; having the errors sent to STDOUT. -; Possible Values: -; Off = Do not display any errors -; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) -; On or stdout = Display errors to STDOUT -; Default Value: On -; Development Value: On -; Production Value: Off -; http://php.net/display-errors -display_errors = Off - -; The display of errors which occur during PHP's startup sequence are handled -; separately from display_errors. PHP's default behavior is to suppress those -; errors from clients. Turning the display of startup errors on can be useful in -; debugging configuration problems. But, it's strongly recommended that you -; leave this setting off on production servers. -; Default Value: Off -; Development Value: On -; Production Value: Off -; http://php.net/display-startup-errors -display_startup_errors = Off - -; Besides displaying errors, PHP can also log errors to locations such as a -; server-specific log, STDERR, or a location specified by the error_log -; directive found below. While errors should not be displayed on productions -; servers they should still be monitored and logging is a great way to do that. -; Default Value: Off -; Development Value: On -; Production Value: On -; http://php.net/log-errors -log_errors = On - -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -; http://php.net/log-errors-max-len -log_errors_max_len = 1024 - -; Do not log repeated messages. Repeated errors must occur in same file on same -; line unless ignore_repeated_source is set true. -; http://php.net/ignore-repeated-errors -ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; source lines. -; http://php.net/ignore-repeated-source -ignore_repeated_source = Off - -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -; http://php.net/report-memleaks -report_memleaks = On - -; This setting is on by default. -;report_zend_debug = 0 - -; Store the last error/warning message in $php_errormsg (boolean). Setting this value -; to On can assist in debugging and is appropriate for development servers. It should -; however be disabled on production servers. -; Default Value: Off -; Development Value: On -; Production Value: Off -; http://php.net/track-errors -track_errors = Off - -; Turn off normal error reporting and emit XML-RPC error XML -; http://php.net/xmlrpc-errors -;xmlrpc_errors = 0 - -; An XML-RPC faultCode -;xmlrpc_error_number = 0 - -; When PHP displays or logs an error, it has the capability of inserting html -; links to documentation related to that error. This directive controls whether -; those HTML links appear in error messages or not. For performance and security -; reasons, it's recommended you disable this on production servers. -; Note: This directive is hardcoded to Off for the CLI SAPI -; Default Value: On -; Development Value: On -; Production value: Off -; http://php.net/html-errors -html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct -; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://php.net/docs -; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including -; the dot. PHP's default behavior is to leave these settings empty. -; Note: Never use this feature for production boxes. -; http://php.net/docref-root -; Examples -;docref_root = "/phpmanual/" - -; http://php.net/docref-ext -;docref_ext = .html - -; String to output before an error message. PHP's default behavior is to leave -; this setting blank. -; http://php.net/error-prepend-string -; Example: -;error_prepend_string = "" - -; String to output after an error message. PHP's default behavior is to leave -; this setting blank. -; http://php.net/error-append-string -; Example: -;error_append_string = "" - -; Log errors to specified file. PHP's default behavior is to leave this value -; empty. -; http://php.net/error-log -; Example: -;error_log = php_errors.log -; Log errors to syslog (Event Log on NT, not valid in Windows 95). -;error_log = syslog - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; - -; The separator used in PHP generated URLs to separate arguments. -; PHP's default setting is "&". -; http://php.net/arg-separator.output -; Example: -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; PHP's default setting is "&". -; NOTE: Every character in this directive is considered as separator! -; http://php.net/arg-separator.input -; Example: -;arg_separator.input = ";&" - -; This directive determines which super global arrays are registered when PHP -; starts up. If the register_globals directive is enabled, it also determines -; what order variables are populated into the global space. G,P,C,E & S are -; abbreviations for the following respective super globals: GET, POST, COOKIE, -; ENV and SERVER. There is a performance penalty paid for the registration of -; these arrays and because ENV is not as commonly used as the others, ENV is -; is not recommended on productions servers. You can still get access to -; the environment variables through getenv() should you need to. -; Default Value: "EGPCS" -; Development Value: "GPCS" -; Production Value: "GPCS"; -; http://php.net/variables-order -variables_order = "EGPCS" - -; This directive determines which super global data (G,P,C,E & S) should -; be registered into the super global array REQUEST. If so, it also determines -; the order in which that data is registered. The values for this directive are -; specified in the same manner as the variables_order directive, EXCEPT one. -; Leaving this value empty will cause PHP to use the value set in the -; variables_order directive. It does not mean it will leave the super globals -; array REQUEST empty. -; Default Value: None -; Development Value: "GP" -; Production Value: "GP" -; http://php.net/request-order -request_order = "GP" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -; http://php.net/register-globals -register_globals = Off - -; Determines whether the deprecated long $HTTP_*_VARS type predefined variables -; are registered by PHP or not. As they are deprecated, we obviously don't -; recommend you use them. They are on by default for compatibility reasons but -; they are not recommended on production servers. -; Default Value: On -; Development Value: Off -; Production Value: Off -; http://php.net/register-long-arrays -register_long_arrays = Off - -; This directive determines whether PHP registers $argv & $argc each time it -; runs. $argv contains an array of all the arguments passed to PHP when a script -; is invoked. $argc contains an integer representing the number of arguments -; that were passed when the script was invoked. These arrays are extremely -; useful when running scripts from the command line. When this directive is -; enabled, registering these variables consumes CPU cycles and memory each time -; a script is executed. For performance reasons, this feature should be disabled -; on production servers. -; Note: This directive is hardcoded to On for the CLI SAPI -; Default Value: On -; Development Value: Off -; Production Value: Off -; http://php.net/register-argc-argv -register_argc_argv = Off - -; When enabled, the SERVER and ENV variables are created when they're first -; used (Just In Time) instead of when the script starts. If these variables -; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. -; http://php.net/auto-globals-jit -auto_globals_jit = On - -; Maximum size of POST data that PHP will accept. -; http://php.net/post-max-size -post_max_size = 8M - -; Magic quotes are a preprocessing feature of PHP where PHP will attempt to -; escape any character sequences in GET, POST, COOKIE and ENV data which might -; otherwise corrupt data being placed in resources such as databases before -; making that data available to you. Because of character encoding issues and -; non-standard SQL implementations across many databases, it's not currently -; possible for this feature to be 100% accurate. PHP's default behavior is to -; enable the feature. We strongly recommend you use the escaping mechanisms -; designed specifically for the database your using instead of relying on this -; feature. Also note, this feature has been deprecated as of PHP 5.3.0 and is -; scheduled for removal in PHP 6. -; Default Value: On -; Development Value: Off -; Production Value: Off -; http://php.net/magic-quotes-gpc -magic_quotes_gpc = Off - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -; http://php.net/magic-quotes-runtime -magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). -; http://php.net/magic-quotes-sybase -magic_quotes_sybase = Off - -; Automatically add files before PHP document. -; http://php.net/auto-prepend-file -auto_prepend_file = - -; Automatically add files after PHP document. -; http://php.net/auto-append-file -auto_append_file = - -; By default, PHP will output a character encoding using -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html -; http://php.net/default-mimetype -default_mimetype = "text/html" - -; PHP's default character set is set to empty. -; http://php.net/default-charset -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is -; to disable this feature. -; http://php.net/always-populate-raw-post-data -;always_populate_raw_post_data = On - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -; -; Windows: "\path1;\path2" -;include_path = ".;c:\php\includes" -; -; PHP's default setting for include_path is ".;/path/to/php/pear" -; http://php.net/include-path - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -; http://php.net/doc-root -doc_root = - -; The directory under which PHP opens the script using /~username used only -; if nonempty. -; http://php.net/user-dir -user_dir = - -; Directory in which the loadable extensions (modules) reside. -; http://php.net/extension-dir -; extension_dir = "./" -; On windows: -; extension_dir = "ext" - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. -; http://php.net/enable-dl -enable_dl = Off - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **You CAN safely turn this off for IIS, in fact, you MUST.** -; http://php.net/cgi.force-redirect -;cgi.force_redirect = 1 - -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with -; every request. PHP's default behavior is to disable this feature. -;cgi.nph = 1 - -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP -; will look for to know it is OK to continue execution. Setting this variable MAY -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = ; - -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok -; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting -; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting -; of zero causes PHP to behave as before. Default is 1. You should fix your scripts -; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. -; http://php.net/cgi.fix-pathinfo -;cgi.fix_pathinfo=1 - -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate -; security tokens of the calling client. This allows IIS to define the -; security context that the request runs under. mod_fastcgi under Apache -; does not currently support this feature (03/17/2002) -; Set to 1 if running under IIS. Default is zero. -; http://php.net/fastcgi.impersonate -;fastcgi.impersonate = 1; - -; Disable logging through FastCGI connection. PHP's default behavior is to enable -; this feature. -;fastcgi.logging = 0 - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that -; is supported by Apache. When this option is set to 1 PHP will send -; RFC2616 compliant header. -; Default is zero. -; http://php.net/cgi.rfc2616-headers -;cgi.rfc2616_headers = 0 - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. -; http://php.net/file-uploads -file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). -; http://php.net/upload-tmp-dir -;upload_tmp_dir = - -; Maximum allowed size for uploaded files. -; http://php.net/upload-max-filesize -upload_max_filesize = 2M - -; Maximum number of files that can be uploaded via a single request -max_file_uploads = 20 - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -; http://php.net/allow-url-fopen -allow_url_fopen = On - -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -; http://php.net/allow-url-include -allow_url_include = Off - -; Define the anonymous ftp password (your email address). PHP's default setting -; for this is empty. -; http://php.net/from -;from="john@doe.com" - -; Define the User-Agent string. PHP's default setting for this is empty. -; http://php.net/user-agent -;user_agent="PHP" - -; Default timeout for socket based streams (seconds) -; http://php.net/default-socket-timeout -default_socket_timeout = 60 - -; If your scripts have to deal with files from Macintosh systems, -; or you are running on a Mac and need to deal with files from -; unix or win32 systems, setting this flag will cause PHP to -; automatically detect the EOL character in those files so that -; fgets() and file() will work regardless of the source of the file. -; http://php.net/auto-detect-line-endings -;auto_detect_line_endings = Off - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; - -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example, on Windows: -; -; extension=msql.dll -; -; ... or under UNIX: -; -; extension=msql.so -; -; ... or with a path: -; -; extension=/path/to/extension/msql.so -; -; If you only provide the name of the extension, PHP will look for it in its -; default extension directory. -; -; Windows Extensions -; Note that ODBC support is built in, so no dll is needed for it. -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) -; extension folders as well as the separate PECL DLL download (PHP 5). -; Be sure to appropriately set the extension_dir directive. -; -;extension=php_bz2.dll -;extension=php_curl.dll -;extension=php_fileinfo.dll -;extension=php_gd2.dll -;extension=php_gettext.dll -;extension=php_gmp.dll -;extension=php_intl.dll -;extension=php_imap.dll -;extension=php_interbase.dll -;extension=php_ldap.dll -;extension=php_mbstring.dll -;extension=php_exif.dll ; Must be after mbstring as it depends on it -;extension=php_mysql.dll -;extension=php_mysqli.dll -;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client -;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_odbc.dll -;extension=php_pdo_pgsql.dll -;extension=php_pdo_sqlite.dll -;extension=php_pgsql.dll -;extension=php_pspell.dll -;extension=php_shmop.dll - -; The MIBS data available in the PHP distribution must be installed. -; See http://www.php.net/manual/en/snmp.installation.php -;extension=php_snmp.dll - -;extension=php_soap.dll -;extension=php_sockets.dll -;extension=php_sqlite.dll -;extension=php_sqlite3.dll -;extension=php_sybase_ct.dll -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll -;extension=php_zip.dll - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - -[Date] -; Defines the default timezone used by the date functions -; http://php.net/date.timezone -date.timezone = UTC - -; http://php.net/date.default-latitude -;date.default_latitude = 31.7667 - -; http://php.net/date.default-longitude -;date.default_longitude = 35.2333 - -; http://php.net/date.sunrise-zenith -;date.sunrise_zenith = 90.583333 - -; http://php.net/date.sunset-zenith -;date.sunset_zenith = 90.583333 - -[filter] -; http://php.net/filter.default -;filter.default = unsafe_raw - -; http://php.net/filter.default-flags -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[intl] -;intl.default_locale = -; This directive allows you to produce PHP errors when some error -; happens within intl functions. The value is the level of the error produced. -; Default is 0, which does not produce any errors. -;intl.error_level = E_WARNING - -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - -[sqlite3] -;sqlite3.extension_dir = - -[Pcre] -;PCRE library backtracking limit. -; http://php.net/pcre.backtrack-limit -;pcre.backtrack_limit=100000 - -;PCRE library recursion limit. -;Please note that if you set this value to a high number you may consume all -;the available process stack and eventually crash PHP (due to reaching the -;stack size limit imposed by the Operating System). -; http://php.net/pcre.recursion-limit -;pcre.recursion_limit=100000 - -[Pdo] -; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" -; http://php.net/pdo-odbc.connection-pooling -;pdo_odbc.connection_pooling=strict - -;pdo_odbc.db2_instance_name - -[Pdo_mysql] -; If mysqlnd is used: Number of cache slots for the internal result set cache -; http://php.net/pdo_mysql.cache_size -pdo_mysql.cache_size = 2000 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -; http://php.net/pdo_mysql.default-socket -pdo_mysql.default_socket= - -[Phar] -; http://php.net/phar.readonly -;phar.readonly = On - -; http://php.net/phar.require-hash -;phar.require_hash = On - -;phar.cache_list = - -[Syslog] -; Whether or not to define the various syslog variables (e.g. $LOG_PID, -; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -; runtime, you can define these variables by calling define_syslog_variables(). -; http://php.net/define-syslog-variables -define_syslog_variables = Off - -[mail function] -; For Win32 only. -; http://php.net/smtp -SMTP = localhost -; http://php.net/smtp-port -smtp_port = 25 - -; For Win32 only. -; http://php.net/sendmail-from -;sendmail_from = me@example.com - -; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -; http://php.net/sendmail-path -;sendmail_path = - -; Force the addition of the specified parameters to be passed as extra parameters -; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. -;mail.force_extra_parameters = - -; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename -mail.add_x_header = On - -; The path to a log file that will log all mail() calls. Log entries include -; the full path of the script, line number, To address and headers. -;mail.log = - -[SQL] -; http://php.net/sql.safe-mode -sql.safe_mode = Off - -[ODBC] -; http://php.net/odbc.default-db -;odbc.default_db = Not yet implemented - -; http://php.net/odbc.default-user -;odbc.default_user = Not yet implemented - -; http://php.net/odbc.default-pw -;odbc.default_pw = Not yet implemented - -; Controls the ODBC cursor model. -; Default: SQL_CURSOR_STATIC (default). -;odbc.default_cursortype - -; Allow or prevent persistent links. -; http://php.net/odbc.allow-persistent -odbc.allow_persistent = On - -; Check that a connection is still valid before reuse. -; http://php.net/odbc.check-persistent -odbc.check_persistent = On - -; Maximum number of persistent links. -1 means no limit. -; http://php.net/odbc.max-persistent -odbc.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -; http://php.net/odbc.max-links -odbc.max_links = -1 - -; Handling of LONG fields. Returns number of bytes to variables. 0 means -; passthru. -; http://php.net/odbc.defaultlrl -odbc.defaultlrl = 4096 - -; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. -; See the documentation on odbc_binmode and odbc_longreadlen for an explanation -; of odbc.defaultlrl and odbc.defaultbinmode -; http://php.net/odbc.defaultbinmode -odbc.defaultbinmode = 1 - -;birdstep.max_links = -1 - -[Interbase] -; Allow or prevent persistent links. -ibase.allow_persistent = 1 - -; Maximum number of persistent links. -1 means no limit. -ibase.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -ibase.max_links = -1 - -; Default database name for ibase_connect(). -;ibase.default_db = - -; Default username for ibase_connect(). -;ibase.default_user = - -; Default password for ibase_connect(). -;ibase.default_password = - -; Default charset for ibase_connect(). -;ibase.default_charset = - -; Default timestamp format. -ibase.timestampformat = "%Y-%m-%d %H:%M:%S" - -; Default date format. -ibase.dateformat = "%Y-%m-%d" - -; Default time format. -ibase.timeformat = "%H:%M:%S" - -[MySQL] -; Allow accessing, from PHP's perspective, local files with LOAD DATA statements -; http://php.net/mysql.allow_local_infile -mysql.allow_local_infile = On - -; Allow or prevent persistent links. -; http://php.net/mysql.allow-persistent -mysql.allow_persistent = On - -; If mysqlnd is used: Number of cache slots for the internal result set cache -; http://php.net/mysql.cache_size -mysql.cache_size = 2000 - -; Maximum number of persistent links. -1 means no limit. -; http://php.net/mysql.max-persistent -mysql.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -; http://php.net/mysql.max-links -mysql.max_links = -1 - -; Default port number for mysql_connect(). If unset, mysql_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -; http://php.net/mysql.default-port -mysql.default_port = - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -; http://php.net/mysql.default-socket -mysql.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -; http://php.net/mysql.default-host -mysql.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -; http://php.net/mysql.default-user -mysql.default_user = - -; Default password for mysql_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -; http://php.net/mysql.default-password -mysql.default_password = - -; Maximum time (in seconds) for connect timeout. -1 means no limit -; http://php.net/mysql.connect-timeout -mysql.connect_timeout = 60 - -; Trace mode. When trace_mode is active (=On), warnings for table/index scans and -; SQL-Errors will be displayed. -; http://php.net/mysql.trace-mode -mysql.trace_mode = Off - -[MySQLi] - -; Maximum number of persistent links. -1 means no limit. -; http://php.net/mysqli.max-persistent -mysqli.max_persistent = -1 - -; Allow accessing, from PHP's perspective, local files with LOAD DATA statements -; http://php.net/mysqli.allow_local_infile -;mysqli.allow_local_infile = On - -; Allow or prevent persistent links. -; http://php.net/mysqli.allow-persistent -mysqli.allow_persistent = On - -; Maximum number of links. -1 means no limit. -; http://php.net/mysqli.max-links -mysqli.max_links = -1 - -; If mysqlnd is used: Number of cache slots for the internal result set cache -; http://php.net/mysqli.cache_size -mysqli.cache_size = 2000 - -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -; http://php.net/mysqli.default-port -mysqli.default_port = 3306 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -; http://php.net/mysqli.default-socket -mysqli.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -; http://php.net/mysqli.default-host -mysqli.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -; http://php.net/mysqli.default-user -mysqli.default_user = - -; Default password for mysqli_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -; http://php.net/mysqli.default-pw -mysqli.default_pw = - -; Allow or prevent reconnect -mysqli.reconnect = Off - -[mysqlnd] -; Enable / Disable collection of general statstics by mysqlnd which can be -; used to tune and monitor MySQL operations. -; http://php.net/mysqlnd.collect_statistics -mysqlnd.collect_statistics = On - -; Enable / Disable collection of memory usage statstics by mysqlnd which can be -; used to tune and monitor MySQL operations. -; http://php.net/mysqlnd.collect_memory_statistics -mysqlnd.collect_memory_statistics = Off - -; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. -; http://php.net/mysqlnd.net_cmd_buffer_size -;mysqlnd.net_cmd_buffer_size = 2048 - -; Size of a pre-allocated buffer used for reading data sent by the server in -; bytes. -; http://php.net/mysqlnd.net_read_buffer_size -;mysqlnd.net_read_buffer_size = 32768 - -[OCI8] - -; Connection: Enables privileged connections using external -; credentials (OCI_SYSOPER, OCI_SYSDBA) -; http://php.net/oci8.privileged-connect -;oci8.privileged_connect = Off - -; Connection: The maximum number of persistent OCI8 connections per -; process. Using -1 means no limit. -; http://php.net/oci8.max-persistent -;oci8.max_persistent = -1 - -; Connection: The maximum number of seconds a process is allowed to -; maintain an idle persistent connection. Using -1 means idle -; persistent connections will be maintained forever. -; http://php.net/oci8.persistent-timeout -;oci8.persistent_timeout = -1 - -; Connection: The number of seconds that must pass before issuing a -; ping during oci_pconnect() to check the connection validity. When -; set to 0, each oci_pconnect() will cause a ping. Using -1 disables -; pings completely. -; http://php.net/oci8.ping-interval -;oci8.ping_interval = 60 - -; Connection: Set this to a user chosen connection class to be used -; for all pooled server requests with Oracle 11g Database Resident -; Connection Pooling (DRCP). To use DRCP, this value should be set to -; the same string for all web servers running the same application, -; the database pool must be configured, and the connection string must -; specify to use a pooled server. -;oci8.connection_class = - -; High Availability: Using On lets PHP receive Fast Application -; Notification (FAN) events generated when a database node fails. The -; database must also be configured to post FAN events. -;oci8.events = Off - -; Tuning: This option enables statement caching, and specifies how -; many statements to cache. Using 0 disables statement caching. -; http://php.net/oci8.statement-cache-size -;oci8.statement_cache_size = 20 - -; Tuning: Enables statement prefetching and sets the default number of -; rows that will be fetched automatically after statement execution. -; http://php.net/oci8.default-prefetch -;oci8.default_prefetch = 100 - -; Compatibility. Using On means oci_close() will not close -; oci_connect() and oci_new_connect() connections. -; http://php.net/oci8.old-oci-close-semantics -;oci8.old_oci_close_semantics = Off - -[PostgresSQL] -; Allow or prevent persistent links. -; http://php.net/pgsql.allow-persistent -pgsql.allow_persistent = On - -; Detect broken persistent links always with pg_pconnect(). -; Auto reset feature requires a little overheads. -; http://php.net/pgsql.auto-reset-persistent -pgsql.auto_reset_persistent = Off - -; Maximum number of persistent links. -1 means no limit. -; http://php.net/pgsql.max-persistent -pgsql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -; http://php.net/pgsql.max-links -pgsql.max_links = -1 - -; Ignore PostgreSQL backends Notice message or not. -; Notice message logging require a little overheads. -; http://php.net/pgsql.ignore-notice -pgsql.ignore_notice = 0 - -; Log PostgreSQL backends Notice message or not. -; Unless pgsql.ignore_notice=0, module cannot log notice message. -; http://php.net/pgsql.log-notice -pgsql.log_notice = 0 - -[Sybase-CT] -; Allow or prevent persistent links. -; http://php.net/sybct.allow-persistent -sybct.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -; http://php.net/sybct.max-persistent -sybct.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -; http://php.net/sybct.max-links -sybct.max_links = -1 - -; Minimum server message severity to display. -; http://php.net/sybct.min-server-severity -sybct.min_server_severity = 10 - -; Minimum client message severity to display. -; http://php.net/sybct.min-client-severity -sybct.min_client_severity = 10 - -; Set per-context timeout -; http://php.net/sybct.timeout -;sybct.timeout= - -;sybct.packet_size - -; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. -; Default: one minute -;sybct.login_timeout= - -; The name of the host you claim to be connecting from, for display by sp_who. -; Default: none -;sybct.hostname= - -; Allows you to define how often deadlocks are to be retried. -1 means "forever". -; Default: 0 -;sybct.deadlock_retry_count= - -[bcmath] -; Number of decimal digits for all bcmath functions. -; http://php.net/bcmath.scale -bcmath.scale = 0 - -[browscap] -; http://php.net/browscap -;browscap = extra/browscap.ini - -[Session] -; Handler used to store/retrieve data. -; http://php.net/session.save-handler -session.save_handler = files - -; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. Note: Windows users have to change this -; variable in order to use PHP's session functions. -; -; The path can be defined as: -; -; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. -; http://php.net/session.save-path -;session.save_path = "/tmp" - -; Whether to use cookies. -; http://php.net/session.use-cookies -session.use_cookies = 1 - -; http://php.net/session.cookie-secure -;session.cookie_secure = - -; This option forces PHP to fetch and use a cookie for storing and maintaining -; the session id. We encourage this operation as it's very helpful in combatting -; session hijacking when not specifying and managing your own session id. It is -; not the end all be all of session hijacking defense, but it's a good start. -; http://php.net/session.use-only-cookies -session.use_only_cookies = 1 - -; Name of the session (used as cookie name). -; http://php.net/session.name -session.name = PHPSESSID - -; Initialize session on request startup. -; http://php.net/session.auto-start -session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. -; http://php.net/session.cookie-lifetime -session.cookie_lifetime = 0 - -; The path for which the cookie is valid. -; http://php.net/session.cookie-path -session.cookie_path = / - -; The domain for which the cookie is valid. -; http://php.net/session.cookie-domain -session.cookie_domain = - -; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -; http://php.net/session.cookie-httponly -session.cookie_httponly = - -; Handler used to serialize data. php is the standard serializer of PHP. -; http://php.net/session.serialize-handler -session.serialize_handler = php - -; Defines the probability that the 'garbage collection' process is started -; on every session initialization. The probability is calculated by using -; gc_probability/gc_divisor. Where session.gc_probability is the numerator -; and gc_divisor is the denominator in the equation. Setting this value to 1 -; when the session.gc_divisor value is 100 will give you approximately a 1% chance -; the gc will run on any give request. -; Default Value: 1 -; Development Value: 1 -; Production Value: 1 -; http://php.net/session.gc-probability -session.gc_probability = 1 - -; Defines the probability that the 'garbage collection' process is started on every -; session initialization. The probability is calculated by using the following equation: -; gc_probability/gc_divisor. Where session.gc_probability is the numerator and -; session.gc_divisor is the denominator in the equation. Setting this value to 1 -; when the session.gc_divisor value is 100 will give you approximately a 1% chance -; the gc will run on any give request. Increasing this value to 1000 will give you -; a 0.1% chance the gc will run on any give request. For high volume production servers, -; this is a more efficient approach. -; Default Value: 100 -; Development Value: 1000 -; Production Value: 1000 -; http://php.net/session.gc-divisor -session.gc_divisor = 1000 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. -; http://php.net/session.gc-maxlifetime -session.gc_maxlifetime = 1440 - -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; find /path/to/sessions -cmin +24 | xargs rm - -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope, even when register_globals -; is disabled. PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. This feature -; introduces some serious security problems if not handled correctly. It's -; recommended that you do not use this feature on production servers. But you -; should enable this on development servers and enable the warning as well. If you -; do not enable the feature on development servers, you won't be warned when it's -; used and debugging errors caused by this can be difficult to track down. -; Default Value: On -; Development Value: On -; Production Value: Off -; http://php.net/session.bug-compat-42 -session.bug_compat_42 = Off - -; This setting controls whether or not you are warned by PHP when initializing a -; session value into the global space. session.bug_compat_42 must be enabled before -; these warnings can be issued by PHP. See the directive above for more information. -; Default Value: On -; Development Value: On -; Production Value: Off -; http://php.net/session.bug-compat-warn -session.bug_compat_warn = Off - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. -; http://php.net/session.referer-check -session.referer_check = - -; How many bytes to read from the file. -; http://php.net/session.entropy-length -session.entropy_length = 0 - -; Specified here to create the session id. -; http://php.net/session.entropy-file -; On systems that don't have /dev/urandom /dev/arandom can be used -; On windows, setting the entropy_length setting will activate the -; Windows random source (using the CryptoAPI) -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public,} to determine HTTP caching aspects -; or leave this empty to avoid sending anti-caching headers. -; http://php.net/session.cache-limiter -session.cache_limiter = nocache - -; Document expires after n minutes. -; http://php.net/session.cache-expire -session.cache_expire = 180 - -; trans sid support is disabled by default. -; Use of trans sid may risk your users security. -; Use this option with caution. -; - User may send URL contains active session ID -; to other person via. email/irc/etc. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. -; http://php.net/session.use-trans-sid -session.use_trans_sid = 0 - -; Select a hash function for use in generating session ids. -; Possible Values -; 0 (MD5 128 bits) -; 1 (SHA-1 160 bits) -; This option may also be set to the name of any hash function supported by -; the hash extension. A list of available hashes is returned by the hash_algos() -; function. -; http://php.net/session.hash-function -session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; Possible values: -; 4 (4 bits: 0-9, a-f) -; 5 (5 bits: 0-9, a-v) -; 6 (6 bits: 0-9, a-z, A-Z, "-", ",") -; Default Value: 4 -; Development Value: 5 -; Production Value: 5 -; http://php.net/session.hash-bits-per-character -session.hash_bits_per_character = 5 - -; The URL rewriter will look for URLs in a defined set of HTML tags. -; form/fieldset are special; if you include them here, the rewriter will -; add a hidden field with the info which is otherwise appended -; to URLs. If you want XHTML conformity, remove the form entry. -; Note that all valid entries require a "=", even if no value follows. -; Default Value: "a=href,area=href,frame=src,form=,fieldset=" -; Development Value: "a=href,area=href,frame=src,input=src,form=fakeentry" -; Production Value: "a=href,area=href,frame=src,input=src,form=fakeentry" -; http://php.net/url-rewriter.tags -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -[MSSQL] -; Allow or prevent persistent links. -mssql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mssql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -mssql.max_links = -1 - -; Minimum error severity to display. -mssql.min_error_severity = 10 - -; Minimum message severity to display. -mssql.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off - -; Connect timeout -;mssql.connect_timeout = 5 - -; Query timeout -;mssql.timeout = 60 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textlimit = 4096 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textsize = 4096 - -; Limits the number of records in each batch. 0 = all records in one batch. -;mssql.batchsize = 0 - -; Specify how datetime and datetim4 columns are returned -; On => Returns data converted to SQL server settings -; Off => Returns values as YYYY-MM-DD hh:mm:ss -;mssql.datetimeconvert = On - -; Use NT authentication when connecting to the server -mssql.secure_connection = Off - -; Specify max number of processes. -1 = library default -; msdlib defaults to 25 -; FreeTDS defaults to 4096 -;mssql.max_procs = -1 - -; Specify client character set. -; If empty or not set the client charset from freetds.comf is used -; This is only used when compiled with FreeTDS -;mssql.charset = "ISO-8859-1" - -[Assertion] -; Assert(expr); active by default. -; http://php.net/assert.active -;assert.active = On - -; Issue a PHP warning for each failed assertion. -; http://php.net/assert.warning -;assert.warning = On - -; Don't bail out by default. -; http://php.net/assert.bail -;assert.bail = Off - -; User-function to be called if an assertion fails. -; http://php.net/assert.callback -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -; http://php.net/assert.quiet-eval -;assert.quiet_eval = 0 - -[COM] -; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -; http://php.net/com.typelib-file -;com.typelib_file = - -; allow Distributed-COM calls -; http://php.net/com.allow-dcom -;com.allow_dcom = true - -; autoregister constants of a components typlib on com_load() -; http://php.net/com.autoregister-typelib -;com.autoregister_typelib = true - -; register constants casesensitive -; http://php.net/com.autoregister-casesensitive -;com.autoregister_casesensitive = false - -; show warnings on duplicate constant registrations -; http://php.net/com.autoregister-verbose -;com.autoregister_verbose = true - -; The default character set code-page to use when passing strings to and from COM objects. -; Default: system ANSI code page -;com.code_page= - -[mbstring] -; language for internal character representation. -; http://php.net/mbstring.language -;mbstring.language = Japanese - -; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) -; http://php.net/mbstring.internal-encoding -;mbstring.internal_encoding = EUC-JP - -; http input encoding. -; http://php.net/mbstring.http-input -;mbstring.http_input = auto - -; http output encoding. mb_output_handler must be -; registered as output buffer to function -; http://php.net/mbstring.http-output -;mbstring.http_output = SJIS - -; enable automatic encoding translation according to -; mbstring.internal_encoding setting. Input chars are -; converted to internal encoding by setting this to On. -; Note: Do _not_ use automatic encoding translation for -; portable libs/applications. -; http://php.net/mbstring.encoding-translation -;mbstring.encoding_translation = Off - -; automatic encoding detection order. -; auto means -; http://php.net/mbstring.detect-order -;mbstring.detect_order = auto - -; substitute_character used when character cannot be converted -; one from another -; http://php.net/mbstring.substitute-character -;mbstring.substitute_character = none; - -; overload(replace) single byte functions by mbstring functions. -; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), -; etc. Possible values are 0,1,2,4 or combination of them. -; For example, 7 for overload everything. -; 0: No overload -; 1: Overload mail() function -; 2: Overload str*() functions -; 4: Overload ereg*() functions -; http://php.net/mbstring.func-overload -;mbstring.func_overload = 0 - -; enable strict encoding detection. -;mbstring.strict_detection = Off - -; This directive specifies the regex pattern of content types for which mb_output_handler() -; is activated. -; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) -;mbstring.http_output_conv_mimetype= - -; Allows to set script encoding. Only affects if PHP is compiled with --enable-zend-multibyte -; Default: "" -;mbstring.script_encoding= - -[gd] -; Tell the jpeg decode to ignore warnings and try to create -; a gd image. The warning will then be displayed as notices -; disabled by default -; http://php.net/gd.jpeg-ignore-warning -;gd.jpeg_ignore_warning = 0 - -[exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. -; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and -; intel byte order. A decode setting cannot be empty. -; http://php.net/exif.encode-unicode -;exif.encode_unicode = ISO-8859-15 - -; http://php.net/exif.decode-unicode-motorola -;exif.decode_unicode_motorola = UCS-2BE - -; http://php.net/exif.decode-unicode-intel -;exif.decode_unicode_intel = UCS-2LE - -; http://php.net/exif.encode-jis -;exif.encode_jis = - -; http://php.net/exif.decode-jis-motorola -;exif.decode_jis_motorola = JIS - -; http://php.net/exif.decode-jis-intel -;exif.decode_jis_intel = JIS - -[Tidy] -; The path to a default tidy configuration file to use when using tidy -; http://php.net/tidy.default-config -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -; http://php.net/tidy.clean-output -tidy.clean_output = Off - -[soap] -; Enables or disables WSDL caching feature. -; http://php.net/soap.wsdl-cache-enabled -soap.wsdl_cache_enabled=1 - -; Sets the directory name where SOAP extension will put cache files. -; http://php.net/soap.wsdl-cache-dir -soap.wsdl_cache_dir="/tmp" - -; (time to live) Sets the number of second while cached file will be used -; instead of original one. -; http://php.net/soap.wsdl-cache-ttl -soap.wsdl_cache_ttl=86400 - -; Sets the size of the cache limit. (Max. number of WSDL files to cache) -soap.wsdl_cache_limit = 5 - -[sysvshm] -; A default size of the shared memory segment -;sysvshm.init_mem = 10000 - -[ldap] -; Sets the maximum number of open links or -1 for unlimited. -ldap.max_links = -1 - -[mcrypt] -; For more information about mcrypt settings see http://php.net/mcrypt-module-open - -; Directory where to load mcrypt algorithms -; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) -;mcrypt.algorithms_dir= - -; Directory where to load mcrypt modes -; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) -;mcrypt.modes_dir= - -[dba] -;dba.default_handler= - -; Local Variables: -; tab-width: 4 -; End: diff --git a/support/build/php b/support/build/php index 8d3f6a299..efbe1550b 100755 --- a/support/build/php +++ b/support/build/php @@ -202,6 +202,9 @@ MANIFEST_EXTRA="${MANIFEST_EXTRA:-"$extra"}" # remove temporary ini file that enables all extensions, and the composer download rm ${OUT_PREFIX}/etc/php/php.ini composer.phar +# we begin with PHP's recommended production config as the default +cp ${dep_dirname}/php.ini-production ${OUT_PREFIX}/etc/php/php.ini +# next, include any more specific config files that we have created IFS='.' read -r -a version <<< "$dep_version" # read the parts of $dep_version into an array, e.g. (7 2 33) # iterate over version parts so we try "" (from index 0) first, then "7", then "7/2/", then "7/2/11" for a version "7.2.11" # in each case, we copy anything that's in that directory; more specific version configs will this overwrite less specific ones diff --git a/test/spec/php_shared.rb b/test/spec/php_shared.rb index 945dc0352..831b6811f 100644 --- a/test/spec/php_shared.rb +++ b/test/spec/php_shared.rb @@ -2,16 +2,34 @@ shared_examples "A PHP application with a composer.json" do |series| context "requiring PHP #{series}" do - let(:app) { - new_app_with_stack_and_platrepo('test/fixtures/default', + before(:all) do + @app = new_app_with_stack_and_platrepo('test/fixtures/default', before_deploy: -> { system("composer require --quiet --no-update php '#{series}.*' && composer update --quiet --ignore-platform-reqs") or raise "Failed to require PHP version" } ) - } + @app.deploy + # so we don't have to worry about overlapping dynos causing test failures because only one free is allowed at a time + @app.api_rate_limit.call.formation.update(@app.name, "web", {"size" => "Standard-1X"}) + end + + after(:all) do + # scale back down when we're done + # we should do this, because teardown! doesn't remove the app unless we're over the app limit + @app.api_rate_limit.call.formation.update(@app.name, "web", {"size" => "free"}) + @app.teardown! + end + it "picks a version from the desired series" do - app.deploy do |app| - expect(app.output).to match(/- php \(#{Regexp.escape(series)}\./) - expect(app.run('php -v')).to match(/#{Regexp.escape(series)}\./) - end + expect(@app.output).to match(/- php \(#{Regexp.escape(series)}\./) + expect(@app.run('php -v')).to match(/#{Regexp.escape(series)}\./) + end + + it "has Heroku php.ini defaults" do + ini_output = @app.run('php -i') + expect(ini_output).to match(/date.timezone => UTC/) + .and match(/error_reporting => 30719/) + .and match(/expose_php => Off/) + .and match(/user_ini.cache_ttl => 86400/) + .and match(/variables_order => EGPCS/) end end From 865691e837b8f14a0b69aca8692d5d1f8d474f34 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 30 May 2019 22:35:48 +0200 Subject: [PATCH 321/553] v156 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e40723167..3f8cca600 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v156 (2019-05-??) +## v156 (2019-05-30) ### ADD From 453d865336e1e2c929e7ce22ce06e2a2fb977003 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 5 Jun 2019 17:28:05 +0200 Subject: [PATCH 322/553] ext-mongodb/1.5.4 --- CHANGELOG.md | 6 ++++++ .../{mongodb-1.5.3 => mongodb-1.5.4} | 0 .../{mongodb-1.5.3 => mongodb-1.5.4} | 0 .../{mongodb-1.5.3 => mongodb-1.5.4} | 0 .../{mongodb-1.5.3 => mongodb-1.5.4} | 0 .../{mongodb-1.5.3 => mongodb-1.5.4} | 0 .../{mongodb-1.5.3 => mongodb-1.5.4} | 0 7 files changed, 6 insertions(+) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.5.3 => mongodb-1.5.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.5.3 => mongodb-1.5.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.5.3 => mongodb-1.5.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.5.3 => mongodb-1.5.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.5.3 => mongodb-1.5.4} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{mongodb-1.5.3 => mongodb-1.5.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f8cca600..868b97513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v157 (2019-06-??) + +### ADD + +- ext-mongodb/1.5.4 [David Zuelke] + ## v156 (2019-05-30) ### ADD diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.3 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.3 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.3 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.3 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.3 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.4 diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.3 rename to support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.4 From ca2aead24718dba02565e751ac4362c32957efa9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 5 Jun 2019 17:28:52 +0200 Subject: [PATCH 323/553] ext-event/2.5.2 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.5.1 => event-2.5.2} | 0 .../no-debug-non-zts-20131226/{event-2.5.1 => event-2.5.2} | 0 .../no-debug-non-zts-20151012/{event-2.5.1 => event-2.5.2} | 0 .../no-debug-non-zts-20160303/{event-2.5.1 => event-2.5.2} | 0 .../no-debug-non-zts-20170718/{event-2.5.1 => event-2.5.2} | 0 .../no-debug-non-zts-20180731/{event-2.5.1 => event-2.5.2} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.5.1 => event-2.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.5.1 => event-2.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.5.1 => event-2.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.5.1 => event-2.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.5.1 => event-2.5.2} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.5.1 => event-2.5.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 868b97513..27aa88643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - ext-mongodb/1.5.4 [David Zuelke] +- ext-event/2.5.2 [David Zuelke] ## v156 (2019-05-30) diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.5.1 b/support/build/extensions/no-debug-non-zts-20121212/event-2.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.5.1 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.5.1 b/support/build/extensions/no-debug-non-zts-20131226/event-2.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.5.1 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.5.1 b/support/build/extensions/no-debug-non-zts-20151012/event-2.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.5.1 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.5.1 b/support/build/extensions/no-debug-non-zts-20160303/event-2.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.5.1 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.5.1 b/support/build/extensions/no-debug-non-zts-20170718/event-2.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.5.1 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.5.2 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.5.1 b/support/build/extensions/no-debug-non-zts-20180731/event-2.5.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.5.1 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.5.2 From eb3d052e3f531df2030cbfdfbf3a670de9e0e312 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Jun 2019 18:42:43 +0200 Subject: [PATCH 324/553] ext-mongodb/1.5.5 --- CHANGELOG.md | 2 +- .../no-debug-non-zts-20121212/{mongodb-1.5.4 => mongodb-1.5.5} | 0 .../no-debug-non-zts-20131226/{mongodb-1.5.4 => mongodb-1.5.5} | 0 .../no-debug-non-zts-20151012/{mongodb-1.5.4 => mongodb-1.5.5} | 0 .../no-debug-non-zts-20160303/{mongodb-1.5.4 => mongodb-1.5.5} | 0 .../no-debug-non-zts-20170718/{mongodb-1.5.4 => mongodb-1.5.5} | 0 .../no-debug-non-zts-20180731/{mongodb-1.5.4 => mongodb-1.5.5} | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename support/build/extensions/no-debug-non-zts-20121212/{mongodb-1.5.4 => mongodb-1.5.5} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{mongodb-1.5.4 => mongodb-1.5.5} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{mongodb-1.5.4 => mongodb-1.5.5} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{mongodb-1.5.4 => mongodb-1.5.5} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{mongodb-1.5.4 => mongodb-1.5.5} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{mongodb-1.5.4 => mongodb-1.5.5} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27aa88643..0b1956dc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ ### ADD -- ext-mongodb/1.5.4 [David Zuelke] - ext-event/2.5.2 [David Zuelke] +- ext-mongodb/1.5.5 [David Zuelke] ## v156 (2019-05-30) diff --git a/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.4 b/support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.4 rename to support/build/extensions/no-debug-non-zts-20121212/mongodb-1.5.5 diff --git a/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.4 b/support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.4 rename to support/build/extensions/no-debug-non-zts-20131226/mongodb-1.5.5 diff --git a/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.4 b/support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.4 rename to support/build/extensions/no-debug-non-zts-20151012/mongodb-1.5.5 diff --git a/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.4 b/support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.4 rename to support/build/extensions/no-debug-non-zts-20160303/mongodb-1.5.5 diff --git a/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.4 b/support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.4 rename to support/build/extensions/no-debug-non-zts-20170718/mongodb-1.5.5 diff --git a/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.4 b/support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.5 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.4 rename to support/build/extensions/no-debug-non-zts-20180731/mongodb-1.5.5 From 3f2c6536fdbc7a0be44ab2e0e87a6b602300d2b9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 11 Jun 2019 18:43:11 +0200 Subject: [PATCH 325/553] Composer/1.8.6 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{composer-1.8.5 => composer-1.8.6} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{composer-1.8.5 => composer-1.8.6} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b1956dc9..01f9e0721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ - ext-event/2.5.2 [David Zuelke] - ext-mongodb/1.5.5 [David Zuelke] +### CHG + +- Composer/1.8.6 [David Zuelke] + ## v156 (2019-05-30) ### ADD diff --git a/bin/compile b/bin/compile index 197673e39..eac2a6816 100755 --- a/bin/compile +++ b/bin/compile @@ -231,7 +231,7 @@ curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz 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.8.5.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-1.8.6.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-1.8.5 b/support/build/composer-1.8.6 similarity index 100% rename from support/build/composer-1.8.5 rename to support/build/composer-1.8.6 From e7b0a2ab89eed7c913adfbb9ef59f51515b3a774 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Jun 2019 01:43:32 +0200 Subject: [PATCH 326/553] Fix #342: Apache 2.4.39 causes 408 timeout after 20 seconds on long file uploads --- CHANGELOG.md | 4 ++ conf/apache2/2/4/39/heroku.conf | 73 +++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 conf/apache2/2/4/39/heroku.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 01f9e0721..e99dcff61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - Composer/1.8.6 [David Zuelke] +### FIX + +- Bug in Apache 2.4.39 (https://bz.apache.org/bugzilla/show_bug.cgi?id=63325) causes 408 timeout after 20 seconds on long file uploads (#342) [David Zuelke] + ## v156 (2019-05-30) ### ADD diff --git a/conf/apache2/2/4/39/heroku.conf b/conf/apache2/2/4/39/heroku.conf new file mode 100644 index 000000000..596b76c52 --- /dev/null +++ b/conf/apache2/2/4/39/heroku.conf @@ -0,0 +1,73 @@ +# workaround for bug in 2.4.39 only, see https://bz.apache.org/bugzilla/show_bug.cgi?id=63325 +RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 + +# define a short-hand to our fcgi proxy, for convenience +# Define heroku-fcgi fcgi://127.0.0.1:4999 +Define heroku-fcgi unix:/tmp/heroku.fcgi.${PORT}.sock|fcgi://heroku-fcgi + +# make sure the proxy is registered with the unix socket; we can then use just "fcgi://heroku-fcgi" in proxy and rewrites directives +# we have to do this because we can't rewrite to a UDS location and because PHP doesn't support the unix:...|fcgi://... syntax +# this is also a lot more convenient for users +# http://thread.gmane.org/gmane.comp.apache.devel/52892 + + # we must declare a parameter in here or it'll not register the proxy ahead of time + # min=0 is an obvious candidate since that's the default value already and sensible + ProxySet min=0 + + +Listen ${PORT} + + + + ServerName localhost + + ErrorLog /tmp/heroku.apache2_error.${PORT}.log + # redefine "combined" log format so includes can overwrite it + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" heroku + CustomLog /tmp/heroku.apache2_access.${PORT}.log heroku + + TraceEnable off + + + # lock it down fully by default + # if it's also the docroot, it'll be opened up again further below + Require all denied + + # explicitly deny these again, merged with the docroot later + Require all denied + + + # handle these separately; who knows where they are and whether they're accessible + + Require all denied + + + Require all denied + + + DocumentRoot "${DOCUMENT_ROOT}" + + + Options FollowSymLinks + + # allow .htaccess to do everything + AllowOverride All + + # no limits + Require all granted + + + # mod_proxy doesn't forward the Authorization header, must fix that ourselves + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + + # pass requests to .php files to mod_proxy_fcgi + # this requires Apache 2.4.10+ and PHP 5.5.15+ to work properly + + # make sure the file exists so that if not, Apache will show its 404 page and not FPM + SetHandler proxy:fcgi://heroku-fcgi + + + + Include "${HEROKU_PHP_HTTPD_CONFIG_INCLUDE}" + + From d50f2d41de0bc85d3891917f1c8d969020ac6507 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Jun 2019 17:07:01 +0200 Subject: [PATCH 327/553] ext-newrelic/8.7.0.242 --- CHANGELOG.md | 1 + .../{newrelic-8.6.0.238 => newrelic-8.7.0.242} | 0 .../{newrelic-8.6.0.238 => newrelic-8.7.0.242} | 0 .../{newrelic-8.6.0.238 => newrelic-8.7.0.242} | 0 .../{newrelic-8.6.0.238 => newrelic-8.7.0.242} | 0 .../{newrelic-8.6.0.238 => newrelic-8.7.0.242} | 0 .../{newrelic-8.6.0.238 => newrelic-8.7.0.242} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{newrelic-8.6.0.238 => newrelic-8.7.0.242} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{newrelic-8.6.0.238 => newrelic-8.7.0.242} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{newrelic-8.6.0.238 => newrelic-8.7.0.242} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{newrelic-8.6.0.238 => newrelic-8.7.0.242} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{newrelic-8.6.0.238 => newrelic-8.7.0.242} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{newrelic-8.6.0.238 => newrelic-8.7.0.242} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e99dcff61..2a3770f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - ext-event/2.5.2 [David Zuelke] - ext-mongodb/1.5.5 [David Zuelke] +- ext-newrelic/8.7.0.242 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20121212/newrelic-8.7.0.242 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/newrelic-8.6.0.238 rename to support/build/extensions/no-debug-non-zts-20121212/newrelic-8.7.0.242 diff --git a/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20131226/newrelic-8.7.0.242 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/newrelic-8.6.0.238 rename to support/build/extensions/no-debug-non-zts-20131226/newrelic-8.7.0.242 diff --git a/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20151012/newrelic-8.7.0.242 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/newrelic-8.6.0.238 rename to support/build/extensions/no-debug-non-zts-20151012/newrelic-8.7.0.242 diff --git a/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20160303/newrelic-8.7.0.242 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/newrelic-8.6.0.238 rename to support/build/extensions/no-debug-non-zts-20160303/newrelic-8.7.0.242 diff --git a/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20170718/newrelic-8.7.0.242 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/newrelic-8.6.0.238 rename to support/build/extensions/no-debug-non-zts-20170718/newrelic-8.7.0.242 diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-8.7.0.242 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/newrelic-8.6.0.238 rename to support/build/extensions/no-debug-non-zts-20180731/newrelic-8.7.0.242 From 0c9085d594769975e589caf02ed0374ca2364bb8 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Jun 2019 17:09:24 +0200 Subject: [PATCH 328/553] ext-blackfire/1.25.0 --- CHANGELOG.md | 1 + .../{blackfire-1.24.4 => blackfire-1.25.0} | 0 .../{blackfire-1.24.4 => blackfire-1.25.0} | 0 .../{blackfire-1.24.4 => blackfire-1.25.0} | 0 .../{blackfire-1.24.4 => blackfire-1.25.0} | 0 .../{blackfire-1.24.4 => blackfire-1.25.0} | 0 .../{blackfire-1.24.4 => blackfire-1.25.0} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.24.4 => blackfire-1.25.0} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.24.4 => blackfire-1.25.0} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.24.4 => blackfire-1.25.0} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.24.4 => blackfire-1.25.0} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.24.4 => blackfire-1.25.0} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{blackfire-1.24.4 => blackfire-1.25.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a3770f03..88dcb0a78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-event/2.5.2 [David Zuelke] - ext-mongodb/1.5.5 [David Zuelke] - ext-newrelic/8.7.0.242 [David Zuelke] +- ext-blackfire/1.25.0 [David Zuelke] ### CHG diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.25.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.24.4 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.25.0 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.25.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.24.4 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.25.0 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.25.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.24.4 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.25.0 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.25.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.24.4 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.25.0 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.25.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.24.4 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.25.0 diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.25.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/blackfire-1.24.4 rename to support/build/extensions/no-debug-non-zts-20180731/blackfire-1.25.0 From 6296034e21027f260febdda110fdd70e1ad7af51 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Jun 2019 19:33:12 +0200 Subject: [PATCH 329/553] work around a segfault in ext-phalcon/3.4.3 It crashes with PHP 7.3.6: https://github.com/phalcon/cphalcon/issues/14160 No ETA on a new release from upstream, so we rebuild by hand with the Zephir fixes before compiling. --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/phalcon | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88dcb0a78..cf2036239 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ### FIX - Bug in Apache 2.4.39 (https://bz.apache.org/bugzilla/show_bug.cgi?id=63325) causes 408 timeout after 20 seconds on long file uploads (#342) [David Zuelke] +- Phalcon 3.4.3 segfaults on latest PHP 7.3.6 [David Zuelke] ## v156 (2019-05-30) diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon b/support/build/extensions/no-debug-non-zts-20121212/phalcon index 516339290..4c63560a9 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon @@ -36,6 +36,34 @@ else workdir=php${series:0:1}/64bits fi pushd ${dep_dirname} + +# 3.4.3 requires an updated Zephir with fixes, otherwise PHP 7.3.6+ will segfault: https://github.com/phalcon/cphalcon/issues/14160 +if dpkg --compare-versions "$dep_version" "le" 3.4.3; then + # first, install zephir parser... + git clone https://github.com/phalcon/php-zephir-parser + pushd php-zephir-parser + phpize + ./configure --prefix=${OUT_PREFIX} + make -s -j9 + make install -s + # ... and load as extension + echo "extension=zephir_parser.so" >> ${OUT_PREFIX}/etc/php/conf.d/zehpir.ini + popd + # zephir itself... + git clone https://github.com/phalcon/zephir + pushd zephir + git checkout 0.10.x + # can just be installed into $(cwd)/bin + ./install-nosudo + popd + # this regenerates what we really need: ext/kernel/ with the changes + zephir/bin/zephir generate --backend=ZendEngine3 + # regenerate the build/ dir + php build/gen-build.php + # generating phalcon without phalcon installed only produces a safe/ build dir, so override it from earlier + workdir=php${series:0:1}/safe +fi + pushd build pushd ${workdir} export CC="gcc" From c1b4aa68cba6c365cd22af18572ea2c867c3f091 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 13 Jun 2019 19:33:29 +0200 Subject: [PATCH 330/553] v157 release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf2036239..f9aa90e95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v157 (2019-06-??) +## v157 (2019-06-13) ### ADD From 6c95bec703c96d89fbb109270a93af9f399a2d8c Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 19:59:32 +0200 Subject: [PATCH 331/553] PHP/7.2.20 --- CHANGELOG.md | 6 ++++++ support/build/{php-7.2.19 => php-7.2.20} | 0 2 files changed, 6 insertions(+) rename support/build/{php-7.2.19 => php-7.2.20} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9aa90e95..c0c38a127 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v158 (2019-07-04) + +### ADD + +- PHP/7.2.20 [David Zuelke] + ## v157 (2019-06-13) ### ADD diff --git a/support/build/php-7.2.19 b/support/build/php-7.2.20 similarity index 100% rename from support/build/php-7.2.19 rename to support/build/php-7.2.20 From c26a377b000e810f9f95511f4806c965ac738010 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:00:41 +0200 Subject: [PATCH 332/553] PHP/7.3.7 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{php-7.3.6 => php-7.3.7} | 0 support/build/{php-min-7.3.6 => php-min-7.3.7} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{php-7.3.6 => php-7.3.7} (100%) rename support/build/{php-min-7.3.6 => php-min-7.3.7} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c38a127..ee82117c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/7.2.20 [David Zuelke] +- PHP/7.3.7 [David Zuelke] ## v157 (2019-06-13) diff --git a/bin/compile b/bin/compile index eac2a6816..99295713b 100755 --- a/bin/compile +++ b/bin/compile @@ -218,7 +218,7 @@ 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.3.6.tar.gz" || { +curl_retry_on_18 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-7.3.7.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/php-7.3.6 b/support/build/php-7.3.7 similarity index 100% rename from support/build/php-7.3.6 rename to support/build/php-7.3.7 diff --git a/support/build/php-min-7.3.6 b/support/build/php-min-7.3.7 similarity index 100% rename from support/build/php-min-7.3.6 rename to support/build/php-min-7.3.7 From 8fafdf1d335c33e2287149b5499ba22aca8fd849 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:06:13 +0200 Subject: [PATCH 333/553] ext-blackfire/1.26.2 --- CHANGELOG.md | 1 + .../{blackfire-1.25.0 => blackfire-1.26.2} | 0 .../{blackfire-1.25.0 => blackfire-1.26.2} | 0 .../{blackfire-1.25.0 => blackfire-1.26.2} | 0 .../{blackfire-1.25.0 => blackfire-1.26.2} | 0 .../{blackfire-1.25.0 => blackfire-1.26.2} | 0 .../{blackfire-1.25.0 => blackfire-1.26.2} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{blackfire-1.25.0 => blackfire-1.26.2} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{blackfire-1.25.0 => blackfire-1.26.2} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{blackfire-1.25.0 => blackfire-1.26.2} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{blackfire-1.25.0 => blackfire-1.26.2} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{blackfire-1.25.0 => blackfire-1.26.2} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{blackfire-1.25.0 => blackfire-1.26.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee82117c5..123793623 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/7.2.20 [David Zuelke] - PHP/7.3.7 [David Zuelke] +- ext-blackfire/1.26.2 [David Zuelke] ## v157 (2019-06-13) diff --git a/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.25.0 b/support/build/extensions/no-debug-non-zts-20121212/blackfire-1.26.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/blackfire-1.25.0 rename to support/build/extensions/no-debug-non-zts-20121212/blackfire-1.26.2 diff --git a/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.25.0 b/support/build/extensions/no-debug-non-zts-20131226/blackfire-1.26.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/blackfire-1.25.0 rename to support/build/extensions/no-debug-non-zts-20131226/blackfire-1.26.2 diff --git a/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.25.0 b/support/build/extensions/no-debug-non-zts-20151012/blackfire-1.26.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/blackfire-1.25.0 rename to support/build/extensions/no-debug-non-zts-20151012/blackfire-1.26.2 diff --git a/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.25.0 b/support/build/extensions/no-debug-non-zts-20160303/blackfire-1.26.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/blackfire-1.25.0 rename to support/build/extensions/no-debug-non-zts-20160303/blackfire-1.26.2 diff --git a/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.25.0 b/support/build/extensions/no-debug-non-zts-20170718/blackfire-1.26.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/blackfire-1.25.0 rename to support/build/extensions/no-debug-non-zts-20170718/blackfire-1.26.2 diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.25.0 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.26.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/blackfire-1.25.0 rename to support/build/extensions/no-debug-non-zts-20180731/blackfire-1.26.2 From 1621de67d0153976e2a15fafbba3ca5c6a265498 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:08:15 +0200 Subject: [PATCH 334/553] ext-event/2.5.3 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{event-2.5.2 => event-2.5.3} | 0 .../no-debug-non-zts-20131226/{event-2.5.2 => event-2.5.3} | 0 .../no-debug-non-zts-20151012/{event-2.5.2 => event-2.5.3} | 0 .../no-debug-non-zts-20160303/{event-2.5.2 => event-2.5.3} | 0 .../no-debug-non-zts-20170718/{event-2.5.2 => event-2.5.3} | 0 .../no-debug-non-zts-20180731/{event-2.5.2 => event-2.5.3} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{event-2.5.2 => event-2.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{event-2.5.2 => event-2.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{event-2.5.2 => event-2.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{event-2.5.2 => event-2.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{event-2.5.2 => event-2.5.3} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{event-2.5.2 => event-2.5.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 123793623..0de89b08f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/7.2.20 [David Zuelke] - PHP/7.3.7 [David Zuelke] - ext-blackfire/1.26.2 [David Zuelke] +- ext-event/2.5.3 [David Zuelke] ## v157 (2019-06-13) diff --git a/support/build/extensions/no-debug-non-zts-20121212/event-2.5.2 b/support/build/extensions/no-debug-non-zts-20121212/event-2.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/event-2.5.2 rename to support/build/extensions/no-debug-non-zts-20121212/event-2.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20131226/event-2.5.2 b/support/build/extensions/no-debug-non-zts-20131226/event-2.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/event-2.5.2 rename to support/build/extensions/no-debug-non-zts-20131226/event-2.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20151012/event-2.5.2 b/support/build/extensions/no-debug-non-zts-20151012/event-2.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/event-2.5.2 rename to support/build/extensions/no-debug-non-zts-20151012/event-2.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20160303/event-2.5.2 b/support/build/extensions/no-debug-non-zts-20160303/event-2.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/event-2.5.2 rename to support/build/extensions/no-debug-non-zts-20160303/event-2.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20170718/event-2.5.2 b/support/build/extensions/no-debug-non-zts-20170718/event-2.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/event-2.5.2 rename to support/build/extensions/no-debug-non-zts-20170718/event-2.5.3 diff --git a/support/build/extensions/no-debug-non-zts-20180731/event-2.5.2 b/support/build/extensions/no-debug-non-zts-20180731/event-2.5.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/event-2.5.2 rename to support/build/extensions/no-debug-non-zts-20180731/event-2.5.3 From 2562e13a2ce40be4c1e5e4588e43d93d5ae275ea Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:09:28 +0200 Subject: [PATCH 335/553] ext-phalcon/3.4.4 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/phalcon | 27 ------------------- .../{phalcon-3.4.3 => phalcon-3.4.4} | 0 .../{phalcon-3.4.3 => phalcon-3.4.4} | 0 .../{phalcon-3.4.3 => phalcon-3.4.4} | 0 .../{phalcon-3.4.3 => phalcon-3.4.4} | 0 .../{phalcon-3.4.3 => phalcon-3.4.4} | 0 .../{phalcon-3.4.3 => phalcon-3.4.4} | 0 8 files changed, 1 insertion(+), 27 deletions(-) rename support/build/extensions/no-debug-non-zts-20121212/{phalcon-3.4.3 => phalcon-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{phalcon-3.4.3 => phalcon-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{phalcon-3.4.3 => phalcon-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{phalcon-3.4.3 => phalcon-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{phalcon-3.4.3 => phalcon-3.4.4} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{phalcon-3.4.3 => phalcon-3.4.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0de89b08f..a92ae4409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/7.3.7 [David Zuelke] - ext-blackfire/1.26.2 [David Zuelke] - ext-event/2.5.3 [David Zuelke] +- ext-phalcon/3.4.4 [David Zuelke] ## v157 (2019-06-13) diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon b/support/build/extensions/no-debug-non-zts-20121212/phalcon index 4c63560a9..f5b0915c2 100755 --- a/support/build/extensions/no-debug-non-zts-20121212/phalcon +++ b/support/build/extensions/no-debug-non-zts-20121212/phalcon @@ -37,33 +37,6 @@ else fi pushd ${dep_dirname} -# 3.4.3 requires an updated Zephir with fixes, otherwise PHP 7.3.6+ will segfault: https://github.com/phalcon/cphalcon/issues/14160 -if dpkg --compare-versions "$dep_version" "le" 3.4.3; then - # first, install zephir parser... - git clone https://github.com/phalcon/php-zephir-parser - pushd php-zephir-parser - phpize - ./configure --prefix=${OUT_PREFIX} - make -s -j9 - make install -s - # ... and load as extension - echo "extension=zephir_parser.so" >> ${OUT_PREFIX}/etc/php/conf.d/zehpir.ini - popd - # zephir itself... - git clone https://github.com/phalcon/zephir - pushd zephir - git checkout 0.10.x - # can just be installed into $(cwd)/bin - ./install-nosudo - popd - # this regenerates what we really need: ext/kernel/ with the changes - zephir/bin/zephir generate --backend=ZendEngine3 - # regenerate the build/ dir - php build/gen-build.php - # generating phalcon without phalcon installed only produces a safe/ build dir, so override it from earlier - workdir=php${series:0:1}/safe -fi - pushd build pushd ${workdir} export CC="gcc" diff --git a/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.3 rename to support/build/extensions/no-debug-non-zts-20121212/phalcon-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.3 rename to support/build/extensions/no-debug-non-zts-20131226/phalcon-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.3 rename to support/build/extensions/no-debug-non-zts-20151012/phalcon-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.3 rename to support/build/extensions/no-debug-non-zts-20160303/phalcon-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.3 rename to support/build/extensions/no-debug-non-zts-20170718/phalcon-3.4.4 diff --git a/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 b/support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.4 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.3 rename to support/build/extensions/no-debug-non-zts-20180731/phalcon-3.4.4 From a6da390120f265ac3341a70a12950ff4f765b8d1 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:10:20 +0200 Subject: [PATCH 336/553] ext-rdkafka/3.1.1 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20121212/{rdkafka-3.1.0 => rdkafka-3.1.1} | 0 .../no-debug-non-zts-20131226/{rdkafka-3.1.0 => rdkafka-3.1.1} | 0 .../no-debug-non-zts-20151012/{rdkafka-3.1.0 => rdkafka-3.1.1} | 0 .../no-debug-non-zts-20160303/{rdkafka-3.1.0 => rdkafka-3.1.1} | 0 .../no-debug-non-zts-20170718/{rdkafka-3.1.0 => rdkafka-3.1.1} | 0 .../no-debug-non-zts-20180731/{rdkafka-3.1.0 => rdkafka-3.1.1} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20121212/{rdkafka-3.1.0 => rdkafka-3.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20131226/{rdkafka-3.1.0 => rdkafka-3.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20151012/{rdkafka-3.1.0 => rdkafka-3.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20160303/{rdkafka-3.1.0 => rdkafka-3.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20170718/{rdkafka-3.1.0 => rdkafka-3.1.1} (100%) rename support/build/extensions/no-debug-non-zts-20180731/{rdkafka-3.1.0 => rdkafka-3.1.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a92ae4409..1a72db002 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - ext-blackfire/1.26.2 [David Zuelke] - ext-event/2.5.3 [David Zuelke] - ext-phalcon/3.4.4 [David Zuelke] +- ext-rdkafka/3.1.1 [David Zuelke] ## v157 (2019-06-13) diff --git a/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.1.0 b/support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.1.0 rename to support/build/extensions/no-debug-non-zts-20121212/rdkafka-3.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.1.0 b/support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.1.0 rename to support/build/extensions/no-debug-non-zts-20131226/rdkafka-3.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.1.0 b/support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.1.0 rename to support/build/extensions/no-debug-non-zts-20151012/rdkafka-3.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.1.0 b/support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.1.0 rename to support/build/extensions/no-debug-non-zts-20160303/rdkafka-3.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.1.0 b/support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.1.0 rename to support/build/extensions/no-debug-non-zts-20170718/rdkafka-3.1.1 diff --git a/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.1.0 b/support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.1.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.1.0 rename to support/build/extensions/no-debug-non-zts-20180731/rdkafka-3.1.1 From 3fd14f44fbbed9cf4b1cb3eeb87782d18729a095 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:18:05 +0200 Subject: [PATCH 337/553] ext-redis/5.0.0 --- CHANGELOG.md | 1 + .../build/extensions/no-debug-non-zts-20151012/redis-5.0.0 | 5 +++++ .../build/extensions/no-debug-non-zts-20160303/redis-5.0.0 | 5 +++++ .../build/extensions/no-debug-non-zts-20170718/redis-5.0.0 | 5 +++++ .../build/extensions/no-debug-non-zts-20180731/redis-5.0.0 | 5 +++++ 5 files changed, 21 insertions(+) create mode 100755 support/build/extensions/no-debug-non-zts-20151012/redis-5.0.0 create mode 100755 support/build/extensions/no-debug-non-zts-20160303/redis-5.0.0 create mode 100755 support/build/extensions/no-debug-non-zts-20170718/redis-5.0.0 create mode 100755 support/build/extensions/no-debug-non-zts-20180731/redis-5.0.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a72db002..050f49e63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - ext-event/2.5.3 [David Zuelke] - ext-phalcon/3.4.4 [David Zuelke] - ext-rdkafka/3.1.1 [David Zuelke] +- ext-redis/5.0.0 [David Zuelke] ## v157 (2019-06-13) diff --git a/support/build/extensions/no-debug-non-zts-20151012/redis-5.0.0 b/support/build/extensions/no-debug-non-zts-20151012/redis-5.0.0 new file mode 100755 index 000000000..56c06fdfd --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20151012/redis-5.0.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php +# Build Deps: php-7.0.* + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20160303/redis-5.0.0 b/support/build/extensions/no-debug-non-zts-20160303/redis-5.0.0 new file mode 100755 index 000000000..2213ba8b9 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20160303/redis-5.0.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php +# Build Deps: php-7.1.* + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20170718/redis-5.0.0 b/support/build/extensions/no-debug-non-zts-20170718/redis-5.0.0 new file mode 100755 index 000000000..f02fb806d --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20170718/redis-5.0.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php +# Build Deps: php-7.2.* + +source $(dirname $0)/../no-debug-non-zts-20121212/redis diff --git a/support/build/extensions/no-debug-non-zts-20180731/redis-5.0.0 b/support/build/extensions/no-debug-non-zts-20180731/redis-5.0.0 new file mode 100755 index 000000000..954c08931 --- /dev/null +++ b/support/build/extensions/no-debug-non-zts-20180731/redis-5.0.0 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/php +# Build Deps: php-7.3.* + +source $(dirname $0)/../no-debug-non-zts-20121212/redis From 3e4420e7450d27d5d711782e86d571be117705aa Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:21:12 +0200 Subject: [PATCH 338/553] libcassandra/2.13.0 --- CHANGELOG.md | 4 ++++ .../libraries/{libcassandra-2.12.0 => libcassandra-2.13.0} | 0 2 files changed, 4 insertions(+) rename support/build/libraries/{libcassandra-2.12.0 => libcassandra-2.13.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050f49e63..d221e1ab0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ - ext-rdkafka/3.1.1 [David Zuelke] - ext-redis/5.0.0 [David Zuelke] +### CHG + +- libcassandra/2.13.0 [David Zuelke] + ## v157 (2019-06-13) ### ADD diff --git a/support/build/libraries/libcassandra-2.12.0 b/support/build/libraries/libcassandra-2.13.0 similarity index 100% rename from support/build/libraries/libcassandra-2.12.0 rename to support/build/libraries/libcassandra-2.13.0 From 81e0caee0e21e68ee4093b0b18579d2c7476294a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 3 Jul 2019 20:22:34 +0200 Subject: [PATCH 339/553] librdkafka/1.1.0 --- CHANGELOG.md | 1 + support/build/libraries/{librdkafka-1.0.1 => librdkafka-1.1.0} | 0 2 files changed, 1 insertion(+) rename support/build/libraries/{librdkafka-1.0.1 => librdkafka-1.1.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d221e1ab0..a3c6746d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ### CHG - libcassandra/2.13.0 [David Zuelke] +- librdkafka/1.1.0 [David Zuelke] ## v157 (2019-06-13) diff --git a/support/build/libraries/librdkafka-1.0.1 b/support/build/libraries/librdkafka-1.1.0 similarity index 100% rename from support/build/libraries/librdkafka-1.0.1 rename to support/build/libraries/librdkafka-1.1.0 From cbc198776460e2cbcff9702d548b8eb515a7923f Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 1 Aug 2019 01:39:31 +0200 Subject: [PATCH 340/553] base CI tests --- test/fixtures/.gitignore | 2 + test/fixtures/ci/devdeps/app.json | 5 + test/fixtures/ci/devdeps/composer.json | 8 + test/fixtures/ci/devdeps/composer.lock | 257 +++++++++++++++++++++++++ test/spec/ci_spec.rb | 10 + test/spec/spec_helper.rb | 21 ++ 6 files changed, 303 insertions(+) create mode 100644 test/fixtures/.gitignore create mode 100644 test/fixtures/ci/devdeps/app.json create mode 100644 test/fixtures/ci/devdeps/composer.json create mode 100644 test/fixtures/ci/devdeps/composer.lock create mode 100644 test/spec/ci_spec.rb diff --git a/test/fixtures/.gitignore b/test/fixtures/.gitignore new file mode 100644 index 000000000..c6cebded4 --- /dev/null +++ b/test/fixtures/.gitignore @@ -0,0 +1,2 @@ +!composer.lock +vendor diff --git a/test/fixtures/ci/devdeps/app.json b/test/fixtures/ci/devdeps/app.json new file mode 100644 index 000000000..f624d0cb3 --- /dev/null +++ b/test/fixtures/ci/devdeps/app.json @@ -0,0 +1,5 @@ +{ + "scripts": { + "test": "echo yay" + } +} diff --git a/test/fixtures/ci/devdeps/composer.json b/test/fixtures/ci/devdeps/composer.json new file mode 100644 index 000000000..41187c5ab --- /dev/null +++ b/test/fixtures/ci/devdeps/composer.json @@ -0,0 +1,8 @@ +{ + "require": { + "monolog/monolog": "^1.24" + }, + "require-dev": { + "mockery/mockery": "^1.2" + } +} diff --git a/test/fixtures/ci/devdeps/composer.lock b/test/fixtures/ci/devdeps/composer.lock new file mode 100644 index 000000000..e34779da7 --- /dev/null +++ b/test/fixtures/ci/devdeps/composer.lock @@ -0,0 +1,257 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "8a93f0c7f71acb318f632bab8a0e1dfa", + "packages": [ + { + "name": "monolog/monolog", + "version": "1.24.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "~1.0" + }, + "provide": { + "psr/log-implementation": "1.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", + "php-amqplib/php-amqplib": "~2.4", + "php-console/php-console": "^3.1.3", + "phpunit/phpunit": "~4.5", + "phpunit/phpunit-mock-objects": "2.3.0", + "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^0.13", + "swiftmailer/swiftmailer": "^5.3|^6.0" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "php-console/php-console": "Allow sending log messages to Google Chrome", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "sentry/sentry": "Allow sending log messages to a Sentry server" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "http://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "time": "2018-11-05T09:00:11+00:00" + }, + { + "name": "psr/log", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2018-11-20T15:27:04+00:00" + } + ], + "packages-dev": [ + { + "name": "hamcrest/hamcrest-php", + "version": "v2.0.0", + "source": { + "type": "git", + "url": "https://github.com/hamcrest/hamcrest-php.git", + "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad", + "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad", + "shasum": "" + }, + "require": { + "php": "^5.3|^7.0" + }, + "replace": { + "cordoval/hamcrest-php": "*", + "davedevelopment/hamcrest-php": "*", + "kodova/hamcrest-php": "*" + }, + "require-dev": { + "phpunit/php-file-iterator": "1.3.3", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "hamcrest" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD" + ], + "description": "This is the PHP port of Hamcrest Matchers", + "keywords": [ + "test" + ], + "time": "2016-01-20T08:20:44+00:00" + }, + { + "name": "mockery/mockery", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", + "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", + "shasum": "" + }, + "require": { + "hamcrest/hamcrest-php": "~2.0", + "lib-pcre": ">=7.0", + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Mockery": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", + "keywords": [ + "BDD", + "TDD", + "library", + "mock", + "mock objects", + "mockery", + "stub", + "test", + "test double", + "testing" + ], + "time": "2019-02-13T09:37:52+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/test/spec/ci_spec.rb b/test/spec/ci_spec.rb new file mode 100644 index 000000000..f6247b2a9 --- /dev/null +++ b/test/spec/ci_spec.rb @@ -0,0 +1,10 @@ +require_relative "spec_helper" + +describe "A PHP application on Heroku CI" do + it "installs dev dependencies" do + app = new_ci_app_with_stack_and_platrepo('test/fixtures/ci/devdeps') + app.run_ci do |test_run| + expect(test_run.output).to match("mockery/mockery") + end + end +end diff --git a/test/spec/spec_helper.rb b/test/spec/spec_helper.rb index d391e9994..5db371dbf 100644 --- a/test/spec/spec_helper.rb +++ b/test/spec/spec_helper.rb @@ -10,6 +10,12 @@ ENV['RACK_ENV'] = 'test' +module Hatchet + class App + attr_reader :name, :stack, :directory, :repo_name, :app_config + end +end + def product_hash(hash) hash.values[0].product(*hash.values[1..-1]).map{ |e| Hash[hash.keys.zip e] } end @@ -71,3 +77,18 @@ def new_app_with_stack_and_platrepo(*args, **kwargs) kwargs[:config].compact! Hatchet::Runner.new(*args, **kwargs) end + +def new_ci_app_with_stack_and_platrepo(*args, **kwargs) + app = new_app_with_stack_and_platrepo(*args, **kwargs) + # CI needs the buildpack in app.json... + app.in_directory do + app_json = JSON.parse(File.read("app.json")) if File.exist?("app.json") + app_json ||= {} + app_json["environments"] ||= {} + app_json["environments"]["test"] ||= {} + app_json["environments"]["test"]["env"] ||= {} + app_json["environments"]["test"]["env"] = app.app_config.merge(app_json["environments"]["test"]["env"]) # so we get HEROKU_PHP_PLATFORM_REPOSITORIES in there + File.open("app.json", "w") { |f| f.write(JSON.generate(app_json)) } + end + app +end From 31f4a79f3819a146774c0b5c091609dd62b4cb85 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 1 Aug 2019 01:05:14 +0200 Subject: [PATCH 341/553] enable zend.assertions on Heroku CI --- CHANGELOG.md | 6 ++++++ bin/test-compile | 3 +++ test/fixtures/ci/zendassert/composer.json | 8 ++++++++ test/fixtures/ci/zendassert/composer.lock | 19 +++++++++++++++++++ test/fixtures/ci/zendassert/test.php | 4 ++++ test/spec/ci_spec.rb | 8 ++++++++ 6 files changed, 48 insertions(+) create mode 100644 test/fixtures/ci/zendassert/composer.json create mode 100644 test/fixtures/ci/zendassert/composer.lock create mode 100644 test/fixtures/ci/zendassert/test.php diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c6746d0..1cc7f1aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # heroku-buildpack-php CHANGELOG +## v159 (2019-08-??) + +### CHG + +- Enable zend.assertions on Heroku CI [David Zuelke] + ## v158 (2019-07-04) ### ADD diff --git a/bin/test-compile b/bin/test-compile index ee6406e14..aa7bddde2 100755 --- a/bin/test-compile +++ b/bin/test-compile @@ -12,3 +12,6 @@ export HEROKU_PHP_INSTALL_DEV="" # empty string is correct; it will be inserted bp_dir=$(cd $(dirname $0); cd ..; pwd) source $bp_dir/bin/compile + +# enable assertions for CI +echo "zend.assertions = 1" > "$(php -r 'echo PHP_CONFIG_FILE_SCAN_DIR;')/heroku-ci.ini" diff --git a/test/fixtures/ci/zendassert/composer.json b/test/fixtures/ci/zendassert/composer.json new file mode 100644 index 000000000..0b4b98b48 --- /dev/null +++ b/test/fixtures/ci/zendassert/composer.json @@ -0,0 +1,8 @@ +{ + "require": { + "php": "^7.1.0" + }, + "scripts": { + "test": "@php test.php" + } +} diff --git a/test/fixtures/ci/zendassert/composer.lock b/test/fixtures/ci/zendassert/composer.lock new file mode 100644 index 000000000..70127e2fd --- /dev/null +++ b/test/fixtures/ci/zendassert/composer.lock @@ -0,0 +1,19 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "b2c3dee89b760576c121243db8490d25", + "packages": [], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^7.1.0" + }, + "platform-dev": [] +} diff --git a/test/fixtures/ci/zendassert/test.php b/test/fixtures/ci/zendassert/test.php new file mode 100644 index 000000000..ae0cb2f51 --- /dev/null +++ b/test/fixtures/ci/zendassert/test.php @@ -0,0 +1,4 @@ + Date: Tue, 30 Jul 2019 01:24:41 +0200 Subject: [PATCH 342/553] Automatically run 'composer test' if present, or one of 'codecept'/'behat'/'phpspec'/'atoum'/'kahlan'/'peridot'/'phpunit', on Heroku CI --- CHANGELOG.md | 4 + bin/test | 50 + test/fixtures/ci/atoum/.atoum.php | 69 + test/fixtures/ci/atoum/.bootstrap.atoum.php | 18 + test/fixtures/ci/atoum/composer.json | 8 + test/fixtures/ci/atoum/composer.lock | 103 + .../ci/atoum/tests/units/helloWorld.php | 28 + test/fixtures/ci/behat/composer.json | 8 + test/fixtures/ci/behat/composer.lock | 1152 ++++++ .../features/bootstrap/FeatureContext.php | 22 + test/fixtures/ci/codeception/codeception.yml | 10 + test/fixtures/ci/codeception/composer.json | 8 + test/fixtures/ci/codeception/composer.lock | 3410 +++++++++++++++++ .../ci/codeception/tests/_data/.gitkeep | 0 .../ci/codeception/tests/_output/.gitkeep | 0 .../tests/_support/AcceptanceTester.php | 26 + .../tests/_support/FunctionalTester.php | 26 + .../tests/_support/Helper/Acceptance.php | 10 + .../tests/_support/Helper/Functional.php | 10 + .../tests/_support/Helper/Unit.php | 10 + .../codeception/tests/_support/UnitTester.php | 26 + .../_generated/AcceptanceTesterActions.php | 2404 ++++++++++++ .../_generated/FunctionalTesterActions.php | 16 + .../_support/_generated/UnitTesterActions.php | 827 ++++ .../ci/codeception/tests/acceptance.suite.yml | 13 + .../ci/codeception/tests/acceptance/.gitkeep | 0 .../ci/codeception/tests/functional.suite.yml | 13 + .../ci/codeception/tests/functional/.gitkeep | 0 .../ci/codeception/tests/unit.suite.yml | 10 + .../ci/codeception/tests/unit/.gitkeep | 0 test/fixtures/ci/composertest/composer.json | 5 + test/fixtures/ci/kahlan/composer.json | 8 + test/fixtures/ci/kahlan/composer.lock | 74 + .../ci/kahlan/spec/helloworld.spec.php | 11 + test/fixtures/ci/peridot/composer.json | 8 + test/fixtures/ci/peridot/composer.lock | 447 +++ test/fixtures/ci/peridot/peridot.php | 8 + .../ci/peridot/specs/helloworld.spec.php | 11 + test/fixtures/ci/phpspec/composer.json | 8 + test/fixtures/ci/phpspec/composer.lock | 1343 +++++++ test/fixtures/ci/phpunit/.gitignore | 1 + test/fixtures/ci/phpunit/composer.json | 8 + test/fixtures/ci/phpunit/composer.lock | 1540 ++++++++ test/fixtures/ci/phpunit/phpunit.xml | 22 + test/spec/ci_spec.rb | 98 + 45 files changed, 11873 insertions(+) create mode 100755 bin/test create mode 100644 test/fixtures/ci/atoum/.atoum.php create mode 100644 test/fixtures/ci/atoum/.bootstrap.atoum.php create mode 100644 test/fixtures/ci/atoum/composer.json create mode 100644 test/fixtures/ci/atoum/composer.lock create mode 100644 test/fixtures/ci/atoum/tests/units/helloWorld.php create mode 100644 test/fixtures/ci/behat/composer.json create mode 100644 test/fixtures/ci/behat/composer.lock create mode 100644 test/fixtures/ci/behat/features/bootstrap/FeatureContext.php create mode 100644 test/fixtures/ci/codeception/codeception.yml create mode 100644 test/fixtures/ci/codeception/composer.json create mode 100644 test/fixtures/ci/codeception/composer.lock create mode 100644 test/fixtures/ci/codeception/tests/_data/.gitkeep create mode 100644 test/fixtures/ci/codeception/tests/_output/.gitkeep create mode 100644 test/fixtures/ci/codeception/tests/_support/AcceptanceTester.php create mode 100644 test/fixtures/ci/codeception/tests/_support/FunctionalTester.php create mode 100644 test/fixtures/ci/codeception/tests/_support/Helper/Acceptance.php create mode 100644 test/fixtures/ci/codeception/tests/_support/Helper/Functional.php create mode 100644 test/fixtures/ci/codeception/tests/_support/Helper/Unit.php create mode 100644 test/fixtures/ci/codeception/tests/_support/UnitTester.php create mode 100644 test/fixtures/ci/codeception/tests/_support/_generated/AcceptanceTesterActions.php create mode 100644 test/fixtures/ci/codeception/tests/_support/_generated/FunctionalTesterActions.php create mode 100644 test/fixtures/ci/codeception/tests/_support/_generated/UnitTesterActions.php create mode 100644 test/fixtures/ci/codeception/tests/acceptance.suite.yml create mode 100644 test/fixtures/ci/codeception/tests/acceptance/.gitkeep create mode 100644 test/fixtures/ci/codeception/tests/functional.suite.yml create mode 100644 test/fixtures/ci/codeception/tests/functional/.gitkeep create mode 100644 test/fixtures/ci/codeception/tests/unit.suite.yml create mode 100644 test/fixtures/ci/codeception/tests/unit/.gitkeep create mode 100644 test/fixtures/ci/composertest/composer.json create mode 100644 test/fixtures/ci/kahlan/composer.json create mode 100644 test/fixtures/ci/kahlan/composer.lock create mode 100644 test/fixtures/ci/kahlan/spec/helloworld.spec.php create mode 100644 test/fixtures/ci/peridot/composer.json create mode 100644 test/fixtures/ci/peridot/composer.lock create mode 100644 test/fixtures/ci/peridot/peridot.php create mode 100644 test/fixtures/ci/peridot/specs/helloworld.spec.php create mode 100644 test/fixtures/ci/phpspec/composer.json create mode 100644 test/fixtures/ci/phpspec/composer.lock create mode 100644 test/fixtures/ci/phpunit/.gitignore create mode 100644 test/fixtures/ci/phpunit/composer.json create mode 100644 test/fixtures/ci/phpunit/composer.lock create mode 100644 test/fixtures/ci/phpunit/phpunit.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cc7f1aab..e6fccc77a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v159 (2019-08-??) +### ADD + +- Automatically run 'composer test' if present, or one of 'codecept'/'behat'/'phpspec'/'atoum'/'kahlan'/'peridot'/'phpunit', on Heroku CI [David Zuelke] + ### CHG - Enable zend.assertions on Heroku CI [David Zuelke] diff --git a/bin/test b/bin/test new file mode 100755 index 000000000..6780e4e69 --- /dev/null +++ b/bin/test @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +# bin/test +# env vars are passed in already, so we can ignore the dir + +# fail hard +set -o pipefail +# fail harder +set -eu + +# unlike a regular app.json "test" script, this one isn't run with the app dir as the CWD +# we `cd` with a default value, so that the script can also be called from inside the app dir (`cd ""` does not change cwd) +cd "${1-}" + +ram=$(cat "/sys/fs/cgroup/memory/memory.limit_in_bytes" || true) +if [[ -n "$ram" ]]; then + export COMPOSER_MEMORY_LIMIT="$ram" +fi +export COMPOSER_PROCESS_TIMEOUT=0 + +echo "Trying to auto-detect test framework; first match will be found. You may use composer script 'test', or app.json, to specify what to run." >&2 +# 'composer run-script -l' prints a "scripts:" header on stderr... +if composer run-script -l 2> /dev/null | grep -q -- "^\s*test\b"; then + echo "Script 'composer test' found, executing..." >&2 + composer run-script test +elif composer exec -l | grep -q -- "^-\s*codecept\b"; then + echo "Codeception found, executing 'codecept run'..." >&2 + composer exec -v codecept run # without -v, no stderr output is printed +elif composer exec -l | grep -q -- "^-\s*behat\b"; then + echo "Behat found, executing 'behat'..." >&2 + composer exec -v behat # without -v, no stderr output is printed +elif composer exec -l | grep -q -- "^-\s*phpspec\b"; then + echo "PHPSpec found, executing 'phpspec run'..." >&2 + composer exec -v phpspec run # without -v, no stderr output is printed +elif composer exec -l | grep -q -- "^-\s*atoum\b"; then + echo "atoum found, executing 'atoum'..." >&2 + composer exec -v atoum # without -v, no stderr output is printed +elif composer exec -l | grep -q -- "^-\s*kahlan\b"; then + echo "Kahlan found, executing 'kahlan'..." >&2 + composer exec -v kahlan # without -v, no stderr output is printed +elif composer exec -l | grep -q -- "^-\s*peridot\b"; then + echo "Peridot found, executing 'peridot'..." >&2 + composer exec -v peridot # without -v, no stderr output is printed +elif composer exec -l | grep -q -- "^-\s*phpunit\b"; then + echo "PHPUnit found, executing 'phpunit'..." >&2 + composer exec -v phpunit # -dmemory_limit="${ram:-"-1"}" # composer exec -- is currently broken, so we can't pass -d to phpunit # without -v, no stderr output is printed +else + echo "No tests found. Please use composer script 'test', or app.json, to specify what to run." >&2 + exit 1 +fi diff --git a/test/fixtures/ci/atoum/.atoum.php b/test/fixtures/ci/atoum/.atoum.php new file mode 100644 index 000000000..460023fb9 --- /dev/null +++ b/test/fixtures/ci/atoum/.atoum.php @@ -0,0 +1,69 @@ +addDefaultReport(); + +$runner->addTestsFromDirectory('tests/units/'); + +/* +LOGO + +// This will add the atoum logo before each run. +$report->addField(new atoum\report\fields\runner\atoum\logo()); + +// This will add a green or red logo after each run depending on its status. +$report->addField(new atoum\report\fields\runner\result\logo()); +*/ + +/* +CODE COVERAGE SETUP + +// Please replace in next line "Project Name" by your project name and "/path/to/destination/directory" by your destination directory path for html files. +$coverageField = new atoum\report\fields\runner\coverage\html('Project Name', '/path/to/destination/directory'); + +// Please replace in next line http://url/of/web/site by the root url of your code coverage web site. +$coverageField->setRootUrl('http://url/of/web/site'); + +$report->addField($coverageField); +*/ + +/* +TEST EXECUTION SETUP + +// Please replace in next line "/path/to/your/tests/units/classes/directory" by your unit test's directory. +$runner->addTestsFromDirectory('path/to/your/tests/units/classes/directory'); +*/ + +/* +TEST GENERATOR SETUP + +$testGenerator = new atoum\test\generator(); + +// Please replace in next line "/path/to/your/tests/units/classes/directory" by your unit test's directory. +$testGenerator->setTestClassesDirectory('path/to/your/tests/units/classes/directory'); + +// Please replace in next line "your\project\namespace\tests\units" by your unit test's namespace. +$testGenerator->setTestClassNamespace('your\project\namespace\tests\units'); + +// Please replace in next line "/path/to/your/classes/directory" by your classes directory. +$testGenerator->setTestedClassesDirectory('path/to/your/classes/directory'); + +// Please replace in next line "your\project\namespace" by your project namespace. +$testGenerator->setTestedClassNamespace('your\project\namespace'); + +// Please replace in next line "path/to/your/tests/units/runner.php" by path to your unit test's runner. +$testGenerator->setRunnerPath('path/to/your/tests/units/runner.php'); + +$script->getRunner()->setTestGenerator($testGenerator); +*/ diff --git a/test/fixtures/ci/atoum/.bootstrap.atoum.php b/test/fixtures/ci/atoum/.bootstrap.atoum.php new file mode 100644 index 000000000..6907ab2e6 --- /dev/null +++ b/test/fixtures/ci/atoum/.bootstrap.atoum.php @@ -0,0 +1,18 @@ += 2.3)" + }, + "bin": [ + "bin/atoum" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "classmap": [ + "classes/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Frédéric Hardy", + "email": "frederic.hardy@atoum.org", + "homepage": "http://blog.mageekbox.net" + }, + { + "name": "François Dussert", + "email": "francois.dussert@atoum.org" + }, + { + "name": "Gérald Croes", + "email": "gerald.croes@atoum.org" + }, + { + "name": "Julien Bianchi", + "email": "julien.bianchi@atoum.org" + }, + { + "name": "Ludovic Fleury", + "email": "ludovic.fleury@atoum.org" + } + ], + "description": "Simple modern and intuitive unit testing framework for PHP 5.3+", + "homepage": "http://www.atoum.org", + "keywords": [ + "TDD", + "atoum", + "test", + "unit testing" + ], + "time": "2018-03-15T22:46:39+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^7.1.0" + }, + "platform-dev": [] +} diff --git a/test/fixtures/ci/atoum/tests/units/helloWorld.php b/test/fixtures/ci/atoum/tests/units/helloWorld.php new file mode 100644 index 000000000..27f4c2c5c --- /dev/null +++ b/test/fixtures/ci/atoum/tests/units/helloWorld.php @@ -0,0 +1,28 @@ +if($this->newTestedInstance) + ->then + ->string($this->testedInstance->helloWorld()) + ->isEqualTo("Hello World"); + } + } +} diff --git a/test/fixtures/ci/behat/composer.json b/test/fixtures/ci/behat/composer.json new file mode 100644 index 000000000..aff11b0dd --- /dev/null +++ b/test/fixtures/ci/behat/composer.json @@ -0,0 +1,8 @@ +{ + "require": { + "php": "^7.1.0" + }, + "require-dev": { + "behat/behat": "^3.5" + } +} diff --git a/test/fixtures/ci/behat/composer.lock b/test/fixtures/ci/behat/composer.lock new file mode 100644 index 000000000..955c876ec --- /dev/null +++ b/test/fixtures/ci/behat/composer.lock @@ -0,0 +1,1152 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "2fe126ea9e3ffccd845949dda26286d8", + "packages": [], + "packages-dev": [ + { + "name": "behat/behat", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/Behat/Behat.git", + "reference": "e4bce688be0c2029dc1700e46058d86428c63cab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Behat/zipball/e4bce688be0c2029dc1700e46058d86428c63cab", + "reference": "e4bce688be0c2029dc1700e46058d86428c63cab", + "shasum": "" + }, + "require": { + "behat/gherkin": "^4.5.1", + "behat/transliterator": "^1.2", + "container-interop/container-interop": "^1.2", + "ext-mbstring": "*", + "php": ">=5.3.3", + "psr/container": "^1.0", + "symfony/class-loader": "~2.1||~3.0", + "symfony/config": "~2.3||~3.0||~4.0", + "symfony/console": "~2.7.40||^2.8.33||~3.3.15||^3.4.3||^4.0.3", + "symfony/dependency-injection": "~2.1||~3.0||~4.0", + "symfony/event-dispatcher": "~2.1||~3.0||~4.0", + "symfony/translation": "~2.3||~3.0||~4.0", + "symfony/yaml": "~2.1||~3.0||~4.0" + }, + "require-dev": { + "herrera-io/box": "~1.6.1", + "phpunit/phpunit": "^4.8.36|^6.3", + "symfony/process": "~2.5|~3.0|~4.0" + }, + "bin": [ + "bin/behat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.5.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Behat": "src/", + "Behat\\Testwork": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Scenario-oriented BDD framework for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "Agile", + "BDD", + "ScenarioBDD", + "Scrum", + "StoryBDD", + "User story", + "business", + "development", + "documentation", + "examples", + "symfony", + "testing" + ], + "time": "2018-08-10T18:56:51+00:00" + }, + { + "name": "behat/gherkin", + "version": "v4.6.0", + "source": { + "type": "git", + "url": "https://github.com/Behat/Gherkin.git", + "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07", + "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.5|~5", + "symfony/phpunit-bridge": "~2.7|~3|~4", + "symfony/yaml": "~2.3|~3|~4" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Gherkin": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], + "time": "2019-01-16T14:22:17+00:00" + }, + { + "name": "behat/transliterator", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/Behat/Transliterator.git", + "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Transliterator/zipball/826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c", + "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "chuyskywalker/rolling-curl": "^3.1", + "php-yaoi/php-yaoi": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Transliterator": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Artistic-1.0" + ], + "description": "String transliterator", + "keywords": [ + "i18n", + "slug", + "transliterator" + ], + "time": "2017-04-04T11:38:05+00:00" + }, + { + "name": "container-interop/container-interop", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/container-interop.git", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "shasum": "" + }, + "require": { + "psr/container": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/Interop/Container/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "symfony/class-loader", + "version": "v3.4.30", + "source": { + "type": "git", + "url": "https://github.com/symfony/class-loader.git", + "reference": "4459eef5298dedfb69f771186a580062b8516497" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/4459eef5298dedfb69f771186a580062b8516497", + "reference": "4459eef5298dedfb69f771186a580062b8516497", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "require-dev": { + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/polyfill-apcu": "~1.1" + }, + "suggest": { + "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\ClassLoader\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "https://symfony.com", + "time": "2019-01-16T09:39:14+00:00" + }, + { + "name": "symfony/config", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "a17a2aea43950ce83a0603ed301bac362eb86870" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/a17a2aea43950ce83a0603ed301bac362eb86870", + "reference": "a17a2aea43950ce83a0603ed301bac362eb86870", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/filesystem": "~3.4|~4.0", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/finder": "<3.4" + }, + "require-dev": { + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/finder": "~3.4|~4.0", + "symfony/messenger": "~4.1", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2019-07-18T10:34:59+00:00" + }, + { + "name": "symfony/console", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", + "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/service-contracts": "^1.1" + }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3", + "symfony/process": "<3.3" + }, + "provide": { + "psr/log-implementation": "1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "^4.3", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.4|~4.0", + "symfony/var-dumper": "^4.3" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2019-07-24T17:13:59+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "9ad1b83d474ae17156f6914cb81ffe77aeac3a9b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9ad1b83d474ae17156f6914cb81ffe77aeac3a9b", + "reference": "9ad1b83d474ae17156f6914cb81ffe77aeac3a9b", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0", + "symfony/service-contracts": "^1.1.2" + }, + "conflict": { + "symfony/config": "<4.3", + "symfony/finder": "<3.4", + "symfony/proxy-manager-bridge": "<3.4", + "symfony/yaml": "<3.4" + }, + "provide": { + "psr/container-implementation": "1.0", + "symfony/service-implementation": "1.0" + }, + "require-dev": { + "symfony/config": "^4.3", + "symfony/expression-language": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", + "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "https://symfony.com", + "time": "2019-07-26T07:03:43+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "212b020949331b6531250584531363844b34a94e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/212b020949331b6531250584531363844b34a94e", + "reference": "212b020949331b6531250584531363844b34a94e", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/event-dispatcher-contracts": "^1.1" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/http-foundation": "^3.4|^4.0", + "symfony/service-contracts": "^1.1", + "symfony/stopwatch": "~3.4|~4.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2019-06-27T06:42:14+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "c61766f4440ca687de1084a5c00b08e167a2575c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c", + "reference": "c61766f4440ca687de1084a5c00b08e167a2575c", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-20T06:46:26+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "b9896d034463ad6fd2bf17e2bf9418caecd6313d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b9896d034463ad6fd2bf17e2bf9418caecd6313d", + "reference": "b9896d034463ad6fd2bf17e2bf9418caecd6313d", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2019-06-23T08:51:25+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "82ebae02209c21113908c229e9883c419720738a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v1.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", + "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-13T11:15:36+00:00" + }, + { + "name": "symfony/translation", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "4e3e39cc485304f807622bdc64938e4633396406" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/4e3e39cc485304f807622bdc64938e4633396406", + "reference": "4e3e39cc485304f807622bdc64938e4633396406", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^1.1.2" + }, + "conflict": { + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" + }, + "provide": { + "symfony/translation-implementation": "1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/service-contracts": "^1.1.2", + "symfony/var-dumper": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "psr/log-implementation": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "https://symfony.com", + "time": "2019-07-18T10:34:59+00:00" + }, + { + "name": "symfony/translation-contracts", + "version": "v1.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/cb4b18ad7b92a26e83b65dde940fab78339e6f3c", + "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "symfony/translation-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-13T11:15:36+00:00" + }, + { + "name": "symfony/yaml", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/34d29c2acd1ad65688f58452fd48a46bd996d5a6", + "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" + }, + "require-dev": { + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2019-07-24T14:47:54+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^7.1.0" + }, + "platform-dev": [] +} diff --git a/test/fixtures/ci/behat/features/bootstrap/FeatureContext.php b/test/fixtures/ci/behat/features/bootstrap/FeatureContext.php new file mode 100644 index 000000000..fcde4c1ee --- /dev/null +++ b/test/fixtures/ci/behat/features/bootstrap/FeatureContext.php @@ -0,0 +1,22 @@ +=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.5|~5", + "symfony/phpunit-bridge": "~2.7|~3|~4", + "symfony/yaml": "~2.3|~3|~4" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Gherkin": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], + "time": "2019-01-16T14:22:17+00:00" + }, + { + "name": "codeception/codeception", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Codeception.git", + "reference": "feb566a9dc26993611602011ae3834d8e3c1dd7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/feb566a9dc26993611602011ae3834d8e3c1dd7f", + "reference": "feb566a9dc26993611602011ae3834d8e3c1dd7f", + "shasum": "" + }, + "require": { + "behat/gherkin": "^4.4.0", + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3", + "codeception/stub": "^2.0", + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "facebook/webdriver": "^1.6.0", + "guzzlehttp/guzzle": "^6.3.0", + "guzzlehttp/psr7": "~1.4", + "hoa/console": "~3.0", + "php": ">=5.6.0 <8.0", + "symfony/browser-kit": ">=2.7 <5.0", + "symfony/console": ">=2.7 <5.0", + "symfony/css-selector": ">=2.7 <5.0", + "symfony/dom-crawler": ">=2.7 <5.0", + "symfony/event-dispatcher": ">=2.7 <5.0", + "symfony/finder": ">=2.7 <5.0", + "symfony/yaml": ">=2.7 <5.0" + }, + "require-dev": { + "codeception/specify": "~0.3", + "doctrine/annotations": "^1", + "doctrine/orm": "^2", + "flow/jsonpath": "~0.2", + "monolog/monolog": "~1.8", + "pda/pheanstalk": "~3.0", + "php-amqplib/php-amqplib": "~2.4", + "predis/predis": "^1.0", + "squizlabs/php_codesniffer": "~2.0", + "symfony/process": ">=2.7 <5.0", + "vlucas/phpdotenv": "^3.0" + }, + "suggest": { + "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module", + "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests", + "codeception/specify": "BDD-style code blocks", + "codeception/verify": "BDD-style assertions", + "flow/jsonpath": "For using JSONPath in REST module", + "league/factory-muffin": "For DataFactory module", + "league/factory-muffin-faker": "For Faker support in DataFactory module", + "phpseclib/phpseclib": "for SFTP option in FTP Module", + "stecman/symfony-console-completion": "For BASH autocompletion", + "symfony/phpunit-bridge": "For phpunit-bridge support" + }, + "bin": [ + "codecept" + ], + "type": "library", + "extra": { + "branch-alias": [] + }, + "autoload": { + "psr-4": { + "Codeception\\": "src/Codeception", + "Codeception\\Extension\\": "ext" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" + } + ], + "description": "BDD-style testing framework", + "homepage": "http://codeception.com/", + "keywords": [ + "BDD", + "TDD", + "acceptance testing", + "functional testing", + "unit testing" + ], + "time": "2019-07-18T16:21:08+00:00" + }, + { + "name": "codeception/phpunit-wrapper", + "version": "8.0.4", + "source": { + "type": "git", + "url": "https://github.com/Codeception/phpunit-wrapper.git", + "reference": "7090736f36b4398cae6ef838b9a2bdfe8d8d104b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7090736f36b4398cae6ef838b9a2bdfe8d8d104b", + "reference": "7090736f36b4398cae6ef838b9a2bdfe8d8d104b", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "phpunit/php-code-coverage": "^7.0", + "phpunit/phpunit": "^8.0", + "sebastian/comparator": "^3.0", + "sebastian/diff": "^3.0" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\PHPUnit\\": "src\\" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Davert", + "email": "davert.php@resend.cc" + } + ], + "description": "PHPUnit classes used by Codeception", + "time": "2019-02-27T12:58:57+00:00" + }, + { + "name": "codeception/stub", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Stub.git", + "reference": "853657f988942f7afb69becf3fd0059f192c705a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a", + "reference": "853657f988942f7afb69becf3fd0059f192c705a", + "shasum": "" + }, + "require": { + "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", + "time": "2019-03-02T15:35:10+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "a2c590166b2133a4633738648b6b064edae0814a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", + "reference": "a2c590166b2133a4633738648b6b064edae0814a", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-shim": "^0.11", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2019-03-17T17:37:11+00:00" + }, + { + "name": "facebook/webdriver", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/facebook/php-webdriver.git", + "reference": "e43de70f3c7166169d0f14a374505392734160e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5", + "reference": "e43de70f3c7166169d0f14a374505392734160e5", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-zip": "*", + "php": "^5.6 || ~7.0", + "symfony/process": "^2.8 || ^3.1 || ^4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.0", + "jakub-onderka/php-parallel-lint": "^0.9.2", + "php-coveralls/php-coveralls": "^2.0", + "php-mock/php-mock-phpunit": "^1.1", + "phpunit/phpunit": "^5.7", + "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0", + "squizlabs/php_codesniffer": "^2.6", + "symfony/var-dumper": "^3.3 || ^4.0" + }, + "suggest": { + "ext-SimpleXML": "For Firefox profile creation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-community": "1.5-dev" + } + }, + "autoload": { + "psr-4": { + "Facebook\\WebDriver\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "A PHP client for Selenium WebDriver", + "homepage": "https://github.com/facebook/php-webdriver", + "keywords": [ + "facebook", + "php", + "selenium", + "webdriver" + ], + "time": "2019-06-13T08:02:18+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.3.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.4", + "php": ">=5.5" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "psr/log": "^1.0" + }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.3-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2018-04-22T15:46:56+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2016-12-20T10:07:11+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.6.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + }, + "suggest": { + "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "time": "2019-07-01T23:21:34+00:00" + }, + { + "name": "hoa/consistency", + "version": "1.17.05.02", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Consistency.git", + "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f", + "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f", + "shasum": "" + }, + "require": { + "hoa/exception": "~1.0", + "php": ">=5.5.0" + }, + "require-dev": { + "hoa/stream": "~1.0", + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Consistency\\": "." + }, + "files": [ + "Prelude.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Consistency library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "autoloader", + "callable", + "consistency", + "entity", + "flex", + "keyword", + "library" + ], + "time": "2017-05-02T12:18:12+00:00" + }, + { + "name": "hoa/console", + "version": "3.17.05.02", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Console.git", + "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Console/zipball/e231fd3ea70e6d773576ae78de0bdc1daf331a66", + "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0", + "hoa/exception": "~1.0", + "hoa/file": "~1.0", + "hoa/protocol": "~1.0", + "hoa/stream": "~1.0", + "hoa/ustring": "~4.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "suggest": { + "ext-pcntl": "To enable hoa://Event/Console/Window:resize.", + "hoa/dispatcher": "To use the console kit.", + "hoa/router": "To use the console kit." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Console\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Console library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "autocompletion", + "chrome", + "cli", + "console", + "cursor", + "getoption", + "library", + "option", + "parser", + "processus", + "readline", + "terminfo", + "tput", + "window" + ], + "time": "2017-05-02T12:26:19+00:00" + }, + { + "name": "hoa/event", + "version": "1.17.01.13", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Event.git", + "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54", + "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Event\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Event library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "event", + "library", + "listener", + "observer" + ], + "time": "2017-01-13T15:30:50+00:00" + }, + { + "name": "hoa/exception", + "version": "1.17.01.16", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Exception.git", + "reference": "091727d46420a3d7468ef0595651488bfc3a458f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f", + "reference": "091727d46420a3d7468ef0595651488bfc3a458f", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Exception\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Exception library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "exception", + "library" + ], + "time": "2017-01-16T07:53:27+00:00" + }, + { + "name": "hoa/file", + "version": "1.17.07.11", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/File.git", + "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", + "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0", + "hoa/exception": "~1.0", + "hoa/iterator": "~2.0", + "hoa/stream": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\File\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\File library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "Socket", + "directory", + "file", + "finder", + "library", + "link", + "temporary" + ], + "time": "2017-07-11T07:42:15+00:00" + }, + { + "name": "hoa/iterator", + "version": "2.17.01.10", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Iterator.git", + "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc", + "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Iterator\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Iterator library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "iterator", + "library" + ], + "time": "2017-01-10T10:34:47+00:00" + }, + { + "name": "hoa/protocol", + "version": "1.17.01.14", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Protocol.git", + "reference": "5c2cf972151c45f373230da170ea015deecf19e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2", + "reference": "5c2cf972151c45f373230da170ea015deecf19e2", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Protocol\\": "." + }, + "files": [ + "Wrapper.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Protocol library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "library", + "protocol", + "resource", + "stream", + "wrapper" + ], + "time": "2017-01-14T12:26:10+00:00" + }, + { + "name": "hoa/stream", + "version": "1.17.02.21", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Stream.git", + "reference": "3293cfffca2de10525df51436adf88a559151d82" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82", + "reference": "3293cfffca2de10525df51436adf88a559151d82", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/event": "~1.0", + "hoa/exception": "~1.0", + "hoa/protocol": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Stream\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Stream library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "Context", + "bucket", + "composite", + "filter", + "in", + "library", + "out", + "protocol", + "stream", + "wrapper" + ], + "time": "2017-02-21T16:01:06+00:00" + }, + { + "name": "hoa/ustring", + "version": "4.17.01.16", + "source": { + "type": "git", + "url": "https://github.com/hoaproject/Ustring.git", + "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0", + "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0", + "shasum": "" + }, + "require": { + "hoa/consistency": "~1.0", + "hoa/exception": "~1.0" + }, + "require-dev": { + "hoa/test": "~2.0" + }, + "suggest": { + "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().", + "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "Hoa\\Ustring\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Ivan Enderlin", + "email": "ivan.enderlin@hoa-project.net" + }, + { + "name": "Hoa community", + "homepage": "https://hoa-project.net/" + } + ], + "description": "The Hoa\\Ustring library.", + "homepage": "https://hoa-project.net/", + "keywords": [ + "library", + "search", + "string", + "unicode" + ], + "time": "2017-01-16T07:08:25+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.9.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2019-04-07T13:18:21+00:00" + }, + { + "name": "phar-io/manifest", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^2.0", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2018-07-08T19:23:20+00:00" + }, + { + "name": "phar-io/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "role": "Developer", + "email": "arne@blankerts.de" + }, + { + "name": "Sebastian Heuer", + "role": "Developer", + "email": "sebastian@phpeople.de" + }, + { + "name": "Sebastian Bergmann", + "role": "Developer", + "email": "sebastian@phpunit.de" + } + ], + "description": "Library for handling version information and constraints", + "time": "2018-07-08T19:19:57+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2017-09-11T18:02:19+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "4.3.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "shasum": "" + }, + "require": { + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2019-04-30T17:48:53+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.4.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "shasum": "" + }, + "require": { + "php": "^5.5 || ^7.0", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2017-07-14T14:27:02+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "1.8.1", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8.x-dev" + } + }, + "autoload": { + "psr-4": { + "Prophecy\\": "src/Prophecy" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2019-06-13T12:50:23+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "7.0.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7743bbcfff2a907e9ee4a25be13d0f8ec5e73800", + "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.2", + "phpunit/php-file-iterator": "^2.0.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^3.1.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^4.2.2", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1.3" + }, + "require-dev": { + "phpunit/phpunit": "^8.2.2" + }, + "suggest": { + "ext-xdebug": "^2.7.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "7.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "role": "lead", + "email": "sebastian@phpunit.de" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2019-07-25T05:31:54+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "050bedf145a257b1ff02746c31894800e5122946" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2018-09-13T20:33:42+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "2.1.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2019-06-07T04:22:29+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2019-07-25T05:29:42+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "8.2.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "c1b8534b3730f20f58600124129197bf1183dc92" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1b8534b3730f20f58600124129197bf1183dc92", + "reference": "c1b8534b3730f20f58600124129197bf1183dc92", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.2.0", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.9.1", + "phar-io/manifest": "^1.0.3", + "phar-io/version": "^2.0.1", + "php": "^7.2", + "phpspec/prophecy": "^1.8.1", + "phpunit/php-code-coverage": "^7.0.5", + "phpunit/php-file-iterator": "^2.0.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^2.1.2", + "sebastian/comparator": "^3.0.2", + "sebastian/diff": "^3.0.2", + "sebastian/environment": "^4.2.2", + "sebastian/exporter": "^3.1.0", + "sebastian/global-state": "^3.0.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^2.0.1", + "sebastian/type": "^1.1.3", + "sebastian/version": "^2.0.1" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-soap": "*", + "ext-xdebug": "*", + "phpunit/php-invoker": "^2.0.0" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "8.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "role": "lead", + "email": "sebastian@phpunit.de" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2019-07-15T06:26:24+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" + }, + { + "name": "sebastian/comparator", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "shasum": "" + }, + "require": { + "php": "^7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2018-07-12T15:12:46+00:00" + }, + { + "name": "sebastian/diff", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^2 || ^3.3 || ^4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "time": "2019-02-04T06:01:07+00:00" + }, + { + "name": "sebastian/environment", + "version": "4.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404", + "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2019-05-05T09:05:15+00:00" + }, + { + "name": "sebastian/exporter", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2017-04-03T13:19:02+00:00" + }, + { + "name": "sebastian/global-state", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "shasum": "" + }, + "require": { + "php": "^7.2", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^8.0" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2019-02-01T05:30:01+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "shasum": "" + }, + "require": { + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2017-03-03T06:23:57+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2018-10-04T04:07:39+00:00" + }, + { + "name": "sebastian/type", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3", + "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3", + "shasum": "" + }, + "require": { + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "time": "2019-07-02T08:10:15+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "symfony/browser-kit", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "a29dd02a1f3f81b9a15c7730cc3226718ddb55ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/a29dd02a1f3f81b9a15c7730cc3226718ddb55ca", + "reference": "a29dd02a1f3f81b9a15c7730cc3226718ddb55ca", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/dom-crawler": "~3.4|~4.0" + }, + "require-dev": { + "symfony/css-selector": "~3.4|~4.0", + "symfony/http-client": "^4.3", + "symfony/mime": "^4.3", + "symfony/process": "~3.4|~4.0" + }, + "suggest": { + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "https://symfony.com", + "time": "2019-06-11T15:41:59+00:00" + }, + { + "name": "symfony/console", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", + "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/service-contracts": "^1.1" + }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3", + "symfony/process": "<3.3" + }, + "provide": { + "psr/log-implementation": "1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "^4.3", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.4|~4.0", + "symfony/var-dumper": "^4.3" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2019-07-24T17:13:59+00:00" + }, + { + "name": "symfony/css-selector", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/105c98bb0c5d8635bea056135304bd8edcc42b4d", + "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2019-01-16T21:53:39+00:00" + }, + { + "name": "symfony/dom-crawler", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "291397232a2eefb3347eaab9170409981eaad0e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291397232a2eefb3347eaab9170409981eaad0e2", + "reference": "291397232a2eefb3347eaab9170409981eaad0e2", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "masterminds/html5": "<2.6" + }, + "require-dev": { + "masterminds/html5": "^2.6", + "symfony/css-selector": "~3.4|~4.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "https://symfony.com", + "time": "2019-06-13T11:03:18+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "212b020949331b6531250584531363844b34a94e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/212b020949331b6531250584531363844b34a94e", + "reference": "212b020949331b6531250584531363844b34a94e", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/event-dispatcher-contracts": "^1.1" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/http-foundation": "^3.4|^4.0", + "symfony/service-contracts": "^1.1", + "symfony/stopwatch": "~3.4|~4.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2019-06-27T06:42:14+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "c61766f4440ca687de1084a5c00b08e167a2575c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c", + "reference": "c61766f4440ca687de1084a5c00b08e167a2575c", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-20T06:46:26+00:00" + }, + { + "name": "symfony/finder", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/9638d41e3729459860bb96f6247ccb61faaa45f2", + "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2019-06-28T13:16:30+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "82ebae02209c21113908c229e9883c419720738a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2019-02-06T07:57:58+00:00" + }, + { + "name": "symfony/process", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/856d35814cf287480465bb7a6c413bb7f5f5e69c", + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "time": "2019-05-30T16:10:05+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v1.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", + "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-13T11:15:36+00:00" + }, + { + "name": "symfony/yaml", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/34d29c2acd1ad65688f58452fd48a46bd996d5a6", + "reference": "34d29c2acd1ad65688f58452fd48a46bd996d5a6", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" + }, + "require-dev": { + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2019-07-24T14:47:54+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2019-06-13T22:48:21+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2018-12-25T11:19:39+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^7.1.0" + }, + "platform-dev": [] +} diff --git a/test/fixtures/ci/codeception/tests/_data/.gitkeep b/test/fixtures/ci/codeception/tests/_data/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/ci/codeception/tests/_output/.gitkeep b/test/fixtures/ci/codeception/tests/_output/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/ci/codeception/tests/_support/AcceptanceTester.php b/test/fixtures/ci/codeception/tests/_support/AcceptanceTester.php new file mode 100644 index 000000000..95c00ec21 --- /dev/null +++ b/test/fixtures/ci/codeception/tests/_support/AcceptanceTester.php @@ -0,0 +1,26 @@ +getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Authenticates user for HTTP_AUTH + * + * @param $username + * @param $password + * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated() + */ + public function amHttpAuthenticated($username, $password) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Open web page at the given absolute URL and sets its hostname as the base host. + * + * ``` php + * amOnUrl('http://codeception.com'); + * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart + * ?> + * ``` + * @see \Codeception\Module\PhpBrowser::amOnUrl() + */ + public function amOnUrl($url) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Changes the subdomain for the 'url' configuration parameter. + * Does not open a page; use `amOnPage` for that. + * + * ``` php + * amOnSubdomain('user'); + * $I->amOnPage('/'); + * // moves to http://user.mysite.com/ + * ?> + * ``` + * + * @param $subdomain + * + * @return mixed + * @see \Codeception\Module\PhpBrowser::amOnSubdomain() + */ + public function amOnSubdomain($subdomain) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Low-level API method. + * If Codeception commands are not enough, use [Guzzle HTTP Client](http://guzzlephp.org/) methods directly + * + * Example: + * + * ``` php + * executeInGuzzle(function (\GuzzleHttp\Client $client) { + * $client->get('/get', ['query' => ['foo' => 'bar']]); + * }); + * ?> + * ``` + * + * It is not recommended to use this command on a regular basis. + * If Codeception lacks important Guzzle Client methods, implement them and submit patches. + * + * @param callable $function + * @see \Codeception\Module\PhpBrowser::executeInGuzzle() + */ + public function executeInGuzzle($function) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Sets the HTTP header to the passed value - which is used on + * subsequent HTTP requests through PhpBrowser. + * + * Example: + * ```php + * haveHttpHeader('X-Requested-With', 'Codeception'); + * $I->amOnPage('test-headers.php'); + * ?> + * ``` + * + * To use special chars in Header Key use HTML Character Entities: + * Example: + * Header with underscore - 'Client_Id' + * should be represented as - 'Client_Id' or 'Client_Id' + * + * ```php + * haveHttpHeader('Client_Id', 'Codeception'); + * ?> + * ``` + * + * @param string $name the name of the request header + * @param string $value the value to set it to for subsequent + * requests + * @see \Codeception\Lib\InnerBrowser::haveHttpHeader() + */ + public function haveHttpHeader($name, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Deletes the header with the passed name. Subsequent requests + * will not have the deleted header in its request. + * + * Example: + * ```php + * haveHttpHeader('X-Requested-With', 'Codeception'); + * $I->amOnPage('test-headers.php'); + * // ... + * $I->deleteHeader('X-Requested-With'); + * $I->amOnPage('some-other-page.php'); + * ?> + * ``` + * + * @param string $name the name of the header to delete. + * @see \Codeception\Lib\InnerBrowser::deleteHeader() + */ + public function deleteHeader($name) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Opens the page for the given relative URI. + * + * ``` php + * amOnPage('/'); + * // opens /register page + * $I->amOnPage('/register'); + * ``` + * + * @param string $page + * @see \Codeception\Lib\InnerBrowser::amOnPage() + */ + public function amOnPage($page) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Perform a click on a link or a button, given by a locator. + * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string. + * For buttons, the "value" attribute, "name" attribute, and inner text are searched. + * For links, the link text is searched. + * For images, the "alt" attribute and inner text of any parent links are searched. + * + * The second parameter is a context (CSS or XPath locator) to narrow the search. + * + * Note that if the locator matches a button of type `submit`, the form will be submitted. + * + * ``` php + * click('Logout'); + * // button of form + * $I->click('Submit'); + * // CSS button + * $I->click('#form input[type=submit]'); + * // XPath + * $I->click('//form/*[@type="submit"]'); + * // link in context + * $I->click('Logout', '#nav'); + * // using strict locator + * $I->click(['link' => 'Login']); + * ?> + * ``` + * + * @param $link + * @param $context + * @see \Codeception\Lib\InnerBrowser::click() + */ + public function click($link, $context = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string (case insensitive). + * + * You can specify a specific HTML element (via CSS or XPath) as the second + * parameter to only search within that element. + * + * ``` php + * see('Logout'); // I can suppose user is logged in + * $I->see('Sign Up', 'h1'); // I can suppose it's a signup page + * $I->see('Sign Up', '//body/h1'); // with XPath + * $I->see('Sign Up', ['css' => 'body h1']); // with strict CSS locator + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->see('strong')` will return true for strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will *not* be true for strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param string $text + * @param array|string $selector optional + * @see \Codeception\Lib\InnerBrowser::see() + */ + public function see($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current page contains the given string (case insensitive). + * + * You can specify a specific HTML element (via CSS or XPath) as the second + * parameter to only search within that element. + * + * ``` php + * see('Logout'); // I can suppose user is logged in + * $I->see('Sign Up', 'h1'); // I can suppose it's a signup page + * $I->see('Sign Up', '//body/h1'); // with XPath + * $I->see('Sign Up', ['css' => 'body h1']); // with strict CSS locator + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->see('strong')` will return true for strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will *not* be true for strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param string $text + * @param array|string $selector optional + * @see \Codeception\Lib\InnerBrowser::see() + */ + public function canSee($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page doesn't contain the text specified (case insensitive). + * Give a locator as the second parameter to match a specific region. + * + * ```php + * dontSee('Login'); // I can suppose user is already logged in + * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page + * $I->dontSee('Sign Up','//body/h1'); // with XPath + * $I->dontSee('Sign Up', ['css' => 'body h1']); // with strict CSS locator + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->dontSee('strong')` will fail on strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will ignore strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param string $text + * @param array|string $selector optional + * @see \Codeception\Lib\InnerBrowser::dontSee() + */ + public function dontSee($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSee', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current page doesn't contain the text specified (case insensitive). + * Give a locator as the second parameter to match a specific region. + * + * ```php + * dontSee('Login'); // I can suppose user is already logged in + * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page + * $I->dontSee('Sign Up','//body/h1'); // with XPath + * $I->dontSee('Sign Up', ['css' => 'body h1']); // with strict CSS locator + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->dontSee('strong')` will fail on strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will ignore strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param string $text + * @param array|string $selector optional + * @see \Codeception\Lib\InnerBrowser::dontSee() + */ + public function cantSee($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string in its + * raw source code. + * + * ``` php + * seeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * @see \Codeception\Lib\InnerBrowser::seeInSource() + */ + public function seeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current page contains the given string in its + * raw source code. + * + * ``` php + * seeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * @see \Codeception\Lib\InnerBrowser::seeInSource() + */ + public function canSeeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string in its + * raw source code. + * + * ```php + * dontSeeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * @see \Codeception\Lib\InnerBrowser::dontSeeInSource() + */ + public function dontSeeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeInSource', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current page contains the given string in its + * raw source code. + * + * ```php + * dontSeeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * @see \Codeception\Lib\InnerBrowser::dontSeeInSource() + */ + public function cantSeeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there's a link with the specified text. + * Give a full URL as the second parameter to match links with that exact URL. + * + * ``` php + * seeLink('Logout'); // matches Logout + * $I->seeLink('Logout','/logout'); // matches Logout + * ?> + * ``` + * + * @param string $text + * @param string $url optional + * @see \Codeception\Lib\InnerBrowser::seeLink() + */ + public function seeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that there's a link with the specified text. + * Give a full URL as the second parameter to match links with that exact URL. + * + * ``` php + * seeLink('Logout'); // matches Logout + * $I->seeLink('Logout','/logout'); // matches Logout + * ?> + * ``` + * + * @param string $text + * @param string $url optional + * @see \Codeception\Lib\InnerBrowser::seeLink() + */ + public function canSeeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page doesn't contain a link with the given string. + * If the second parameter is given, only links with a matching "href" attribute will be checked. + * + * ``` php + * dontSeeLink('Logout'); // I suppose user is not logged in + * $I->dontSeeLink('Checkout now', '/store/cart.php'); + * ?> + * ``` + * + * @param string $text + * @param string $url optional + * @see \Codeception\Lib\InnerBrowser::dontSeeLink() + */ + public function dontSeeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeLink', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the page doesn't contain a link with the given string. + * If the second parameter is given, only links with a matching "href" attribute will be checked. + * + * ``` php + * dontSeeLink('Logout'); // I suppose user is not logged in + * $I->dontSeeLink('Checkout now', '/store/cart.php'); + * ?> + * ``` + * + * @param string $text + * @param string $url optional + * @see \Codeception\Lib\InnerBrowser::dontSeeLink() + */ + public function cantSeeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that current URI contains the given string. + * + * ``` php + * seeInCurrentUrl('home'); + * // to match: /users/1 + * $I->seeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl() + */ + public function seeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that current URI contains the given string. + * + * ``` php + * seeInCurrentUrl('home'); + * // to match: /users/1 + * $I->seeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl() + */ + public function canSeeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URI doesn't contain the given string. + * + * ``` php + * dontSeeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl() + */ + public function dontSeeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeInCurrentUrl', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current URI doesn't contain the given string. + * + * ``` php + * dontSeeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl() + */ + public function cantSeeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL is equal to the given string. + * Unlike `seeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * seeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals() + */ + public function seeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current URL is equal to the given string. + * Unlike `seeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * seeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals() + */ + public function canSeeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL doesn't equal the given string. + * Unlike `dontSeeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * dontSeeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals() + */ + public function dontSeeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeCurrentUrlEquals', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current URL doesn't equal the given string. + * Unlike `dontSeeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * dontSeeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals() + */ + public function cantSeeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL matches the given regular expression. + * + * ``` php + * seeCurrentUrlMatches('~^/users/(\d+)~'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches() + */ + public function seeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the current URL matches the given regular expression. + * + * ``` php + * seeCurrentUrlMatches('~^/users/(\d+)~'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches() + */ + public function canSeeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that current url doesn't match the given regular expression. + * + * ``` php + * dontSeeCurrentUrlMatches('~^/users/(\d+)~'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches() + */ + public function dontSeeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeCurrentUrlMatches', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that current url doesn't match the given regular expression. + * + * ``` php + * dontSeeCurrentUrlMatches('~^/users/(\d+)~'); + * ?> + * ``` + * + * @param string $uri + * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches() + */ + public function cantSeeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Executes the given regular expression against the current URI and returns the first capturing group. + * If no parameters are provided, the full URI is returned. + * + * ``` php + * grabFromCurrentUrl('~^/user/(\d+)/~'); + * $uri = $I->grabFromCurrentUrl(); + * ?> + * ``` + * + * @param string $uri optional + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl() + */ + public function grabFromCurrentUrl($uri = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the specified checkbox is checked. + * + * ``` php + * seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form. + * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]'); + * ?> + * ``` + * + * @param $checkbox + * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked() + */ + public function seeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the specified checkbox is checked. + * + * ``` php + * seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form. + * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]'); + * ?> + * ``` + * + * @param $checkbox + * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked() + */ + public function canSeeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Check that the specified checkbox is unchecked. + * + * ``` php + * dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form. + * ?> + * ``` + * + * @param $checkbox + * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked() + */ + public function dontSeeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeCheckboxIsChecked', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Check that the specified checkbox is unchecked. + * + * ``` php + * dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form. + * ?> + * ``` + * + * @param $checkbox + * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked() + */ + public function cantSeeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given input field or textarea *equals* (i.e. not just contains) the given value. + * Fields are matched by label text, the "name" attribute, CSS, or XPath. + * + * ``` php + * seeInField('Body','Type your comment here'); + * $I->seeInField('form textarea[name=body]','Type your comment here'); + * $I->seeInField('form input[type=hidden]','hidden_value'); + * $I->seeInField('#searchform input','Search'); + * $I->seeInField('//form/*[@name=search]','Search'); + * $I->seeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Lib\InnerBrowser::seeInField() + */ + public function seeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the given input field or textarea *equals* (i.e. not just contains) the given value. + * Fields are matched by label text, the "name" attribute, CSS, or XPath. + * + * ``` php + * seeInField('Body','Type your comment here'); + * $I->seeInField('form textarea[name=body]','Type your comment here'); + * $I->seeInField('form input[type=hidden]','hidden_value'); + * $I->seeInField('#searchform input','Search'); + * $I->seeInField('//form/*[@name=search]','Search'); + * $I->seeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Lib\InnerBrowser::seeInField() + */ + public function canSeeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that an input field or textarea doesn't contain the given value. + * For fuzzy locators, the field is matched by label text, CSS and XPath. + * + * ``` php + * dontSeeInField('Body','Type your comment here'); + * $I->dontSeeInField('form textarea[name=body]','Type your comment here'); + * $I->dontSeeInField('form input[type=hidden]','hidden_value'); + * $I->dontSeeInField('#searchform input','Search'); + * $I->dontSeeInField('//form/*[@name=search]','Search'); + * $I->dontSeeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Lib\InnerBrowser::dontSeeInField() + */ + public function dontSeeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeInField', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that an input field or textarea doesn't contain the given value. + * For fuzzy locators, the field is matched by label text, CSS and XPath. + * + * ``` php + * dontSeeInField('Body','Type your comment here'); + * $I->dontSeeInField('form textarea[name=body]','Type your comment here'); + * $I->dontSeeInField('form input[type=hidden]','hidden_value'); + * $I->dontSeeInField('#searchform input','Search'); + * $I->dontSeeInField('//form/*[@name=search]','Search'); + * $I->dontSeeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Lib\InnerBrowser::dontSeeInField() + */ + public function cantSeeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks if the array of form parameters (name => value) are set on the form matched with the + * passed selector. + * + * ``` php + * seeInFormFields('form[name=myform]', [ + * 'input1' => 'value', + * 'input2' => 'other value', + * ]); + * ?> + * ``` + * + * For multi-select elements, or to check values of multiple elements with the same name, an + * array may be passed: + * + * ``` php + * seeInFormFields('.form-class', [ + * 'multiselect' => [ + * 'value1', + * 'value2', + * ], + * 'checkbox[]' => [ + * 'a checked value', + * 'another checked value', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * seeInFormFields('#form-id', [ + * 'checkbox1' => true, // passes if checked + * 'checkbox2' => false, // passes if unchecked + * ]); + * ?> + * ``` + * + * Pair this with submitForm for quick testing magic. + * + * ``` php + * 'value', + * 'field2' => 'another value', + * 'checkbox1' => true, + * // ... + * ]; + * $I->submitForm('//form[@id=my-form]', $form, 'submitButton'); + * // $I->amOnPage('/path/to/form-page') may be needed + * $I->seeInFormFields('//form[@id=my-form]', $form); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * @see \Codeception\Lib\InnerBrowser::seeInFormFields() + */ + public function seeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks if the array of form parameters (name => value) are set on the form matched with the + * passed selector. + * + * ``` php + * seeInFormFields('form[name=myform]', [ + * 'input1' => 'value', + * 'input2' => 'other value', + * ]); + * ?> + * ``` + * + * For multi-select elements, or to check values of multiple elements with the same name, an + * array may be passed: + * + * ``` php + * seeInFormFields('.form-class', [ + * 'multiselect' => [ + * 'value1', + * 'value2', + * ], + * 'checkbox[]' => [ + * 'a checked value', + * 'another checked value', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * seeInFormFields('#form-id', [ + * 'checkbox1' => true, // passes if checked + * 'checkbox2' => false, // passes if unchecked + * ]); + * ?> + * ``` + * + * Pair this with submitForm for quick testing magic. + * + * ``` php + * 'value', + * 'field2' => 'another value', + * 'checkbox1' => true, + * // ... + * ]; + * $I->submitForm('//form[@id=my-form]', $form, 'submitButton'); + * // $I->amOnPage('/path/to/form-page') may be needed + * $I->seeInFormFields('//form[@id=my-form]', $form); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * @see \Codeception\Lib\InnerBrowser::seeInFormFields() + */ + public function canSeeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks if the array of form parameters (name => value) are not set on the form matched with + * the passed selector. + * + * ``` php + * dontSeeInFormFields('form[name=myform]', [ + * 'input1' => 'non-existent value', + * 'input2' => 'other non-existent value', + * ]); + * ?> + * ``` + * + * To check that an element hasn't been assigned any one of many values, an array can be passed + * as the value: + * + * ``` php + * dontSeeInFormFields('.form-class', [ + * 'fieldName' => [ + * 'This value shouldn\'t be set', + * 'And this value shouldn\'t be set', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * dontSeeInFormFields('#form-id', [ + * 'checkbox1' => true, // fails if checked + * 'checkbox2' => false, // fails if unchecked + * ]); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields() + */ + public function dontSeeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeInFormFields', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks if the array of form parameters (name => value) are not set on the form matched with + * the passed selector. + * + * ``` php + * dontSeeInFormFields('form[name=myform]', [ + * 'input1' => 'non-existent value', + * 'input2' => 'other non-existent value', + * ]); + * ?> + * ``` + * + * To check that an element hasn't been assigned any one of many values, an array can be passed + * as the value: + * + * ``` php + * dontSeeInFormFields('.form-class', [ + * 'fieldName' => [ + * 'This value shouldn\'t be set', + * 'And this value shouldn\'t be set', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * dontSeeInFormFields('#form-id', [ + * 'checkbox1' => true, // fails if checked + * 'checkbox2' => false, // fails if unchecked + * ]); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields() + */ + public function cantSeeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Submits the given form on the page, with the given form + * values. Pass the form field's values as an array in the second + * parameter. + * + * Although this function can be used as a short-hand version of + * `fillField()`, `selectOption()`, `click()` etc. it has some important + * differences: + * + * * Only field *names* may be used, not CSS/XPath selectors nor field labels + * * If a field is sent to this function that does *not* exist on the page, + * it will silently be added to the HTTP request. This is helpful for testing + * some types of forms, but be aware that you will *not* get an exception + * like you would if you called `fillField()` or `selectOption()` with + * a missing field. + * + * Fields that are not provided will be filled by their values from the page, + * or from any previous calls to `fillField()`, `selectOption()` etc. + * You don't need to click the 'Submit' button afterwards. + * This command itself triggers the request to form's action. + * + * You can optionally specify which button's value to include + * in the request with the last parameter (as an alternative to + * explicitly setting its value in the second parameter), as + * button values are not otherwise included in the request. + * + * Examples: + * + * ``` php + * submitForm('#login', [ + * 'login' => 'davert', + * 'password' => '123456' + * ]); + * // or + * $I->submitForm('#login', [ + * 'login' => 'davert', + * 'password' => '123456' + * ], 'submitButtonName'); + * + * ``` + * + * For example, given this sample "Sign Up" form: + * + * ``` html + *
+ * Login: + *
+ * Password: + *
+ * Do you agree to our terms? + *
+ * Select pricing plan: + * + * + *
+ * ``` + * + * You could write the following to submit it: + * + * ``` php + * submitForm( + * '#userForm', + * [ + * 'user' => [ + * 'login' => 'Davert', + * 'password' => '123456', + * 'agree' => true + * ] + * ], + * 'submitButton' + * ); + * ``` + * Note that "2" will be the submitted value for the "plan" field, as it is + * the selected option. + * + * You can also emulate a JavaScript submission by not specifying any + * buttons in the third parameter to submitForm. + * + * ```php + * submitForm( + * '#userForm', + * [ + * 'user' => [ + * 'login' => 'Davert', + * 'password' => '123456', + * 'agree' => true + * ] + * ] + * ); + * ``` + * + * This function works well when paired with `seeInFormFields()` + * for quickly testing CRUD interfaces and form validation logic. + * + * ``` php + * 'value', + * 'field2' => 'another value', + * 'checkbox1' => true, + * // ... + * ]; + * $I->submitForm('#my-form', $form, 'submitButton'); + * // $I->amOnPage('/path/to/form-page') may be needed + * $I->seeInFormFields('#my-form', $form); + * ``` + * + * Parameter values can be set to arrays for multiple input fields + * of the same name, or multi-select combo boxes. For checkboxes, + * you can use either the string value or boolean `true`/`false` which will + * be replaced by the checkbox's value in the DOM. + * + * ``` php + * submitForm('#my-form', [ + * 'field1' => 'value', + * 'checkbox' => [ + * 'value of first checkbox', + * 'value of second checkbox', + * ], + * 'otherCheckboxes' => [ + * true, + * false, + * false + * ], + * 'multiselect' => [ + * 'first option value', + * 'second option value' + * ] + * ]); + * ``` + * + * Mixing string and boolean values for a checkbox's value is not supported + * and may produce unexpected results. + * + * Field names ending in `[]` must be passed without the trailing square + * bracket characters, and must contain an array for its value. This allows + * submitting multiple values with the same name, consider: + * + * ```php + * submitForm('#my-form', [ + * 'field[]' => 'value', + * 'field[]' => 'another value', // 'field[]' is already a defined key + * ]); + * ``` + * + * The solution is to pass an array value: + * + * ```php + * submitForm('#my-form', [ + * 'field' => [ + * 'value', + * 'another value', + * ] + * ]); + * ``` + * + * @param $selector + * @param $params + * @param $button + * @see \Codeception\Lib\InnerBrowser::submitForm() + */ + public function submitForm($selector, $params, $button = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Fills a text field or textarea with the given string. + * + * ``` php + * fillField("//input[@type='text']", "Hello World!"); + * $I->fillField(['name' => 'email'], 'jon@mail.com'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Lib\InnerBrowser::fillField() + */ + public function fillField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Selects an option in a select tag or in radio button group. + * + * ``` php + * selectOption('form select[name=account]', 'Premium'); + * $I->selectOption('form input[name=payment]', 'Monthly'); + * $I->selectOption('//form/select[@name=account]', 'Monthly'); + * ?> + * ``` + * + * Provide an array for the second argument to select multiple options: + * + * ``` php + * selectOption('Which OS do you use?', array('Windows','Linux')); + * ?> + * ``` + * + * Or provide an associative array for the second argument to specifically define which selection method should be used: + * + * ``` php + * selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows' + * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows' + * ?> + * ``` + * + * @param $select + * @param $option + * @see \Codeception\Lib\InnerBrowser::selectOption() + */ + public function selectOption($select, $option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Ticks a checkbox. For radio buttons, use the `selectOption` method instead. + * + * ``` php + * checkOption('#agree'); + * ?> + * ``` + * + * @param $option + * @see \Codeception\Lib\InnerBrowser::checkOption() + */ + public function checkOption($option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Unticks a checkbox. + * + * ``` php + * uncheckOption('#notify'); + * ?> + * ``` + * + * @param $option + * @see \Codeception\Lib\InnerBrowser::uncheckOption() + */ + public function uncheckOption($option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Attaches a file relative to the Codeception `_data` directory to the given file upload field. + * + * ``` php + * attachFile('input[@type="file"]', 'prices.xls'); + * ?> + * ``` + * + * @param $field + * @param $filename + * @see \Codeception\Lib\InnerBrowser::attachFile() + */ + public function attachFile($field, $filename) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * If your page triggers an ajax request, you can perform it manually. + * This action sends a GET ajax request with specified params. + * + * See ->sendAjaxPostRequest for examples. + * + * @param $uri + * @param $params + * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest() + */ + public function sendAjaxGetRequest($uri, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * If your page triggers an ajax request, you can perform it manually. + * This action sends a POST ajax request with specified params. + * Additional params can be passed as array. + * + * Example: + * + * Imagine that by clicking checkbox you trigger ajax request which updates user settings. + * We emulate that click by running this ajax request manually. + * + * ``` php + * sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST + * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET + * + * ``` + * + * @param $uri + * @param $params + * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest() + */ + public function sendAjaxPostRequest($uri, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * If your page triggers an ajax request, you can perform it manually. + * This action sends an ajax request with specified method and params. + * + * Example: + * + * You need to perform an ajax request specifying the HTTP method. + * + * ``` php + * sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title')); + * + * ``` + * + * @param $method + * @param $uri + * @param $params + * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest() + */ + public function sendAjaxRequest($method, $uri, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Saves current page's HTML into a temprary file. + * Use this method in debug mode within an interactive pause to get a source code of current page. + * + * ```php + * makeHtmlSnapshot('edit_page'); + * // saved to: tests/_output/debug/edit_page.html + * $I->makeHtmlSnapshot(); + * // saved to: tests/_output/debug/2017-05-26_14-24-11_4b3403665fea6.html + * ``` + * + * @param null $name + * @see \Codeception\Lib\InnerBrowser::makeHtmlSnapshot() + */ + public function makeHtmlSnapshot($name = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('makeHtmlSnapshot', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Finds and returns the text contents of the given element. + * If a fuzzy locator is used, the element is found using CSS, XPath, + * and by matching the full page source by regular expression. + * + * ``` php + * grabTextFrom('h1'); + * $heading = $I->grabTextFrom('descendant-or-self::h1'); + * $value = $I->grabTextFrom('~ + * ``` + * + * @param $cssOrXPathOrRegex + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::grabTextFrom() + */ + public function grabTextFrom($cssOrXPathOrRegex) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs the value of the given attribute value from the given element. + * Fails if element is not found. + * + * ``` php + * grabAttributeFrom('#tooltip', 'title'); + * ?> + * ``` + * + * + * @param $cssOrXpath + * @param $attribute + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom() + */ + public function grabAttributeFrom($cssOrXpath, $attribute) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs either the text content, or attribute values, of nodes + * matched by $cssOrXpath and returns them as an array. + * + * ```html + * First + * Second + * Third + * ``` + * + * ```php + * grabMultiple('a'); + * + * // would return ['#first', '#second', '#third'] + * $aLinks = $I->grabMultiple('a', 'href'); + * ?> + * ``` + * + * @param $cssOrXpath + * @param $attribute + * @return string[] + * @see \Codeception\Lib\InnerBrowser::grabMultiple() + */ + public function grabMultiple($cssOrXpath, $attribute = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * @param $field + * + * @return array|mixed|null|string + * @see \Codeception\Lib\InnerBrowser::grabValueFrom() + */ + public function grabValueFrom($field) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Sets a cookie with the given name and value. + * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument. + * + * ``` php + * setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3'); + * ?> + * ``` + * + * @param $name + * @param $val + * @param array $params + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::setCookie() + */ + public function setCookie($name, $val, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs a cookie value. + * You can set additional cookie params like `domain`, `path` in array passed as last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Lib\InnerBrowser::grabCookie() + */ + public function grabCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs current page source code. + * + * @throws ModuleException if no page was opened. + * + * @return string Current page source code. + * @see \Codeception\Lib\InnerBrowser::grabPageSource() + */ + public function grabPageSource() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabPageSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that a cookie with the given name is set. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * ``` php + * seeCookie('PHPSESSID'); + * ?> + * ``` + * + * @param $cookie + * @param array $params + * @return mixed + * @see \Codeception\Lib\InnerBrowser::seeCookie() + */ + public function seeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that a cookie with the given name is set. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * ``` php + * seeCookie('PHPSESSID'); + * ?> + * ``` + * + * @param $cookie + * @param array $params + * @return mixed + * @see \Codeception\Lib\InnerBrowser::seeCookie() + */ + public function canSeeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there isn't a cookie with the given name. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Lib\InnerBrowser::dontSeeCookie() + */ + public function dontSeeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeCookie', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that there isn't a cookie with the given name. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Lib\InnerBrowser::dontSeeCookie() + */ + public function cantSeeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Unsets cookie with the given name. + * You can set additional cookie params like `domain`, `path` in array passed as last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Lib\InnerBrowser::resetCookie() + */ + public function resetCookie($name, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element exists on the page and is visible. + * You can also specify expected attributes of this element. + * + * ``` php + * seeElement('.error'); + * $I->seeElement('//form/input[1]'); + * $I->seeElement('input', ['name' => 'login']); + * $I->seeElement('input', ['value' => '123456']); + * + * // strict locator in first arg, attributes in second + * $I->seeElement(['css' => 'form input'], ['name' => 'login']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @return + * @see \Codeception\Lib\InnerBrowser::seeElement() + */ + public function seeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the given element exists on the page and is visible. + * You can also specify expected attributes of this element. + * + * ``` php + * seeElement('.error'); + * $I->seeElement('//form/input[1]'); + * $I->seeElement('input', ['name' => 'login']); + * $I->seeElement('input', ['value' => '123456']); + * + * // strict locator in first arg, attributes in second + * $I->seeElement(['css' => 'form input'], ['name' => 'login']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @return + * @see \Codeception\Lib\InnerBrowser::seeElement() + */ + public function canSeeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element is invisible or not present on the page. + * You can also specify expected attributes of this element. + * + * ``` php + * dontSeeElement('.error'); + * $I->dontSeeElement('//form/input[1]'); + * $I->dontSeeElement('input', ['name' => 'login']); + * $I->dontSeeElement('input', ['value' => '123456']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @see \Codeception\Lib\InnerBrowser::dontSeeElement() + */ + public function dontSeeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeElement', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the given element is invisible or not present on the page. + * You can also specify expected attributes of this element. + * + * ``` php + * dontSeeElement('.error'); + * $I->dontSeeElement('//form/input[1]'); + * $I->dontSeeElement('input', ['name' => 'login']); + * $I->dontSeeElement('input', ['value' => '123456']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @see \Codeception\Lib\InnerBrowser::dontSeeElement() + */ + public function cantSeeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there are a certain number of elements matched by the given locator on the page. + * + * ``` php + * seeNumberOfElements('tr', 10); + * $I->seeNumberOfElements('tr', [0,10]); // between 0 and 10 elements + * ?> + * ``` + * @param $selector + * @param mixed $expected int or int[] + * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements() + */ + public function seeNumberOfElements($selector, $expected) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that there are a certain number of elements matched by the given locator on the page. + * + * ``` php + * seeNumberOfElements('tr', 10); + * $I->seeNumberOfElements('tr', [0,10]); // between 0 and 10 elements + * ?> + * ``` + * @param $selector + * @param mixed $expected int or int[] + * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements() + */ + public function canSeeNumberOfElements($selector, $expected) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given option is selected. + * + * ``` php + * seeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected() + */ + public function seeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the given option is selected. + * + * ``` php + * seeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected() + */ + public function canSeeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given option is not selected. + * + * ``` php + * dontSeeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected() + */ + public function dontSeeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeOptionIsSelected', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the given option is not selected. + * + * ``` php + * dontSeeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected() + */ + public function cantSeeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Asserts that current page has 404 response status code. + * @see \Codeception\Lib\InnerBrowser::seePageNotFound() + */ + public function seePageNotFound() { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Asserts that current page has 404 response status code. + * @see \Codeception\Lib\InnerBrowser::seePageNotFound() + */ + public function canSeePageNotFound() { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that response code is equal to value provided. + * + * ```php + * seeResponseCodeIs(200); + * + * // recommended \Codeception\Util\HttpCode + * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK); + * ``` + * + * @param $code + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs() + */ + public function seeResponseCodeIs($code) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that response code is equal to value provided. + * + * ```php + * seeResponseCodeIs(200); + * + * // recommended \Codeception\Util\HttpCode + * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK); + * ``` + * + * @param $code + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs() + */ + public function canSeeResponseCodeIs($code) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that response code is between a certain range. Between actually means [from <= CODE <= to] + * + * @param $from + * @param $to + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsBetween() + */ + public function seeResponseCodeIsBetween($from, $to) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsBetween', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that response code is between a certain range. Between actually means [from <= CODE <= to] + * + * @param $from + * @param $to + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsBetween() + */ + public function canSeeResponseCodeIsBetween($from, $to) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsBetween', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that response code is equal to value provided. + * + * ```php + * dontSeeResponseCodeIs(200); + * + * // recommended \Codeception\Util\HttpCode + * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK); + * ``` + * @param $code + * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs() + */ + public function dontSeeResponseCodeIs($code) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeResponseCodeIs', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that response code is equal to value provided. + * + * ```php + * dontSeeResponseCodeIs(200); + * + * // recommended \Codeception\Util\HttpCode + * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK); + * ``` + * @param $code + * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs() + */ + public function cantSeeResponseCodeIs($code) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the response code 2xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsSuccessful() + */ + public function seeResponseCodeIsSuccessful() { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsSuccessful', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the response code 2xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsSuccessful() + */ + public function canSeeResponseCodeIsSuccessful() { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsSuccessful', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the response code 3xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsRedirection() + */ + public function seeResponseCodeIsRedirection() { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsRedirection', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the response code 3xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsRedirection() + */ + public function canSeeResponseCodeIsRedirection() { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsRedirection', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the response code is 4xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsClientError() + */ + public function seeResponseCodeIsClientError() { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsClientError', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the response code is 4xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsClientError() + */ + public function canSeeResponseCodeIsClientError() { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsClientError', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the response code is 5xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsServerError() + */ + public function seeResponseCodeIsServerError() { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIsServerError', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the response code is 5xx + * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIsServerError() + */ + public function canSeeResponseCodeIsServerError() { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIsServerError', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page title contains the given string. + * + * ``` php + * seeInTitle('Blog - Post #1'); + * ?> + * ``` + * + * @param $title + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::seeInTitle() + */ + public function seeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the page title contains the given string. + * + * ``` php + * seeInTitle('Blog - Post #1'); + * ?> + * ``` + * + * @param $title + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::seeInTitle() + */ + public function canSeeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page title does not contain the given string. + * + * @param $title + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle() + */ + public function dontSeeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('dontSeeInTitle', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * [!] Conditional Assertion: Test won't be stopped on fail + * Checks that the page title does not contain the given string. + * + * @param $title + * + * @return mixed + * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle() + */ + public function cantSeeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Switch to iframe or frame on the page. + * + * Example: + * ``` html + *