Skip to content

Commit cb046dd

Browse files
authored
Merge pull request #250 from devilbox/release-0.143
Added phalcon 5.x to PHP 8.0 and PHP 8.1
2 parents 70e3fc6 + e687ad1 commit cb046dd

File tree

5 files changed

+43
-3
lines changed

5 files changed

+43
-3
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
## Unreleased
55

66

7+
## Release 0.143
8+
9+
### Changed
10+
- Added `phalcon` 5.x to PHP 8.0 and PHP 8.1
11+
12+
713
## Release 0.142
814

915
### Fixed

Dockerfiles/mods/Dockerfile-8.0

+17
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,21 @@ RUN set -eux \
505505
&& true
506506

507507

508+
# -------------------- Installing PHP Extension: phalcon --------------------
509+
RUN set -eux \
510+
# Installation: Generic
511+
# Type: GIT extension
512+
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
513+
&& cd /tmp/phalcon \
514+
# Custom: Branch
515+
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
516+
# Custom: Install command
517+
&& cd build && ./install \
518+
# Enabling
519+
&& docker-php-ext-enable phalcon \
520+
&& true
521+
522+
508523
# -------------------- Installing PHP Extension: pspell --------------------
509524
RUN set -eux \
510525
# Installation: Generic
@@ -989,6 +1004,8 @@ RUN set -eux \
9891004
&& php-fpm -m | grep -oiE '^pgsql$' \
9901005
&& php -m | grep -oiE '^psr$' \
9911006
&& php-fpm -m | grep -oiE '^psr$' \
1007+
&& php -m | grep -oiE '^phalcon$' \
1008+
&& php-fpm -m | grep -oiE '^phalcon$' \
9921009
&& php -m | grep -oiE '^phar$' \
9931010
&& php-fpm -m | grep -oiE '^phar$' \
9941011
&& php -m | grep -oiE '^posix$' \

Dockerfiles/mods/Dockerfile-8.1

+17
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,21 @@ RUN set -eux \
483483
&& true
484484

485485

486+
# -------------------- Installing PHP Extension: phalcon --------------------
487+
RUN set -eux \
488+
# Installation: Generic
489+
# Type: GIT extension
490+
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
491+
&& cd /tmp/phalcon \
492+
# Custom: Branch
493+
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
494+
# Custom: Install command
495+
&& cd build && ./install \
496+
# Enabling
497+
&& docker-php-ext-enable phalcon \
498+
&& true
499+
500+
486501
# -------------------- Installing PHP Extension: pspell --------------------
487502
RUN set -eux \
488503
# Installation: Generic
@@ -974,6 +989,8 @@ RUN set -eux \
974989
&& php-fpm -m | grep -oiE '^pgsql$' \
975990
&& php -m | grep -oiE '^psr$' \
976991
&& php-fpm -m | grep -oiE '^psr$' \
992+
&& php -m | grep -oiE '^phalcon$' \
993+
&& php-fpm -m | grep -oiE '^phalcon$' \
977994
&& php -m | grep -oiE '^phar$' \
978995
&& php-fpm -m | grep -oiE '^phar$' \
979996
&& php -m | grep -oiE '^posix$' \

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -711,12 +711,12 @@ Check out this table to see which Docker image provides what PHP modules.
711711
<tr>
712712
<th>8.0</th>
713713
<td id="80-base">Core, ctype, curl, date, dom, FFI, 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>
714-
<td id="80-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
714+
<td id="80-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
715715
</tr>
716716
<tr>
717717
<th>8.1</th>
718718
<td id="81-base">Core, ctype, curl, date, dom, FFI, 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>
719-
<td id="81-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
719+
<td id="81-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
720720
</tr>
721721
<tr>
722722
<th>8.2</th>

build/ansible/group_vars/all/mods.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ extensions_available:
915915
all:
916916
type: pecl
917917
phalcon:
918-
disabled: [5.2, 8.0, 8.1, 8.2] # TODO: currently disabled for 7.4 as it breaks
918+
disabled: [5.2, 8.2] # TODO: currently disabled for 7.4 as it breaks
919919
5.3:
920920
type: git
921921
git_url: https://github.com/phalcon/cphalcon

0 commit comments

Comments
 (0)