[RFC] Allow more money symbols

.circleci/config.yml

@@ -46,17 +46,13 @@ jobs:
               libicu-dev \
               libtidy-dev \
               libenchant-2-dev \
-              libaspell-dev \
-              libpspell-dev \
               libsasl2-dev \
               libxpm-dev \
               libzip-dev \
               libbz2-dev \
               libsqlite3-dev \
               libwebp-dev \
               libonig-dev \
-              libkrb5-dev \
-              libgssapi-krb5-2 \
               libcurl4-openssl-dev \
               libxml2-dev \
               libxslt1-dev \
@@ -71,7 +67,6 @@ jobs:
               `#snmp-mibs-downloader` \
               freetds-dev \
               `#unixodbc-dev` \
-              libc-client-dev \
               dovecot-core \
               dovecot-pop3d \
               dovecot-imapd \
@@ -111,7 +106,6 @@ jobs:
               --enable-exif \
               --with-zip \
               --with-zlib \
-              --with-zlib-dir=/usr \
               --enable-soap \
               --enable-xmlreader \
               --with-xsl \
@@ -131,9 +125,7 @@ jobs:
               --enable-bcmath \
               --enable-calendar \
               --enable-ftp \
-              --with-pspell=/usr \
               --with-enchant=/usr \
-              --with-kerberos \
               --enable-sysvmsg \
               --with-ffi \
               --enable-zend-test \
@@ -152,12 +144,7 @@ jobs:
               --with-qdbm \
               --with-snmp \
               `#--with-unixODBC` \
-              --with-imap \
-              --with-kerberos \
-              --with-imap-ssl \
               `#--with-pdo-odbc=unixODBC,/usr` \
-              `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient` \
-              `#--with-oci8=shared,instantclient,/opt/oracle/instantclient` \
               --with-config-file-path=/etc \
               --with-config-file-scan-dir=/etc/php.d \
               --with-pdo-firebird \
@@ -182,7 +169,7 @@ jobs:
             sapi/cli/php run-tests.php \
               -d zend_extension=opcache.so \
               -d opcache.enable_cli=1 \
-              -d opcache.jit_buffer_size=16M \
+              -d opcache.jit_buffer_size=64M \
               -d opcache.jit=tracing \
               -P -q -x -j2 \
               -g FAIL,BORK,LEAK,XLEAK \

.cirrus.yml

@@ -11,10 +11,10 @@ freebsd_task:
     #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
     #- pkg upgrade -y
     - kldload accf_http
-    - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
+    - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
   script:
     - ./buildconf -f
-    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
+    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
     - gmake -j2
     - mkdir /etc/php.d
     - gmake install

.gitattributes

@@ -25,5 +25,8 @@
 /Zend/zend_vm_handlers.h linguist-generated -diff
 /Zend/zend_vm_opcodes.[ch] linguist-generated -diff
 
-# The OSS fuzz files are bunary
+# The OSS fuzz files are binary
 /ext/date/tests/ossfuzz*.txt binary
+
+# Vendored libraries
+/ext/dom/lexbor/lexbor linguist-vendored

.github/CODEOWNERS

@@ -18,16 +18,21 @@
 /ext/ffi @dstogov
 /ext/gettext @devnexen
 /ext/gmp @Girgias
-/ext/imap @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
 /ext/libxml @nielsdos
 /ext/mbstring @alexdowad
+/ext/mysqlnd @SakiTakamachi
 /ext/odbc @NattyNarwhal
 /ext/opcache @dstogov @iluuu1994
 /ext/openssl @bukka
-/ext/pdo_odbc @NattyNarwhal
-/ext/pdo_pgsql @devnexen
+/ext/pdo @SakiTakamachi
+/ext/pdo_dblib @SakiTakamachi
+/ext/pdo_firebird @SakiTakamachi
+/ext/pdo_mysql @SakiTakamachi
+/ext/pdo_odbc @NattyNarwhal @SakiTakamachi
+/ext/pdo_pgsql @devnexen @SakiTakamachi
+/ext/pdo_sqlite @SakiTakamachi
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias

.github/ISSUE_TEMPLATE/config.yml

@@ -3,6 +3,3 @@ contact_links:
   - name: Documentation issue
     url: https://github.com/php/doc-en/issues
     about: Please report documentation issues on the doc-en repository.
-  - name: Security issue
-    url: https://bugs.php.net/report.php?security_bug
-    about: Please report security issues in this private bug tracker.

.github/actions/apt-x32/action.yml

@@ -17,21 +17,17 @@ runs:
           g++-multilib \
           gcc-multilib \
           language-pack-de \
-          libaspell-dev:i386 \
           libbz2-dev:i386 \
           libc6:i386 \
           libcurl4-openssl-dev:i386 \
           libffi-dev:i386 \
           libfreetype6-dev:i386 \
           libgmp-dev:i386 \
-          libgssapi-krb5-2:i386 \
           libicu-dev:i386 \
           libjpeg-dev:i386 \
-          libkrb5-dev:i386 \
           libonig-dev:i386 \
           libpng-dev:i386 \
           libpq-dev:i386 \
-          libpspell-dev:i386 \
           libreadline-dev:i386 \
           libsasl2-dev:i386 \
           libsodium-dev:i386 \

.github/actions/apt-x64/action.yml

@@ -32,17 +32,14 @@ runs:
           libicu-dev \
           libtidy-dev \
           libenchant-2-dev \
-          libaspell-dev \
           libbz2-dev \
-          libpspell-dev \
           libsasl2-dev \
           libxpm-dev \
           libzip-dev \
           libsqlite3-dev \
+          libsqlite3-mod-spatialite \
           libwebp-dev \
           libonig-dev \
-          libkrb5-dev \
-          libgssapi-krb5-2 \
           libcurl4-openssl-dev \
           libxml2-dev \
           libxslt1-dev \
@@ -61,7 +58,6 @@ runs:
           unixodbc-dev \
           llvm \
           clang \
-          libc-client-dev \
           dovecot-core \
           dovecot-pop3d \
           dovecot-imapd \

.github/actions/brew/action.yml

@@ -19,7 +19,6 @@ runs:
         brew install \
           [email protected] \
           curl \
-          krb5 \
           bzip2 \
           enchant \
           libffi \
@@ -37,6 +36,7 @@ runs:
           tidy-html5 \
           libxml2 \
           libjpeg \
+          libsodium \
           libxslt \
           postgresql
         brew link icu4c gettext --force

.github/actions/configure-macos/action.yml

@@ -9,24 +9,24 @@ runs:
     - shell: bash
       run: |
         set -x
-        export PATH="/usr/local/opt/bison/bin:$PATH"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/[email protected]/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
+        BREW_OPT="$(brew --prefix)"/opt
+        export PATH="$BREW_OPT/bison/bin:$PATH"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/[email protected]/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
         ./buildconf --force
         ./configure \
           --enable-option-checking=fatal \
           --prefix=/usr/local \
           --enable-fpm \
           --with-pdo-mysql=mysqlnd \
           --with-mysqli=mysqlnd \
-          --with-pgsql=/usr/local/opt/libpq \
-          --with-pdo-pgsql=/usr/local/opt/libpq \
+          --with-pgsql="$BREW_OPT"/libpq \
+          --with-pdo-pgsql="$BREW_OPT"/libpq \
           --with-pdo-sqlite \
           --without-pear \
           --enable-gd \
@@ -39,26 +39,24 @@ runs:
           --enable-soap \
           --enable-xmlreader \
           --with-xsl \
-          --with-tidy=/usr/local/opt/tidy-html5 \
+          --with-tidy="$BREW_OPT"/tidy-html5 \
           --with-libxml \
           --enable-sysvsem \
           --enable-sysvshm \
           --enable-shmop \
           --enable-pcntl \
-          --with-readline=/usr/local/opt/readline \
+          --with-readline="$BREW_OPT"/readline \
           --enable-mbstring \
           --with-curl \
-          --with-gettext=/usr/local/opt/gettext \
+          --with-gettext="$BREW_OPT"/gettext \
           --enable-sockets \
-          --with-bz2=/usr/local/opt/bzip2 \
+          --with-bz2="$BREW_OPT"/bzip2 \
           --with-openssl \
-          --with-gmp=/usr/local/opt/gmp \
-          --with-iconv=/usr/local/opt/libiconv \
+          --with-gmp="$BREW_OPT"/gmp \
+          --with-iconv="$BREW_OPT"/libiconv \
           --enable-bcmath \
           --enable-calendar \
           --enable-ftp \
-          --with-pspell=/usr/local/opt/aspell \
-          --with-kerberos \
           --enable-sysvmsg \
           --with-ffi \
           --enable-zend-test \

.github/actions/configure-x32/action.yml

@@ -35,7 +35,6 @@ runs:
             --enable-exif \
             --with-zip \
             --with-zlib \
-            --with-zlib-dir=/usr \
             --enable-soap \
             --enable-xmlreader \
             --with-xsl \
@@ -55,8 +54,6 @@ runs:
             --enable-bcmath \
             --enable-calendar \
             --enable-ftp \
-            --with-pspell=/usr \
-            --with-kerberos \
             --enable-sysvmsg \
             --with-ffi \
             --enable-zend-test \

.github/actions/configure-x64/action.yml

@@ -33,7 +33,6 @@ runs:
           --enable-exif \
           --with-zip \
           --with-zlib \
-          --with-zlib-dir=/usr \
           --enable-soap \
           --enable-xmlreader \
           --with-xsl \
@@ -53,9 +52,7 @@ runs:
           --enable-bcmath \
           --enable-calendar \
           --enable-ftp \
-          --with-pspell=/usr \
           ${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
-          --with-kerberos \
           --enable-sysvmsg \
           --with-ffi \
           --enable-zend-test \
@@ -74,11 +71,7 @@ runs:
           --with-qdbm \
           ${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
           ${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
-          ${{ inputs.skipSlow == 'false' && '--with-imap' || '' }} \
-          ${{ inputs.skipSlow == 'false' && '--with-imap-ssl' || '' }} \
           ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
-          $([ -d "/opt/oracle/instantclient" ] && echo '--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient') \
-          $([ -d "/opt/oracle/instantclient" ] && echo '--with-oci8=shared,instantclient,/opt/oracle/instantclient') \
           --with-config-file-path=/etc \
           --with-config-file-scan-dir=/etc/php.d \
           ${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \

.github/actions/setup-x64/action.yml

@@ -23,9 +23,3 @@ runs:
         sudo cp ext/snmp/tests/snmpd.conf /etc/snmp
         sudo cp ext/snmp/tests/bigtest /etc/snmp
         sudo service snmpd restart
-
-        sudo groupadd -g 5000 vmail
-        sudo useradd -m -d /var/vmail -s /bin/false -u 5000 -g vmail vmail
-        sudo cp ext/imap/tests/setup/dovecot.conf /etc/dovecot/dovecot.conf
-        sudo cp ext/imap/tests/setup/dovecotpass /etc/dovecot/dovecotpass
-        sudo service dovecot restart

.github/actions/test-linux/action.yml

@@ -28,16 +28,14 @@ runs:
         export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
         export PDO_DBLIB_TEST_USER="pdo_test"
         export PDO_DBLIB_TEST_PASS="password"
-        export PHP_OCI8_TEST_USER="system"
-        export PHP_OCI8_TEST_PASS="pass"
-        export PHP_OCI8_TEST_DB="localhost/XEPDB1"
-        export PDO_OCI_TEST_USER="system"
-        export PDO_OCI_TEST_PASS="pass"
-        export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=postgres password=postgres"
         if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then
           export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres"
         fi
+        export PDO_FIREBIRD_TEST_DATABASE=test.fdb
+        export PDO_FIREBIRD_TEST_DSN=firebird:dbname=localhost:test.fdb
+        export PDO_FIREBIRD_TEST_PASS=test
+        export PDO_FIREBIRD_TEST_USER=test
         export ODBC_TEST_USER="odbc_test"
         export ODBC_TEST_PASS="password"
         export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
@@ -47,7 +45,8 @@ runs:
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
-          -d opcache.jit_buffer_size=16M \
+          -d opcache.protect_memory=1 \
+          -d opcache.jit_buffer_size=64M \
           ${{ inputs.idleCpu == 'true' && '-j$(($(/usr/bin/nproc) - 1))' || '-j$(/usr/bin/nproc)' }} \
           -g FAIL,BORK,LEAK,XLEAK \
           --no-progress \

.github/actions/test-macos/action.yml

@@ -21,7 +21,8 @@ runs:
         export STACK_LIMIT_DEFAULTS_CHECK=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
-          -d opcache.jit_buffer_size=16M \
+          -d opcache.protect_memory=1 \
+          -d opcache.jit_buffer_size=64M \
           -j$(($(sysctl -n hw.ncpu) - 1)) \
           -g FAIL,BORK,LEAK,XLEAK \
           --no-progress \

.github/actions/verify-generated-files/action.yml

@@ -4,12 +4,11 @@ runs:
   steps:
     - shell: bash
       run: |
-        set -x
-        [[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
+        set -ex
+        [[ "$OSTYPE" == "darwin"* ]] && export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
         scripts/dev/credits
         scripts/dev/genfiles
         Zend/zend_vm_gen.php
         ext/tokenizer/tokenizer_data_gen.php
-        build/gen_stub.php -f
-        build/gen_stub.php --generate-optimizer-info
+        build/gen_stub.php -f --generate-optimizer-info --verify
         git add . -N && git diff --exit-code