[pull] master from php:master

.github/workflows/nightly.yml

@@ -1068,6 +1068,7 @@ jobs:
           - zts: ${{ !inputs.run_freebsd_zts && true || '*never*' }}
     name: "FREEBSD_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
+    timeout-minutes: 50
     steps:
       - name: git checkout
         uses: actions/checkout@v4

.github/workflows/push.yml

@@ -366,6 +366,7 @@ jobs:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     name: FREEBSD
     runs-on: ubuntu-latest
+    timeout-minutes: 50
     steps:
       - name: git checkout
         uses: actions/checkout@v4

NEWS

@@ -1,6 +1,12 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.5.0beta1
+?? ??? ????, PHP 8.5.0beta2
+
+- OpenSSL:
+  . Implement #81724 (openssl_cms_encrypt only allows specific ciphers).
+    (Jakub Zelenka)
+
+14 Aug 2025, PHP 8.5.0beta1
 
 - Core:
   . Non-canonical cast names (boolean), (integer), (double), and (binary) have
@@ -12,6 +18,11 @@ PHP                                                                        NEWS
   . The backtick operator as an alias for shell_exec() has been deprecated.
     (timwolla)
   . Returning null from __debugInfo() has been deprecated. (DanielEScherzer)
+  . Support #[\Override] on properties. (Jiří Pudil)
+
+- Curl:
+  . The curl_close() function has been deprecated. (DanielEScherzer)
+  . The curl_share_close() function has been deprecated. (DanielEScherzer)
 
 - Date:
   . The DATE_RFC7231 and DateTimeInterface::RFC7231 constants have been
@@ -26,6 +37,9 @@ PHP                                                                        NEWS
   . The $context parameter of the finfo_buffer() function has been deprecated
     as it is ignored. (Girgias)
 
+- GD:
+  . The imagedestroy() function has been deprecated. (DanielEScherzer)
+
 - Intl:
   . Intl's internal error mechanism has been modernized so that it
     indicates more accurately which call site caused what error.
@@ -55,6 +69,10 @@ PHP                                                                        NEWS
     `_property_string()`). (DanielEScherzer)
   . The setAccessible() methods of various Reflection objects have been
     deprecated, as those no longer have an effect. (timwolla)
+  . ReflectionClass::getConstant() for constants that do not exist has been
+    deprecated. (DanielEScherzer)
+  . ReflectionProperty::getDefaultValue() for properties without default values
+    has been deprecated. (DanielEScherzer)
 
 - SPL:
   . Unregistering all autoloaders by passing the spl_autoload_call() function
@@ -74,6 +92,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-19153 (#[\Attribute] validation should error on
     trait/interface/enum/abstract class). (DanielEScherzer)
 
+- XML:
+  . The xml_parser_free() function has been deprecated. (DanielEScherzer)
+
 31 Jul 2025, PHP 8.5.0alpha4
 
 - Core:

UPGRADING

@@ -178,6 +178,8 @@ PHP 8.5 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/pipe-operator-v3
   . Constructor property promotion can now be used for final properties.
     RFC: https://wiki.php.net/rfc/final_promotion
+  . #[\Override] can now be applied to properties.
+    RFC: https://wiki.php.net/rfc/override_properties
 
 - Curl:
   . Added support for share handles that are persisted across multiple PHP
@@ -334,6 +336,14 @@ PHP 8.5 UPGRADE NOTES
     Return an empty array instead.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_debuginfo_returning_null
 
+- Curl:
+  . The curl_close() function has been deprecated, as CurlHandle objects are
+    freed automatically.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_curl_close
+  . The curl_share_close() function has been deprecated, as CurlShareHandle
+    objects are freed automatically.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_curl_share_close
+
 - Date:
   . The DATE_RFC7231 and DateTimeInterface::RFC7231 constants have been
     deprecated. This is because the associated timezone is ignored and always
@@ -348,6 +358,11 @@ PHP 8.5 UPGRADE NOTES
     as it is ignored.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_the_context_parameter_for_finfo_buffer
 
+- GD:
+  . The imagedestroy() function has been deprecated, as GdImage objects are
+    freed automatically.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_imagedestroy
+
 - Hash:
   . The MHASH_* constants have been deprecated.  These have been overlooked
     when the mhash*() function family has been deprecated per
@@ -375,11 +390,16 @@ PHP 8.5 UPGRADE NOTES
     DSNs coming from remote URIs.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_pdo_s_urischeme
 
-
 - Reflection:
   . The setAccessible() methods of various Reflection objects have been
     deprecated, as those no longer have an effect.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_reflectionsetaccessible
+  . Calling ReflectionClass::getConstant() for constants that do not exist has
+    been deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_reflectionclassgetconstant_for_missing_constants
+  . Calling ReflectionProperty::getDefaultValue() for properties without default
+    values has been deprecated.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_reflectionpropertygetdefaultvalue_for_properties_without_default_values
 
 - SPL:
   . Unregistering all autoloaders by passing the spl_autoload_call() function
@@ -402,6 +422,11 @@ PHP 8.5 UPGRADE NOTES
     explicitly instead.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_passing_null_to_readdir_rewinddir_and_closedir
 
+- XML:
+  . The xml_parser_free() function has been deprecated, as XMLParser objects
+    are freed automatically.
+    RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_xml_parser_free
+
 ========================================
 5. Changed Functions
 ========================================
@@ -431,6 +456,9 @@ PHP 8.5 UPGRADE NOTES
     $digest_algo that allows specifying hash digest algorithm for OEAP padding.
   . openssl_sign() and openssl_verify() have new parameter $padding to allow
     using more secure RSA PSS padding.
+  . openssl_cms_encrypt() $cipher_algo parameter can be a string with the
+    cipher name. That allows to use more algorithms including AES GCM cipher
+    algorithms for auth enveloped data.
 
 - PCNTL:
   . pcntl_exec() now has a formal return type of false.

Zend/tests/attributes/override/properties_01.phpt

@@ -0,0 +1,39 @@
+--TEST--
+#[\Override]: Properties
+--FILE--
+<?php
+
+interface I {
+    public mixed $i { get; }
+}
+
+interface II extends I {
+    #[\Override]
+    public mixed $i { get; }
+}
+
+class P {
+    public mixed $p1;
+    public mixed $p2;
+}
+
+class PP extends P {
+    #[\Override]
+    public mixed $p1;
+    public mixed $p2;
+}
+
+class C extends PP implements I {
+    #[\Override]
+    public mixed $i;
+    #[\Override]
+    public mixed $p1;
+    public mixed $p2;
+    public mixed $c;
+}
+
+echo "Done";
+
+?>
+--EXPECT--
+Done

Zend/tests/attributes/override/properties_02.phpt

@@ -0,0 +1,15 @@
+--TEST--
+#[\Override]: Properties: No parent class.
+--FILE--
+<?php
+
+class C {
+    #[\Override]
+    public mixed $c;
+}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: C::$c has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_03.phpt

@@ -0,0 +1,21 @@
+--TEST--
+#[\Override]: Properties: No parent class, but child implements matching interface.
+--FILE--
+<?php
+
+interface I {
+    public mixed $i { get; }
+}
+
+class P {
+    #[\Override]
+    public mixed $i;
+}
+
+class C extends P implements I {}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: P::$i has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_04.phpt

@@ -0,0 +1,21 @@
+--TEST--
+#[\Override]: Properties: No parent class, but child implements matching interface (2).
+--FILE--
+<?php
+
+interface I {
+    public mixed $i { get; }
+}
+
+class C extends P implements I {}
+
+class P {
+    #[\Override]
+    public mixed $i;
+}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: P::$i has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_05.phpt

@@ -0,0 +1,26 @@
+--TEST--
+#[\Override]: Properties: No parent interface.
+--FILE--
+<?php
+
+interface I {
+    #[\Override]
+    public mixed $i { get; }
+}
+
+interface II extends I {}
+
+
+class C implements II {
+    public mixed $i;
+}
+
+class C2 implements I {
+    public mixed $i;
+}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: I::$i has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_06.phpt

@@ -0,0 +1,15 @@
+--TEST--
+#[\Override]: Properties: On trait.
+--FILE--
+<?php
+
+trait T {
+    #[\Override]
+    public mixed $t;
+}
+
+echo "Done";
+
+?>
+--EXPECT--
+Done

Zend/tests/attributes/override/properties_07.phpt

@@ -0,0 +1,19 @@
+--TEST--
+#[\Override]: Properties: On used trait without parent property.
+--FILE--
+<?php
+
+trait T {
+    #[\Override]
+    public mixed $t;
+}
+
+class Foo {
+    use T;
+}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: Foo::$t has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_08.phpt

@@ -0,0 +1,23 @@
+--TEST--
+#[\Override]: Properties: On used trait with interface property.
+--FILE--
+<?php
+
+trait T {
+    #[\Override]
+    public mixed $i;
+}
+
+interface I {
+    public mixed $i { get; }
+}
+
+class Foo implements I {
+    use T;
+}
+
+echo "Done";
+
+?>
+--EXPECT--
+Done

Zend/tests/attributes/override/properties_09.phpt

@@ -0,0 +1,19 @@
+--TEST--
+#[\Override]: Properties: Parent property is private, child property is public.
+--FILE--
+<?php
+
+class P {
+    private mixed $p;
+}
+
+class C extends P {
+    #[\Override]
+    public mixed $p;
+}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: C::$p has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_10.phpt

@@ -0,0 +1,19 @@
+--TEST--
+#[\Override]: Properties: Parent property is private, child property is private.
+--FILE--
+<?php
+
+class P {
+    private mixed $p;
+}
+
+class C extends P {
+    #[\Override]
+    private mixed $p;
+}
+
+echo "Done";
+
+?>
+--EXPECTF--
+Fatal error: C::$p has #[\Override] attribute, but no matching parent property exists in %s on line %d

Zend/tests/attributes/override/properties_11.phpt

@@ -0,0 +1,19 @@
+--TEST--
+#[\Override]: Properties: Parent property is protected, child property is public.
+--FILE--
+<?php
+
+class P {
+    protected mixed $p;
+}
+
+class C extends P {
+    #[\Override]
+    public mixed $p;
+}
+
+echo "Done";
+
+?>
+--EXPECT--
+Done