Merge branch 'master' into feat/zend-class-use-traits

Author: khaledalam

.github/workflows/real-time-benchmark.yml

@@ -36,7 +36,7 @@ permissions:
   contents: read
   pull-requests: write
 concurrency:
-  group: ${{ github.workflow }}
+  group: ${{ github.workflow }}-${{ github.event_name }}
   cancel-in-progress: false
 jobs:
   REAL_TIME_BENCHMARK:
@@ -135,7 +135,7 @@ jobs:
         run: |
           set -e
 
-          BASELINE_SHORT_SHA="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c1-4)"
+          BASELINE_SHORT_SHA="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c 1-7)"
 
           cat << EOF > ./php-version-benchmarks/config/php/baseline.ini
             PHP_NAME="PHP - baseline@$BASELINE_SHORT_SHA"
@@ -152,7 +152,7 @@ jobs:
         run: |
           set -e
 
-          BASELINE_SHORT_SHA="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c1-4)"
+          BASELINE_SHORT_SHA="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c 1-7)"
 
           cat << EOF > ./php-version-benchmarks/config/php/baseline_jit.ini
             PHP_NAME="PHP - baseline@$BASELINE_SHORT_SHA (JIT)"
@@ -240,12 +240,12 @@ jobs:
           
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             WORKSPACE="manual"
-            BASE_COMMIT="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c 1-6)"
+            BASE_COMMIT="$(echo "${{ env.BASELINE_COMMIT }}" | cut -c 1-10)"
           else
             WORKSPACE="nightly"
-            BASE_COMMIT="$(echo "${{ env.LAST_RESULT_SHA }}" | cut -c 1-6)"
+            BASE_COMMIT="$(echo "${{ env.LAST_RESULT_SHA }}" | cut -c 1-10)"
           fi
-          COMPARE_COMMIT="$(echo "${{ env.COMMIT }}" | cut -c 1-6)"
+          COMPARE_COMMIT="$(echo "${{ env.COMMIT }}" | cut -c 1-10)"
 
           cp ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini.dist ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
           sed -i "s|INFRA_DOCKER_REGISTRY=public.ecr.aws/abcdefgh|INFRA_DOCKER_REGISTRY=${{ secrets.PHP_VERSION_BENCHMARK_DOCKER_REGISTRY }}|g" ./php-version-benchmarks/config/infra/aws/x86_64-metal.ini
@@ -301,16 +301,3 @@ jobs:
           NEWEST_RESULT_DIRECTORY=$(ls -td ${{ github.workspace }}/php-version-benchmarks/docs/results/${{ env.YEAR }}/*/ | head -1)
           sed -i "s|#ARTIFACT_URL#|${{ steps.upload.outputs.artifact-url }}|g" "${NEWEST_RESULT_DIRECTORY}result.md"
           gh pr comment ${{ inputs.pull_request }} --body-file "${NEWEST_RESULT_DIRECTORY}result.md" --repo ${{ github.repository }}
-      - name: Cleanup
-        if: always()
-        run: |
-          set -ex
-
-          rm -rf ./php-version-benchmarks/tmp/
-          rm -f ./php-version-benchmarks/build/infrastructure/config/*.tfvars
-          rm -rf ./php-version-benchmarks/build/infrastructure/aws/.terraform/
-          rm -f ./php-version-benchmarks/build/infrastructure/aws/.terraform.lock.hcl
-          rm -f ./php-version-benchmarks/build/infrastructure/aws/aws.tfplan
-          rm -f ./php-version-benchmarks/build/infrastructure/aws/terraform.tfstate
-          rm -f ./php-version-benchmarks/build/infrastructure/aws/terraform.tfstate.backup
-          rm -f ./php-version-benchmarks/config/infra/aws/*.ini

NEWS

@@ -86,6 +86,8 @@ PHP                                                                        NEWS
     transmitted data can remain unacknowledged. (James Lucas)
   . Added AF_UNSPEC support for sock_addrinfo_lookup() as a sole umbrella for
     AF_INET* family only. (David Carlier)
+  . Fixed GH-20532 (socket_addrinfo_lookup gives the error code with a new optional
+    parameter). (David Carlier)
 
 - SPL:
   . DirectoryIterator key can now work better with filesystem supporting larger

UPGRADING

@@ -77,6 +77,11 @@ PHP 8.6 UPGRADE NOTES
 - Phar:
   . Phar::mungServer() now supports reference values.
 
+- Sockets:
+  . socket_addrinfo_lookup() now has an additional optional argument $error
+    when not null, and on failure, gives the error code (one of the EAI_*
+    constants).
+
 - Zip:
   . ZipArchive::extractTo now raises a TypeError for the
     files argument if one or more of the entries is not
@@ -105,13 +110,33 @@ PHP 8.6 UPGRADE NOTES
 - Hash:
   . The bundled version of xxHash was upgraded to 0.8.2.
 
+- mysqli
+  . Added new constant MYSQLI_OPT_COMPRESS.
+
 ========================================
 10. New Global Constants
 ========================================
 
 - Sockets:
   . TCP_USER_TIMEOUT (Linux only).
   . AF_UNSPEC.
+  . EAI_BADFLAGS.
+  . EAI_NONAME.
+  . EAI_AGAIN.
+  . EAI_FAIL.
+  . EAI_NODATA.
+  . EAI_FAMILY.
+  . EAI_SOCKTYPE.
+  . EAI_SERVICE.
+  . EAI_ADDRFAMILY.
+  . EAI_SYSTEM.
+  . EAI_OVERFLOW
+  . EAI_INPROGRESS.
+  . EAI_CANCELED.
+  . EAI_NOTCANCELED.
+  . EAI_ALLDONE.
+  . EAI_INTR.
+  . EAI_IDN_ENCODE.
 
 ========================================
 11. Changes to INI File Handling

UPGRADING.INTERNALS

@@ -74,6 +74,10 @@ PHP 8.6 INTERNALS UPGRADE NOTES
 - ext/mbstring:
   . Added GB18030-2022 to default encoding list for zh-CN.
 
+- ext/mysqlnd:
+  . Dropped session_options parameter from all methods in mysqlnd_auth.
+    The same information is present in conn->options and should be used instead.
+
 - ext/standard:
   . _php_error_log() now has a formal return type of zend_result.
   . _php_error_log() now accepts zend_string* values instead of char*.

Zend/tests/attributes/nodiscard/007.phpt

@@ -12,6 +12,8 @@ zend_test_nodiscard();
 ?>
 --EXPECTF--
 <!-- internal enter NoDiscard::__construct() -->
+<!-- internal leave NoDiscard::__construct() -->
 
 Warning: The return value of function zend_test_nodiscard() should either be used or intentionally ignored by casting it as (void), custom message in %s on line %d
 <!-- internal enter zend_test_nodiscard() -->
+<!-- internal leave zend_test_nodiscard() -->

Zend/tests/lazy_objects/gh20905.phpt

@@ -0,0 +1,24 @@
+--TEST--
+GH-20905: Lazy proxy bailing __clone assertion
+--CREDITS--
+Viet Hoang Luu (@vi3tL0u1s)
+--FILE--
+<?php
+
+function test() {
+    function f() {}
+}
+
+class A {
+    public $_;
+    public function __clone() {
+        test();
+    }
+}
+
+test();
+clone (new ReflectionClass(A::class))->newLazyProxy(fn() => new A);
+
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare function f() (previously declared in %s:%d) in %s on line %d

Zend/tests/property_hooks/gh20479.phpt

@@ -0,0 +1,40 @@
+--TEST--
+GH-20479: Hooked object properties overflow
+--CREDITS--
+Viet Hoang Luu (@vi3tL0u1s)
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+class Trigger {
+    public $a = 'x';
+    public $b = 'x';
+    public $c = 'x';
+    public $d = 'x';
+    public $e = 'x';
+    public $f = 'x';
+    public string $trigger {
+      get {
+        return 'trigger';
+      }
+    }
+}
+
+$obj = new Trigger();
+// Add 2 dynamic props
+$obj->g = $obj->h = 'x';
+var_export($obj);
+
+?>
+--EXPECT--
+\Trigger::__set_state(array(
+   'a' => 'x',
+   'b' => 'x',
+   'c' => 'x',
+   'd' => 'x',
+   'e' => 'x',
+   'f' => 'x',
+   'trigger' => 'trigger',
+   'h' => 'x',
+   'g' => 'x',
+))