Merge branch 'PHP-8.3'

Author: petk

bin/make-patches.sh

@@ -13,13 +13,15 @@ patch-cmake-8.3-aspell
 patch-cmake-8.3-dmalloc
 patch-cmake-8.3-php-config
 patch-cmake-8.3-phpdbg-prompt
+patch-cmake-8.3-zend-vm-gen
 patch-cmake-8.4
 patch-cmake-8.4-asm
 patch-cmake-8.4-dmalloc
 patch-cmake-8.4-docs
 patch-cmake-8.4-php-config
 patch-cmake-8.4-phpdbg-prompt
 patch-cmake-8.4-timelib
+patch-cmake-8.4-zend-vm-gen
 "
 
 # A list of supported PHP versions.

patches/8.3/zend-vm-gen.patch

@@ -0,0 +1,28 @@
+Subject: Fix deprecation warnings on 32-bit *nix systems
+
+---
+ Zend/zend_vm_gen.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
+index 79b7653871..8130c3fe1e 100755
+--- a/Zend/zend_vm_gen.php
++++ b/Zend/zend_vm_gen.php
+@@ -2449,7 +2449,7 @@ function gen_vm($def, $skel) {
+                     $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_NO_CONST_CONST"];
+                 }
+                 if (isset($opcodes[$code]["spec"]["COMMUTATIVE"])) {
+-                    $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_COMMUTATIVE"];
++                    $opcodes[$code]["flags"] |= (int)$vm_op_flags["ZEND_VM_COMMUTATIVE"];
+                 }
+             }
+             $opnames[$op] = $code;
+@@ -2500,7 +2500,7 @@ function gen_vm($def, $skel) {
+                     $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_NO_CONST_CONST"];
+                 }
+                 if (isset($opcodes[$code]["spec"]["COMMUTATIVE"])) {
+-                    $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_COMMUTATIVE"];
++                    $opcodes[$code]["flags"] |= (int)$vm_op_flags["ZEND_VM_COMMUTATIVE"];
+                 }
+             }
+             $opnames[$op] = $code;

patches/8.4/php-config.patch

@@ -57,7 +57,7 @@ index e45b22b766..74f0e25b01 100644
  ])
 
 diff --git a/configure.ac b/configure.ac
-index 198f04afd9..e4fd053bca 100644
+index 6b61df11ab..0ba3ed3c3d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix

patches/8.4/zend-vm-gen.patch

@@ -0,0 +1,28 @@
+Subject: Fix deprecation warnings on 32-bit *nix systems
+
+---
+ Zend/zend_vm_gen.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
+index 7f503e78e2..b430f153b3 100755
+--- a/Zend/zend_vm_gen.php
++++ b/Zend/zend_vm_gen.php
+@@ -2473,7 +2473,7 @@ function gen_vm($def, $skel) {
+                     $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_NO_CONST_CONST"];
+                 }
+                 if (isset($opcodes[$code]["spec"]["COMMUTATIVE"])) {
+-                    $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_COMMUTATIVE"];
++                    $opcodes[$code]["flags"] |= (int)$vm_op_flags["ZEND_VM_COMMUTATIVE"];
+                 }
+             }
+             $opnames[$op] = $code;
+@@ -2534,7 +2534,7 @@ function gen_vm($def, $skel) {
+                     $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_NO_CONST_CONST"];
+                 }
+                 if (isset($opcodes[$code]["spec"]["COMMUTATIVE"])) {
+-                    $opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_COMMUTATIVE"];
++                    $opcodes[$code]["flags"] |= (int)$vm_op_flags["ZEND_VM_COMMUTATIVE"];
+                 }
+             }
+             $opnames[$op] = $code;