From 687a660baa84825e30fc5d3af8d8cc5cc6284c03 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 23 Apr 2019 09:02:52 +0200 Subject: [PATCH] Re-enable uploadprogress for PHP 8.0 --- Dockerfiles/mods/Dockerfile-8.0 | 20 ++++++++++++++++++++ README.md | 2 +- build/ansible/group_vars/all/mods.yml | 13 +++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index f165715..92866e5 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -368,6 +368,24 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/tidy || true) \ && (rm -rf /usr/local/lib/php/doc/tidy || true) \ \ +# ---- Installing PHP Extension: uploadprogress ---- + && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ + && cd /tmp/uploadprogress \ + && true \ +# FIXME: This is a work-around to mitigate compile error with PHP 8.0 +&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \ +&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \ +&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \ +&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \ +&& phpize \ +&& ./configure --enable-uploadprogress \ +&& make \ +&& make install \ + \ + && docker-php-ext-enable uploadprogress \ + && (rm -rf /usr/local/lib/php/test/uploadprogress || true) \ + && (rm -rf /usr/local/lib/php/doc/uploadprogress || true) \ + \ # ---- Installing PHP Extension: xmlrpc ---- && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ @@ -544,6 +562,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^tidy$' \ && php -m | grep -oiE '^tokenizer$' \ && php-fpm -m | grep -oiE '^tokenizer$' \ + && php -m | grep -oiE '^uploadprogress$' \ + && php-fpm -m | grep -oiE '^uploadprogress$' \ && php -m | grep -oiE '^xml$' \ && php-fpm -m | grep -oiE '^xml$' \ && php -m | grep -oiE '^xmlreader$' \ diff --git a/README.md b/README.md index 8af36e4..7679b8c 100644 --- a/README.md +++ b/README.md @@ -648,7 +648,7 @@ Check out this table to see which Docker image provides what PHP modules. 8.0 Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib + bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 010f001..c740f34 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -903,7 +903,6 @@ extensions_available: tokenizer: already_avail: "{{ php_all_versions }}" uploadprogress: - disabled: [8.0] #TODO: fixme 7.0: type: git git_url: https://github.com/php/pecl-php-uploadprogress @@ -927,7 +926,17 @@ extensions_available: 8.0: type: git git_url: https://github.com/php/pecl-php-uploadprogress - configure: --enable-uploadprogress + command: | + true \ + # FIXME: This is a work-around to mitigate compile error with PHP 8.0 + && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \ + && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \ + && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \ + && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \ + && phpize \ + && ./configure --enable-uploadprogress \ + && make \ + && make install \ all: type: pecl wddx: