Merge remote-tracking branch 'origin/PHP-8.2' into tests_psalm_phpstan_phpseclib

Author: danog

.circleci/config.yml

@@ -177,6 +177,7 @@ jobs:
             echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
       - run:
           name: Test
+          no_output_timeout: 30m
           command: |
             sapi/cli/php run-tests.php \
               -d zend_extension=opcache.so \
@@ -185,6 +186,7 @@ jobs:
               -d opcache.jit=tracing \
               -P -q -x -j2 \
               -g FAIL,BORK,LEAK,XLEAK \
+              --no-progress \
               --offline \
               --show-diff \
               --show-slow 1000 \

.cirrus.yml

@@ -25,4 +25,4 @@ freebsd_task:
   tests_script:
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
-    - 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
+    - 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

@@ -66,18 +66,18 @@ define dump_bt
 		if $func
 			if $ex->This->value.obj
 				if $func->common.scope
-					printf "%s->", $func->common.scope->name->val
+					printf "%s->", (char*)$func->common.scope->name->val
 				else
-					printf "%s->", $ex->This->value.obj->ce.name->val
+					printf "%s->", (char*)$ex->This->value.obj->ce.name->val
 				end
 			else
 				if $func->common.scope
-					printf "%s::", $func->common.scope->name->val
+					printf "%s::", (char*)$func->common.scope->name->val
 				end
 			end
 
 			if $func->common.function_name
-				printf "%s(", $func->common.function_name->val
+				printf "%s(", (char*)$func->common.function_name->val
 			else
 				printf "(main"
 			end
@@ -109,7 +109,7 @@ define dump_bt
 					printf "%f", $zvalue->value.dval
 				end
 				if $type == 6
-					____print_str $zvalue->value.str->val $zvalue->value.str->len
+					____print_str (char*)$zvalue->value.str->val $zvalue->value.str->len
 				end
 				if $type == 7
 					printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
@@ -135,7 +135,7 @@ define dump_bt
 		end
 		if $func != 0
 			if $func->type == 2
-				printf "%s:%d ", $func->op_array.filename->val, $ex->opline->lineno
+				printf "%s:%d ", (char*)$func->op_array.filename->val, $ex->opline->lineno
 			else
 				printf "[internal function]"
 			end
@@ -186,7 +186,7 @@ define ____printzv_contents
 		printf "double: %f", $zvalue->value.dval
 	end
 	if $type == 6
-		printf "string: %s", $zvalue->value.str->val
+		printf "string: %s", (char*)$zvalue->value.str->val
 	end
 	if $type == 7
 		printf "array: "
@@ -208,7 +208,7 @@ define ____printzv_contents
 		set $handle = $zvalue->value.obj.handle
 		set $handlers = $zvalue->value.obj.handlers
 		set $zobj = $zvalue->value.obj
-		set $cname = $zobj->ce->name->val
+		set $cname = (char*)$zobj->ce->name->val
 		printf "(%s) #%d", $cname, $handle
 		if ! $arg1
 			if $handlers->get_properties == &zend_std_get_properties
@@ -233,7 +233,7 @@ define ____printzv_contents
 						set $name = $p->key
 						set $prop = (zend_property_info*)$p->val.value.ptr
 						set $val = (zval*)((char*)$zobj + $prop->offset)
-						printf "%s => ", $name->val
+						printf "%s => ", (char*)$name->val
 						printzv $val
 						set $k = $k + 1
 					end
@@ -318,7 +318,8 @@ define ____print_ht
 		set $n = $n - 1
 	end
 
-	if $ht->u.v.flags & 4
+	set $packed = $ht->u.v.flags & 4
+	if $packed
 		printf "Packed"
 	else
 		printf "Hash"
@@ -329,36 +330,45 @@ define ____print_ht
 	set $i = 0
 	set $ind = $ind + 1
 	while $i < $num
-		set $p = (Bucket*)($ht->arData + $i)
+		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 $n = $ind
-		if $p->val.u1.v.type > 0
+		if $val->u1.v.type > 0
 			while $n > 0
 				printf "  "
 				set $n = $n - 1
 			end
 			printf "[%d] ", $i
-			if $p->key
-				____print_str $p->key->val $p->key->len
+			if $key
+				____print_str (char*)$key->val $key->len
 				printf " => "
 			else
-				printf "%d => ", $p->h
+				printf "%d => ", $h
 			end
 			if $arg1 == 0
-				printf "%p\n", (zval *)&$p->val
+				printf "%p\n", $val
 			end
 			if $arg1 == 1
-				set $zval = (zval *)&$p->val
+				set $zval = $val
 				____printzv $zval 1
 			end
 			if $arg1 == 2
-				printf "%s\n", (char*)$p->val.value.ptr
+				printf "%s\n", (char*)$val->value.ptr
 			end
 			if $arg1 == 3
-				set $func = (zend_function*)$p->val.value.ptr
-				printf "\"%s\"\n", $func->common.function_name->val
+				set $func = (zend_function*)$val->value.ptr
+				printf "\"%s\"\n", (char*)$func->common.function_name->val
 			end
 			if $arg1 == 4
-				set $const = (zend_constant *)$p->val.value.ptr
+				set $const = (zend_constant *)$val->value.ptr
 				____printzv $const 1
 			end
 		end
@@ -413,15 +423,15 @@ define ____print_inh_class
 			printf "final "
 		end
 	end
-	printf "class %s", $ce->name->val
+	printf "class %s", (char*)$ce->name->val
 	if $ce->parent != 0
-		printf " extends %s", $ce->parent->name->val
+		printf " extends %s", (char*)$ce->parent->name->val
 	end
 	if $ce->num_interfaces != 0
 		printf " implements"
 		set $tmp = 0
 		while $tmp < $ce->num_interfaces
-			printf " %s", $ce->interfaces[$tmp]->name->val
+			printf " %s", (char*)$ce->interfaces[$tmp]->name->val
 			set $tmp = $tmp + 1
 			if $tmp < $ce->num_interfaces
 				printf ","
@@ -433,10 +443,10 @@ end
 
 define ____print_inh_iface
 	set $ce = $arg0
-	printf "interface %s", $ce->name->val
+	printf "interface %s", (char*)$ce->name->val
 	if $ce->num_interfaces != 0
 		set $ce = $ce->interfaces[0]
-		printf " extends %s", $ce->name->val
+		printf " extends %s", (char*)$ce->name->val
 	else
 		set $ce = 0
 	end
@@ -476,7 +486,7 @@ define print_pi
 	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
-	printf "    ce = [%p] %s\n", $pi->ce, $pi->ce->name->val
+	printf "    ce = [%p] %s\n", $pi->ce, (char*)$pi->ce->name->val
 	printf "    flags = 0x%x (", $pi->flags
 	if $pi->flags & 0x100
 		printf "ZEND_ACC_PUBLIC"
@@ -598,7 +608,7 @@ define print_zstr
 		set $maxlen = $zstr->len
 	end
 	printf "string(%d) ", $zstr->len
-	____print_str $zstr->val $zstr->len $maxlen
+	____print_str (char*)$zstr->val $zstr->len $maxlen
 	printf "\n"
 end
 

.gitattributes

@@ -13,7 +13,16 @@
 /UPGRADING           merge=NEWS
 /UPGRADING.INTERNALS merge=NEWS
 
-# 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
+# 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.{h,c} linguist-generated
+
+# The OSS fuzz files are bunary
+/ext/date/tests/ossfuzz*.txt binary

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,36 @@
+name: Bug report
+description: Create a bug report
+labels: ["Bug", "Status: Needs Triage"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: "Please provide a minimal way to reproduce the problem and describe what the expected vs actual behavior is. Provide a [3v4l.org](https://3v4l.org/) link if possible."
+      value: |
+        The following code:
+
+        ```php
+        <?php
+        ```
+
+        Resulted in this output:
+        ```
+        ```
+
+        But I expected this output instead:
+        ```
+        ```
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: PHP Version
+      description: "The used PHP version. Make sure it is [supported](https://www.php.net/supported-versions.php)."
+      placeholder: "PHP 8.0.12"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating System
+      description: "The used operating system, if relevant."
+      placeholder: "Ubuntu 20.04"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+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/feature_request.yml

@@ -0,0 +1,10 @@
+name: Feature request
+description: Create a feature request
+labels: ["Feature", "Status: Needs Triage"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: "Please describe the requested feature and why it should be included in PHP."
+    validations:
+      required: true

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

@@ -3,8 +3,10 @@ runs:
   using: composite
   steps:
     - shell: bash
+      env:
+        GH_TOKEN: ${{ github.token }}
       run: |
         set -x
-        sudo curl 'https://caddyserver.com/api/download?os=linux&arch=amd64' -o /usr/bin/caddy
+        gh release -R caddyserver/caddy download --pattern 'caddy_*_linux_amd64.tar.gz' -O - | sudo tar -xz -C /usr/bin caddy
         sudo chmod +x /usr/bin/caddy
         sudo caddy start --config ext/curl/tests/Caddyfile

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

@@ -16,6 +16,6 @@ runs:
         export PDO_MYSQL_TEST_PASS=root
         export REPORT_EXIT_STATUS=no
         sapi/cli/php run-tests.php -P -q \
-          -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
-          --offline --show-diff --show-slow 1000 --set-timeout 120 \
+          -g FAIL,BORK,LEAK,XLEAK \
+          --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 \
           ext/pdo_mysql

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

@@ -1,11 +1,17 @@
 name: Test
 inputs:
+  testArtifacts:
+    default: null
+    required: false
   runTestsParameters:
     default: ''
     required: false
   jitType:
     default: 'disable'
     required: false
+  idleCpu:
+    default: 'false'
+    required: false
 runs:
   using: composite
   steps:
@@ -29,12 +35,20 @@ runs:
         export PDO_OCI_TEST_PASS="pass"
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export SKIP_IO_CAPTURE_TESTS=1
+        export TEST_PHP_JUNIT=junit.out.xml
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.jit_buffer_size=16M \
-          -j$(/usr/bin/nproc) \
-          -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
+          ${{ inputs.idleCpu == 'true' && '-j$(($(/usr/bin/nproc) - 1))' || '-j$(/usr/bin/nproc)' }} \
+          -g FAIL,BORK,LEAK,XLEAK \
+          --no-progress \
           --offline \
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
+    - uses: actions/upload-artifact@v4
+      if: always() && inputs.testArtifacts != null
+      with:
+        name: ${{ github.job }}_${{ inputs.testArtifacts }}
+        path: ${{ github.workspace }}/junit.out.xml
+        retention-days: 5