Skip to content

Commit 54a8258

Browse files
cytopiacytopia
authored
Merge pull request #81 from devilbox/pspell
Re-enable pspell for PHP 7.0, 7.1, 7.2 and 7.3
2 parents 16e6537 + 33bb1f5 commit 54a8258

6 files changed

Lines changed: 40 additions & 5 deletions

File tree

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
3939
libnghttp2-dev \
4040
libpng-dev \
4141
libpq-dev \
42+
libpspell-dev \
4243
librabbitmq-dev \
4344
librdkafka-dev \
4445
librecode-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
5960
git
6061

6162
ENV RUN_DEPS \
63+
libaspell15 \
6264
libc-client2007e \
6365
libenchant1c2a \
6466
libfbclient2 \
@@ -302,6 +304,11 @@ RUN set -x \
302304
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
303305
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
304306
\
307+
# ---- Installing PHP Extension: pspell ----
308+
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
309+
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
310+
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
311+
\
305312
# ---- Installing PHP Extension: recode ----
306313
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
307314
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -546,6 +553,8 @@ RUN set -x \
546553
&& php-fpm -m | grep -oiE '^phalcon$' \
547554
&& php -m | grep -oiE '^posix$' \
548555
&& php-fpm -m | grep -oiE '^posix$' \
556+
&& php -m | grep -oiE '^pspell$' \
557+
&& php-fpm -m | grep -oiE '^pspell$' \
549558
&& php -m | grep -oiE '^readline$' \
550559
&& php-fpm -m | grep -oiE '^readline$' \
551560
&& php -m | grep -oiE '^recode$' \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
3939
libnghttp2-dev \
4040
libpng-dev \
4141
libpq-dev \
42+
libpspell-dev \
4243
librabbitmq-dev \
4344
librdkafka-dev \
4445
librecode-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
5960
git
6061

6162
ENV RUN_DEPS \
63+
libaspell15 \
6264
libc-client2007e \
6365
libenchant1c2a \
6466
libfbclient2 \
@@ -297,6 +299,11 @@ RUN set -x \
297299
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
298300
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
299301
\
302+
# ---- Installing PHP Extension: pspell ----
303+
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
304+
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
305+
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
306+
\
300307
# ---- Installing PHP Extension: recode ----
301308
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
302309
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -543,6 +550,8 @@ RUN set -x \
543550
&& php-fpm -m | grep -oiE '^phar$' \
544551
&& php -m | grep -oiE '^posix$' \
545552
&& php-fpm -m | grep -oiE '^posix$' \
553+
&& php -m | grep -oiE '^pspell$' \
554+
&& php-fpm -m | grep -oiE '^pspell$' \
546555
&& php -m | grep -oiE '^readline$' \
547556
&& php-fpm -m | grep -oiE '^readline$' \
548557
&& php -m | grep -oiE '^recode$' \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
3939
libnghttp2-dev \
4040
libpng-dev \
4141
libpq-dev \
42+
libpspell-dev \
4243
librabbitmq-dev \
4344
librdkafka-dev \
4445
librecode-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
5960
git
6061

6162
ENV RUN_DEPS \
63+
libaspell15 \
6264
libc-client2007e \
6365
libenchant1c2a \
6466
libfbclient2 \
@@ -298,6 +300,11 @@ RUN set -x \
298300
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
299301
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
300302
\
303+
# ---- Installing PHP Extension: pspell ----
304+
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
305+
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
306+
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
307+
\
301308
# ---- Installing PHP Extension: recode ----
302309
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
303310
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -544,6 +551,8 @@ RUN set -x \
544551
&& php-fpm -m | grep -oiE '^phar$' \
545552
&& php -m | grep -oiE '^posix$' \
546553
&& php-fpm -m | grep -oiE '^posix$' \
554+
&& php -m | grep -oiE '^pspell$' \
555+
&& php-fpm -m | grep -oiE '^pspell$' \
547556
&& php -m | grep -oiE '^readline$' \
548557
&& php-fpm -m | grep -oiE '^readline$' \
549558
&& php -m | grep -oiE '^recode$' \

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ENV BUILD_DEPS \
4040
libnghttp2-dev \
4141
libpng-dev \
4242
libpq-dev \
43+
libpspell-dev \
4344
librdkafka-dev \
4445
librecode-dev \
4546
libsasl2-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
5960
git
6061

6162
ENV RUN_DEPS \
63+
libaspell15 \
6264
libc-client2007e \
6365
libenchant1c2a \
6466
libfbclient2 \
@@ -257,6 +259,11 @@ RUN set -x \
257259
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
258260
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
259261
\
262+
# ---- Installing PHP Extension: pspell ----
263+
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
264+
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
265+
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
266+
\
260267
# ---- Installing PHP Extension: recode ----
261268
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
262269
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -508,6 +515,8 @@ RUN set -x \
508515
&& php-fpm -m | grep -oiE '^phar$' \
509516
&& php -m | grep -oiE '^posix$' \
510517
&& php-fpm -m | grep -oiE '^posix$' \
518+
&& php -m | grep -oiE '^pspell$' \
519+
&& php-fpm -m | grep -oiE '^pspell$' \
511520
&& php -m | grep -oiE '^readline$' \
512521
&& php-fpm -m | grep -oiE '^readline$' \
513522
&& php -m | grep -oiE '^recode$' \

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,22 +551,22 @@ Check out this table to see which Docker image provides what PHP modules.
551551
<tr>
552552
<th>7.0</th>
553553
<td id="70-base">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, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
554-
<td id="70-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
554+
<td id="70-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
555555
</tr>
556556
<tr>
557557
<th>7.1</th>
558558
<td id="71-base">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, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
559-
<td id="71-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
559+
<td id="71-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
560560
</tr>
561561
<tr>
562562
<th>7.2</th>
563563
<td id="72-base">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</td>
564-
<td id="72-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
564+
<td id="72-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
565565
</tr>
566566
<tr>
567567
<th>7.3</th>
568568
<td id="73-base">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</td>
569-
<td id="73-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
569+
<td id="73-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
570570
</tr>
571571
<tr>
572572
<th>7.4</th>

‎build/ansible/group_vars/all.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,6 @@ extensions_available:
12721272
all:
12731273
type: builtin
12741274
pspell:
1275-
disabled: [7.0, 7.1, 7.2, 7.3] # TODO: currently segfaults (https://bugs.php.net/bug.php?id=77099)
12761275
all:
12771276
type: builtin
12781277
build_dep: [libpspell-dev]

0 commit comments

Comments
 (0)