Merge branch 'php:master' into master

Author: developersharif

.appveyor.yml

@@ -1,12 +1,12 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
-  ARCH: amd64
 
-freebsd_instance:
-  image_family: freebsd-13-0
-
-task:
+freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  freebsd_instance:
+    image_family: freebsd-13-2
+  env:
+    ARCH: amd64
   install_script:
     #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
     #- pkg upgrade -y
@@ -25,4 +25,212 @@ 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
+
+arm_task:
+  name: ARM_DEBUG_NTS
+  arm_container:
+    image: debian:12
+    additional_containers:
+      - name: mysql
+        image: mysql:8
+        port: 3306
+        cpu: 1.0
+        memory: 1G
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_ROOT_PASSWORD: ""
+          MYSQL_DATABASE: "test"
+      - name: postgres
+        image: postgres:latest
+        port: 5432
+        env:
+          POSTGRES_PASSWORD: "postgres"
+          POSTGRES_DB: "test"
+  install_script:
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get update -y
+    - >-
+        apt-get install -y
+        gcc
+        g++
+        autoconf
+        bison
+        re2c
+        locales
+        locales-all
+        ldap-utils
+        openssl
+        slapd
+        libgmp-dev
+        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
+        libpq-dev
+        libreadline-dev
+        libldap2-dev
+        libsodium-dev
+        libargon2-0-dev
+        libmm-dev
+        libsnmp-dev
+        snmpd
+        `#snmp-mibs-downloader`
+        freetds-dev
+        `#unixodbc-dev`
+        libc-client-dev
+        dovecot-core
+        dovecot-pop3d
+        dovecot-imapd
+        sendmail
+        firebird-dev
+        liblmdb-dev
+        libtokyocabinet-dev
+        libdb-dev
+        libqdbm-dev
+        libjpeg-dev
+        libpng-dev
+        libfreetype6-dev
+  build_script:
+    - ./buildconf -f
+    - >-
+        ./configure
+        --enable-debug
+        --enable-zts
+        --enable-option-checking=fatal
+        --prefix=/usr
+        --enable-phpdbg
+        --enable-fpm
+        --enable-opcache
+        --with-pdo-mysql=mysqlnd
+        --with-mysqli=mysqlnd
+        --with-pgsql
+        --with-pdo-pgsql
+        --with-pdo-sqlite
+        --enable-intl
+        --without-pear
+        --enable-gd
+        --with-jpeg
+        --with-webp
+        --with-freetype
+        --with-xpm
+        --enable-exif
+        --with-zip
+        --with-zlib
+        --enable-soap
+        --enable-xmlreader
+        --with-xsl
+        --with-tidy
+        --enable-sysvsem
+        --enable-sysvshm
+        --enable-shmop
+        --enable-pcntl
+        --with-readline
+        --enable-mbstring
+        --with-curl
+        --with-gettext
+        --enable-sockets
+        --with-bz2
+        --with-openssl
+        --with-gmp
+        --enable-bcmath
+        --enable-calendar
+        --enable-ftp
+        --with-pspell=/usr
+        --with-enchant=/usr
+        --with-kerberos
+        --enable-sysvmsg
+        --with-ffi
+        --enable-zend-test
+        --enable-dl-test=shared
+        --with-ldap
+        --with-ldap-sasl
+        --with-password-argon2
+        --with-mhash
+        --with-sodium
+        --enable-dba
+        --with-cdb
+        --enable-flatfile
+        --enable-inifile
+        --with-tcadb
+        --with-lmdb
+        --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
+        `#--with-pdo-dblib`
+        --disable-phpdbg
+        `#--enable-werror`
+    - make -j2 > /dev/null
+    - make install
+    - mkdir -p /etc/php.d
+    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+    # Specify opcache.preload_user as we're running as root.
+    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+  tests_script:
+    - export SKIP_IO_CAPTURE_TESTS=1
+    - export CI_NO_IPV6=1
+    - export MYSQL_TEST_HOST=127.0.0.1
+    - export MYSQL_TEST_USER=root
+    - export MYSQL_TEST_PASSWD=
+    - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
+    - export PDO_MYSQL_TEST_USER=root
+    - export PDO_MYSQL_TEST_PASS=
+    - export PDO_PGSQL_TEST_DSN="pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=postgres"
+    - >-
+        sapi/cli/php run-tests.php
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        -d opcache.jit_buffer_size=64M
+        -d opcache.jit=function
+        -P -q -x -j2
+        -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+    - >-
+        sapi/cli/php run-tests.php
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        -d opcache.jit_buffer_size=64M
+        -d opcache.jit_max_root_traces=1000000
+        -d opcache.jit_max_side_traces=1000000
+        -d opcache.jit_max_exit_counters=1000000
+        -d opcache.jit_hot_loop=1
+        -d opcache.jit_hot_func=1
+        -d opcache.jit_hot_return=1
+        -d opcache.jit_hot_side_exit=1
+        -d opcache.jit=tracing
+        -P -q -x -j2
+        -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+        --repeat 2

.cirrus.yml

@@ -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

.gdbinit

@@ -19,7 +19,11 @@
 *.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
+/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 binary
+/ext/date/tests/ossfuzz*.txt binary

.gitattributes

@@ -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/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,53 @@
+name: apt
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+
+        export DEBIAN_FRONTEND=noninteractive
+        dpkg --add-architecture i386
+        apt-get update -y | true
+        # TODO: Reenable postgresql + postgresql-contrib packages once they work again.
+        apt-get install -y \
+          autoconf \
+          bison \
+          curl \
+          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 \
+          re2c \
+          unzip \
+          wget \
+          zlib1g-dev:i386