merge

NEWS

@@ -13,10 +13,13 @@ PHP                                                                        NEWS
 
 - Curl:
   . Added support for CURLOPT_XFERINFOFUNCTION. (David Carlier)
+  . Added support for CURLOPT_MAXFILESIZE_LARGE. (David Carlier)
 
 - Date:
   . Fixed GH-8458 (DateInterval::createFromDateString does not throw if
     non-relative items are present). (Derick)
+  . Fixed bug #52015 (Allow including end date in DatePeriod iterations)
+    (Daniel Egeberg, Derick)
   . idate() now accepts format specifiers "N" (ISO Day-of-Week) and "o" (ISO
     Year). (Pavel Djundik)
 
@@ -44,31 +47,38 @@ PHP                                                                        NEWS
   . Added ReflectionFunction::isAnonymous(). (Nicolas Grekas)
   . Added ReflectionMethod::hasPrototype(). (Ollie Read)
 
+- Session:
+  . Fixed bug GH-7787 (Improve session write failure message for user error
+    handlers). (ilutov)
+
+- Sockets:
+  . Added TCP_NOTSENT_LOWAT socket option. (David Carlier)
+  . Added SO_MEMINFO socket option. (David Carlier)
+
 - Sodium:
   . Added sodium_crypto_stream_xchacha20_xor_ic(). (Scott)
 
 - SQLite3:
   . Changed sqlite3.defensive from PHP_INI_SYSTEM to PHP_INI_USER. (bohwaz)
 
-- Streams:
-  . Set IP_BIND_ADDRESS_NO_PORT if available when connecting to remote host.
-    (Cristian Rodríguez)
-
 - Standard:
   . net_get_interfaces() also reports wireless network interfaces on Windows.
     (Yurun)
   . Finished AVIF support in getimagesize(). (Yannis Guyon)
   . Fixed bug GH-7847 (stripos with large haystack has bad performance).
     (ilutov)
   . New function memory_reset_peak_usage(). (Patrick Allaert)
+  . Fixed parse_url(): can not recognize port without scheme. (pandaLIU)
+
+- Streams:
+  . Set IP_BIND_ADDRESS_NO_PORT if available when connecting to remote host.
+    (Cristian Rodríguez)
 
 - Zip:
   . add ZipArchive::clearError() method
   . add ZipArchive::getStreamName() method
   . add ZipArchive::getStreamIndex() method
-
-- Session:
-  . Fixed bug GH-7787 (Improve session write failure message for user error
-    handlers). (ilutov)
+  . On Windows, the Zip extension is now built as shared library (DLL) by
+    default. (cmb)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

@@ -199,9 +199,12 @@ PHP 8.2 UPGRADE NOTES
 
 - Curl:
   . CURLOPT_XFERINFOFUNCTION
+  . CURLOPT_MAXFILESIZE_LARGE
 
 - Sockets:
   . SO_INCOMING_CPU
+  . TCP_NOTSENT_LOWAT
+  . SO_MEMINFO
 
 ========================================
 11. Changes to INI File Handling
@@ -220,6 +223,9 @@ PHP 8.2 UPGRADE NOTES
     the configuration option --with-oci8 has been dropped. --with-oci8-11g,
     --with-oci8-12c and --with-oci8-19 are still supported.
 
+- Zip:
+  . The Zip extension is now built as shared library (DLL) by default.
+
 ========================================
 13. Other Changes
 ========================================

UPGRADING.INTERNALS

@@ -34,6 +34,9 @@ PHP 8.2 INTERNALS UPGRADE NOTES
       string_natural_case_compare_function(), and string_natural_compare_function()
       have been removed. They always returned SUCCESS and were a wrapper around
       strnatcmp_ex(). Use strnatcmp_ex() directly instead.
+  b. ext/pdo
+    - pdo_raise_impl_error()'s parameter sqlstate has been changed from
+      const char * to pdo_error_type (aka char [6]).
 
 ========================
 4. OpCode changes

Zend/Optimizer/sccp.c

@@ -2067,8 +2067,39 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var,
 				}
 				return 0;
 			}
-			if (ssa_op->op1_def >= 0
-					|| ssa_op->op2_def >= 0) {
+			if (ssa_op->op1_def >= 0 || ssa_op->op2_def >= 0) {
+				if (var->use_chain < 0 && var->phi_use_chain == NULL) {
+					switch (opline->opcode) {
+						case ZEND_ASSIGN:
+						case ZEND_ASSIGN_REF:
+						case ZEND_ASSIGN_DIM:
+						case ZEND_ASSIGN_OBJ:
+						case ZEND_ASSIGN_OBJ_REF:
+						case ZEND_ASSIGN_STATIC_PROP:
+						case ZEND_ASSIGN_STATIC_PROP_REF:
+						case ZEND_ASSIGN_OP:
+						case ZEND_ASSIGN_DIM_OP:
+						case ZEND_ASSIGN_OBJ_OP:
+						case ZEND_ASSIGN_STATIC_PROP_OP:
+						case ZEND_PRE_INC:
+						case ZEND_PRE_DEC:
+						case ZEND_PRE_INC_OBJ:
+						case ZEND_PRE_DEC_OBJ:
+						case ZEND_DO_ICALL:
+						case ZEND_DO_UCALL:
+						case ZEND_DO_FCALL_BY_NAME:
+						case ZEND_DO_FCALL:
+						case ZEND_INCLUDE_OR_EVAL:
+						case ZEND_YIELD:
+						case ZEND_YIELD_FROM:
+						case ZEND_ASSERT_CHECK:
+							opline->result_type = IS_UNUSED;
+							zend_ssa_remove_result_def(ssa, ssa_op);
+							break;
+						default:
+							break;
+					}	
+				}
 				/* we cannot remove instruction that defines other variables */
 				return 0;
 			} else if (opline->opcode == ZEND_JMPZ_EX

Zend/Optimizer/zend_inference.c

@@ -2708,8 +2708,8 @@ static zend_always_inline zend_result _zend_update_type_info(
 						tmp |= MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING;
 					}
 				}
-				if (!tmp) {
-					tmp = MAY_BE_NULL;
+				if (t1 & (MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_RESOURCE)) {
+					tmp |= MAY_BE_NULL;
 				}
 				tmp |= MAY_BE_RC1 | MAY_BE_RCN;
 				UPDATE_SSA_TYPE(tmp, ssa_op->result_def);

Zend/tests/readonly_classes/readonly_class_duplicated_modifier.phpt

@@ -0,0 +1,12 @@
+--TEST--
+The readonly class modifier can only be added once
+--FILE--
+<?php
+
+readonly readonly class Foo
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Multiple readonly modifiers are not allowed in %s on line %d

Zend/tests/readonly_classes/readonly_class_dynamic_property.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Readonly classes cannot use dynamic properties
+--FILE--
+<?php
+
+readonly class Foo
+{
+}
+
+$foo = new Foo();
+
+try {
+    $foo->bar = 1;
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+Cannot create dynamic property Foo::$bar

Zend/tests/readonly_classes/readonly_class_dynamic_property_attribute.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Readonly classes cannot apply the #[AllowDynamicProperties] attribute
+--FILE--
+<?php
+
+#[AllowDynamicProperties]
+readonly class Foo
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot apply #[AllowDynamicProperties] to readonly class Foo in %s on line %d

Zend/tests/readonly_classes/readonly_class_final_modifier.phpt

@@ -0,0 +1,16 @@
+--TEST--
+The readonly and final class modifiers can be defined in the same time
+--FILE--
+<?php
+
+final readonly class Foo
+{
+}
+
+readonly class Bar extends Foo
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Class Bar cannot extend final class Foo in %s on line %d

Zend/tests/readonly_classes/readonly_class_inheritance_error1.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Non-readonly class cannot extend a readonly class
+--FILE--
+<?php
+
+readonly class Foo
+{
+}
+
+class Bar extends Foo
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Non-readonly class Bar cannot extend readonly class Foo in %s on line %d

Zend/tests/readonly_classes/readonly_class_inheritance_error2.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Readonly class cannot extend a non-readonly class
+--FILE--
+<?php
+
+class Foo
+{
+}
+
+readonly class Bar extends Foo
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Readonly class Bar cannot extend non-readonly class Foo in %s on line %d

Zend/tests/readonly_classes/readonly_class_inheritance_success.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Readonly class can extend a readonly class
+--FILE--
+<?php
+
+readonly class Foo
+{
+}
+
+readonly class Bar extends Foo
+{
+}
+
+?>
+--EXPECT--

Zend/tests/readonly_classes/readonly_class_missing_type1.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Normal properties of a readonly class must have type
+--FILE--
+<?php
+
+readonly class Foo
+{
+    public $bar;
+}
+
+?>
+--EXPECTF--
+Fatal error: Readonly property Foo::$bar must have type in %s on line %d

Zend/tests/readonly_classes/readonly_class_missing_type2.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Promoted properties of a readonly class must have type
+--FILE--
+<?php
+
+readonly class Foo
+{
+    public function __construct(
+        private $bar
+    ) {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Readonly property Foo::$bar must have type in %s on line %d

Zend/tests/readonly_classes/readonly_class_property1.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Normal properties of a readonly class are implicitly declared as readonly
+--FILE--
+<?php
+
+readonly class Foo
+{
+    public int $bar;
+
+    public function __construct() {
+        $this->bar = 1;
+    }
+}
+
+$foo = new Foo();
+
+try {
+    $foo->bar = 2;
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+Cannot modify readonly property Foo::$bar

Zend/tests/readonly_classes/readonly_class_property2.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Promoted properties of a readonly class are implicitly declared as readonly
+--FILE--
+<?php
+
+readonly class Foo
+{
+    public function __construct(
+        public int $bar
+    ) {}
+}
+
+$foo = new Foo(1);
+
+try {
+    $foo->bar = 2;
+} catch (Error $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+Cannot modify readonly property Foo::$bar

Zend/tests/readonly_classes/readonly_class_property3.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Declaring static property for a readonly class is forbidden
+--FILE--
+<?php
+
+readonly class Foo
+{
+    public static int $bar;
+}
+
+?>
+--EXPECTF--
+Fatal error: Readonly class Foo cannot declare static properties in %s on line %d

Zend/tests/readonly_classes/readonly_enum.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Enums cannot be readonly
+--FILE--
+<?php
+
+readonly enum Foo
+{
+}
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "enum", expecting "abstract" or "final" or "readonly" or "class" in %s on line %d

Zend/tests/readonly_classes/readonly_interface.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Interfaces cannot be readonly
+--FILE--
+<?php
+
+readonly interface Foo
+{
+}
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "interface", expecting "abstract" or "final" or "readonly" or "class" in %s on line %d

Zend/tests/readonly_classes/readonly_trait.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Traits cannot be readonly
+--FILE--
+<?php
+
+readonly trait Foo
+{
+}
+
+?>
+--EXPECTF--
+Parse error: syntax error, unexpected token "trait", expecting "abstract" or "final" or "readonly" or "class" in %s on line %d