Revert "DEBUG/BENCH: Merge branch 'origin/master'"

This reverts commit 660452b.

Author: mvorisek

.appveyor.yml

@@ -28,7 +28,6 @@ environment:
         #PDO_MYSQL_TEST_PASS: Password12!
         #PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
         #PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
-        STACK_LIMIT_DEFAULTS_CHECK: 1
         #build permutations
         matrix:
                 - THREAD_SAFE: 0

.cirrus.yml

@@ -1,190 +1,10 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
 
-asan_task:
-  name: ASAN_DEBUG_NTS
-  container:
-    image: gcc:latest
-    additional_containers:
-      - name: mysql
-        image: mysql:8
-        port: 3306
-        cpu: 1.0
-        memory: 1G
-        env:
-          MYSQL_ROOT_PASSWORD: "root"
-          MYSQL_DATABASE: "test"
-  install_script:
-    - apt-get update -y
-    - >-
-        apt-get install -y
-        bison
-        re2c
-        locales
-        locales-all
-        `#ldap-utils`
-        openssl
-        `slapd`
-        libgmp-dev
-        libicu-dev
-        `#libtidy-dev`
-        `#libenchant-dev`
-        libaspell-dev
-        libpspell-dev
-        libsasl2-dev
-        libxpm-dev
-        libzip-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`
-        `#postgresql`
-        `#postgresql-contrib`
-        `#snmpd`
-        `#snmp-mibs-downloader`
-        `#freetds-dev`
-        `#unixodbc-dev`
-        llvm
-        clang
-        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
-        --disable-opcache-jit
-        --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
-        --with-zlib-dir=/usr
-        --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`
-        --enable-werror
-        CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'
-        CC=clang
-        CXX=clang++
-    - make -j2
-    - 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=root
-    - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
-    - export PDO_MYSQL_TEST_USER=root
-    - export PDO_MYSQL_TEST_PASS=root
-    - >-
-        sapi/cli/php run-tests.php
-        -P -q -x -j2
-        -g FAIL,BORK,LEAK,XLEAK
-        --no-progress
-        --offline
-        --show-diff
-        --show-slow 1000
-        --set-timeout 120
-        -d zend_extension=opcache.so
-        -d opcache.enable_cli=1
-        --asan
-
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
   freebsd_instance:
-    image_family: freebsd-13-2
+    image_family: freebsd-13-0
   env:
     ARCH: amd64
   install_script:
@@ -205,13 +25,12 @@ 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
+    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --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
+    image: debian:11
     additional_containers:
       - name: mysql
         image: mysql:8
@@ -389,7 +208,6 @@ arm_task:
         -d opcache.jit=function
         -P -q -x -j2
         -g FAIL,BORK,LEAK,XLEAK
-        --no-progress
         --offline
         --show-diff
         --show-slow 1000
@@ -402,7 +220,6 @@ arm_task:
         -d opcache.jit=tracing
         -P -q -x -j2
         -g FAIL,BORK,LEAK,XLEAK
-        --no-progress
         --offline
         --show-diff
         --show-slow 1000

.gdbinit

@@ -318,8 +318,7 @@ define ____print_ht
 		set $n = $n - 1
 	end
 
-	set $packed = $ht->u.v.flags & 4
-	if $packed
+	if $ht->u.v.flags & 4
 		printf "Packed"
 	else
 		printf "Hash"
@@ -330,45 +329,36 @@ define ____print_ht
 	set $i = 0
 	set $ind = $ind + 1
 	while $i < $num
-		if $packed
-			set $val = (zval*)($ht->arPacked + $i)
-			set $key = (zend_string*)0
-			set $h = $i
-		else
-			set $bucket = (Bucket*)($ht->arData + $i)
-			set $val = &$bucket->val
-			set $key = $bucket->key
-			set $h = $bucket->h
-		end
+		set $p = (Bucket*)($ht->arData + $i)
 		set $n = $ind
-		if $val->u1.v.type > 0
+		if $p->val.u1.v.type > 0
 			while $n > 0
 				printf "  "
 				set $n = $n - 1
 			end
 			printf "[%d] ", $i
-			if $key
-				____print_str $key->val $key->len
+			if $p->key
+				____print_str $p->key->val $p->key->len
 				printf " => "
 			else
-				printf "%d => ", $h
+				printf "%d => ", $p->h
 			end
 			if $arg1 == 0
-				printf "%p\n", $val
+				printf "%p\n", (zval *)&$p->val
 			end
 			if $arg1 == 1
-				set $zval = $val
+				set $zval = (zval *)&$p->val
 				____printzv $zval 1
 			end
 			if $arg1 == 2
-				printf "%s\n", (char*)$val->value.ptr
+				printf "%s\n", (char*)$p->val.value.ptr
 			end
 			if $arg1 == 3
-				set $func = (zend_function*)$val->value.ptr
+				set $func = (zend_function*)$p->val.value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
 			if $arg1 == 4
-				set $const = (zend_constant *)$val->value.ptr
+				set $const = (zend_constant *)$p->val.value.ptr
 				____printzv $const 1
 			end
 		end
@@ -482,7 +472,7 @@ end
 
 define print_pi
 	set $pi = (zend_property_info *)$arg0
-	set $initial_offset = ((uint32_t)(uintptr_t)(&((zend_object*)0)->properties_table[(0)]))
+	set $initial_offset = ((uint32_t)(zend_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

@@ -13,16 +13,7 @@
 /UPGRADING           merge=NEWS
 /UPGRADING.INTERNALS merge=NEWS
 
-# Configure proper diff drivers to improve the context lines in the output
-# of git diff and to improve token splitting for --word-diff.
-*.phpt diff=php
-*.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.[ch] linguist-generated
-
-# The OSS fuzz files are bunary
-/ext/date/tests/ossfuzz*.txt binary
+# Enable commit diffs for binary PHP test files. Some PHP test files include
+# special characters, such as ASCII control characters. Git recognizes these as
+# binary and wouldn't generate diffs.
+*.phpt diff

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,10 +7,13 @@ runs:
         set -x
 
         sudo service mysql start
+        sudo service postgresql start
         sudo service slapd start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         # Ensure local_infile tests can run.
         mysql -uroot -proot -e "SET GLOBAL local_infile = true"
+        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
+        sudo -u postgres psql -c "CREATE DATABASE test;"
         docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
         sudo locale-gen de_DE