Merge remote-tracking branch 'php/master' into tests_psalm_phpstan_phpseclib

Author: danog

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
     resource_class: arm.medium
     docker:
       - image: cimg/base:current-22.04
-      - image: mysql:8
+      - image: mysql:8.3
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: true
           MYSQL_ROOT_PASSWORD: ''
@@ -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,8 +169,10 @@ 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 \
+              -d zend_test.observer.enabled=1 \
+              -d zend_test.observer.show_output=0 \
               -P -q -x -j2 \
               -g FAIL,BORK,LEAK,XLEAK \
               --no-progress \

.cirrus.yml

@@ -3,18 +3,20 @@ env:
 
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  timeout_in: 50m
   freebsd_instance:
-    image_family: freebsd-13-2
+    image_family: freebsd-13-3
+  skip: "changesIncludeOnly('docs/**', 'NEWS', 'UPGRADING', 'UPGRADING.INTERNALS', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md', '.circleci/**', 'EXTENSIONS', '**.md', 'docs-old/**')"
   env:
     ARCH: amd64
   install_script:
     #- 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 --enable-werror --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
@@ -25,4 +27,5 @@ freebsd_task:
   tests_script:
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
+    - export STACK_LIMIT_DEFAULTS_CHECK=1
     - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

.gdbinit

@@ -482,7 +482,7 @@ end
 
 define print_pi
 	set $pi = (zend_property_info *)$arg0
-	set $initial_offset = ((uint32_t)(zend_uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
+	set $initial_offset = ((uint32_t)(uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
 	set $ptr_to_val = (zval*)((char*)$pi->ce->default_properties_table + $pi->offset - $initial_offset)
 	printf "[%p] {\n", $pi
 	printf "    offset = %p\n", $pi->offset

.gitattributes

@@ -19,10 +19,15 @@
 *.php diff=php
 *.[ch] diff=cpp
 
-# Collapse generated files within a pull request.
-**/*_arginfo.h linguist-generated
-/Zend/zend_vm_execute.h linguist-generated
-/Zend/zend_vm_opcodes.{h,c} linguist-generated
+# Collapse generated files within git and pull request diff.
+**/*_arginfo.h linguist-generated -diff
+/main/gdb_inlined_script.c linguist-generated -diff
+/Zend/zend_vm_execute.h linguist-generated -diff
+/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

@@ -0,0 +1,78 @@
+# The following volunteers have self-identified as subject matter experts
+# or interested parties over a particular area of the php-src source code.
+# While requesting a review from someone does not obligate that person to
+# review a pull request, these reviewers might have valuable knowledge of
+# the problem area and could aid in deciding whether a pull request is ready
+# for merging.
+#
+# When changing this file, please make sure to commit the changes to the
+# earliest supported PHP branch (PHP-X.Y) and not only to the master branch.
+# GitHub reads the CODEOWNERS file from the pull request's targeted branch.
+# Commit changes here similar to bug fixes:
+# https://github.com/php/php-src/blob/master/CONTRIBUTING.md#pull-requests
+#
+# For more information, see the GitHub CODEOWNERS documentation:
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+/.github @TimWolla
+/build/gen_stub.php @kocsismate
+/ext/bcmath @Girgias @nielsdos @SakiTakamachi
+/ext/curl @adoy
+/ext/date @derickr
+/ext/dba @Girgias
+/ext/dom @nielsdos
+/ext/ffi @dstogov
+/ext/gd @devnexen
+/ext/gettext @devnexen
+/ext/gmp @Girgias
+/ext/intl @devnexen
+/ext/json @bukka
+/ext/libxml @nielsdos
+/ext/mbstring @alexdowad @youkidearitai
+/ext/mysqlnd @SakiTakamachi
+/ext/odbc @NattyNarwhal
+/ext/opcache @dstogov
+/ext/openssl @bukka
+/ext/pcntl @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
+/ext/simplexml @nielsdos
+/ext/soap @nielsdos
+/ext/sockets @devnexen
+/ext/spl @Girgias
+/ext/standard @bukka
+/ext/xml @nielsdos
+/ext/xmlreader @nielsdos
+/ext/xmlwriter @nielsdos
+/ext/xsl @nielsdos
+/main @bukka
+/sapi/fpm @bukka
+/Zend/Optimizer @dstogov
+/Zend/zend.* @dstogov
+/Zend/zend_alloc.* @dstogov
+/Zend/zend_API.* @dstogov
+/Zend/zend_call_stack.* @arnaud-lb
+/Zend/zend_closures.* @dstogov
+/Zend/zend_execute.* @dstogov
+/Zend/zend_execute_API.c @dstogov
+/Zend/zend_gc.* @dstogov @arnaud-lb
+/Zend/zend_hash.* @dstogov
+/Zend/zend_inheritance.* @dstogov
+/Zend/zend_max_execution_timer.* @arnaud-lb
+/Zend/zend_object_handlers.* @dstogov
+/Zend/zend_objects.* @dstogov
+/Zend/zend_objects_API.* @dstogov
+/Zend/zend_opcode.* @dstogov
+/Zend/zend_string.* @dstogov
+/Zend/zend_type*.h @dstogov
+/Zend/zend_variables.* @dstogov
+/Zend/zend_vm* @dstogov
+*.stub.php @kocsismate

.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/apk/action.yml

@@ -0,0 +1,56 @@
+name: apk
+runs:
+  using: composite
+  steps:
+    - shell: sh
+      run: |
+        set -x
+
+        apk update -q
+        apk add \
+            util-linux \
+            bash \
+            sudo \
+            build-base \
+            autoconf \
+            unzip \
+            tar \
+            bison \
+            re2c \
+            pkgconf \
+            mysql-client \
+            bzip2-dev \
+            curl-dev \
+            freetype-dev \
+            gettext-dev \
+            gnu-libiconv-dev \
+            gmp-dev \
+            icu-dev \
+            icu-data-full \
+            jpeg-dev \
+            libffi-dev \
+            libpng-dev \
+            libsodium-dev \
+            libwebp-dev \
+            libxml2-dev \
+            libxpm-dev \
+            libxslt-dev \
+            libzip-dev \
+            oniguruma-dev \
+            openssl-dev \
+            readline-dev \
+            sqlite-dev \
+            tidyhtml-dev \
+            gdbm-dev \
+            lmdb-dev \
+            argon2-dev \
+            enchant2-dev \
+            freetds-dev \
+            imap-dev \
+            net-snmp-dev \
+            openldap-dev \
+            unixodbc-dev \
+            postgresql14-dev \
+            tzdata \
+            musl-locales \
+            musl-locales-lang

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

@@ -17,33 +17,27 @@ 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 \
           libsqlite3-dev:i386 \
           libssl-dev:i386 \
-          libtidy-dev:i386 \
           libwebp-dev:i386 \
           libxml2-dev:i386 \
           libxml2-dev:i386 \
           libxpm-dev:i386 \
           libxslt1-dev:i386 \
-          libzip-dev:i386 \
           locales \
           make \
           pkg-config:i386 \

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

@@ -1,13 +1,30 @@
 name: apt
+inputs:
+  asan:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
     - shell: bash
       run: |
         set -x
 
-        sudo apt-get update
-        sudo apt-get install \
+        export DEBIAN_FRONTEND=noninteractive
+
+        # Install sudo in Docker for consistent actions
+        if ! type "sudo" > /dev/null; then
+          apt-get update -y | true
+          apt-get install -y sudo
+        fi
+
+        sudo apt-get update -y | true
+        sudo apt-get install -y \
+          autoconf \
+          gcc \
+          make \
+          curl \
+          unzip \
           bison \
           re2c \
           locales \
@@ -19,24 +36,23 @@ runs:
           libicu-dev \
           libtidy-dev \
           libenchant-2-dev \
-          libaspell-dev \
-          libpspell-dev \
+          libbz2-dev \
           libsasl2-dev \
           libxpm-dev \
           libzip-dev \
           libsqlite3-dev \
+          libsqlite3-mod-spatialite \
           libwebp-dev \
+          ${{ inputs.asan == 'false' && 'libavif-dev' || '' }} \
           libonig-dev \
-          libkrb5-dev \
-          libgssapi-krb5-2 \
           libcurl4-openssl-dev \
           libxml2-dev \
           libxslt1-dev \
           libpq-dev \
-          libreadline-dev \
+          libedit-dev \
           libldap2-dev \
           libsodium-dev \
-          libargon2-0-dev \
+          libargon2-dev \
           libmm-dev \
           libsnmp-dev \
           postgresql \
@@ -46,7 +62,7 @@ runs:
           freetds-dev \
           unixodbc-dev \
           llvm \
-          libc-client-dev \
+          clang \
           dovecot-core \
           dovecot-pop3d \
           dovecot-imapd \