Serialization fixes

Author: kocsismate

ext/date/php_date.c

@@ -5912,13 +5912,14 @@ PHP_METHOD(DatePeriod, __wakeup)
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	period_obj = Z_PHPPERIOD_P(object);
-
 	myht = Z_OBJPROP_P(object);
 
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
 		RETURN_THROWS();
 	}
+
+	restore_custom_dateperiod_properties(object, myht);
 }
 /* }}} */
 

ext/date/tests/date_period_unserialize3.phpt

@@ -11,9 +11,9 @@ $period = new DatePeriod($start, $interval, $end);
 try {
     $period->__unserialize(
         [
-            "current" => new DateTime,
-            "start" => new DateTime,
-            "end" => new DateTime,
+            "current" => new DateTime("2024-08-27 00:00:00"),
+            "start" => new DateTime("2024-08-28 00:00:00"),
+            "end" => new DateTime("2024-08-29 00:00:00"),
             "interval" => new DateInterval('P2D'),
             "recurrences" => 2,
             "include_start_date" => "wrong type",
@@ -33,18 +33,25 @@ object(DatePeriod)#%d (%d) {
   ["start"]=>
   object(DateTime)#%d (%d) {
     ["date"]=>
-    string(26) "2022-07-14 00:00:00.000000"
+    string(26) "2024-08-28 00:00:00.000000"
     ["timezone_type"]=>
     int(3)
     ["timezone"]=>
     string(3) "UTC"
   }
   ["current"]=>
-  NULL
+  object(DateTime)#%d (%d) {
+    ["date"]=>
+    string(26) "2024-08-27 00:00:00.000000"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
   ["end"]=>
   object(DateTime)#%d (%d) {
     ["date"]=>
-    string(26) "2022-07-16 00:00:00.000000"
+    string(26) "2024-08-29 00:00:00.000000"
     ["timezone_type"]=>
     int(3)
     ["timezone"]=>
@@ -57,7 +64,7 @@ object(DatePeriod)#%d (%d) {
     ["m"]=>
     int(0)
     ["d"]=>
-    int(1)
+    int(2)
     ["h"]=>
     int(0)
     ["i"]=>
@@ -74,7 +81,7 @@ object(DatePeriod)#%d (%d) {
     bool(false)
   }
   ["recurrences"]=>
-  int(1)
+  int(2)
   ["include_start_date"]=>
   bool(true)
   ["include_end_date"]=>

ext/date/tests/gh10747-4.phpt

@@ -26,9 +26,17 @@ $u = unserialize($s);
 var_dump($i, str_replace(chr(0), '!', $s), $u);
 ?>
 --EXPECTF--
-object(I)#1 (11) {
+object(I)#%d (%d) {
+  ["var1":"I":private]=>
+  int(1)
+  ["var2":"I":private]=>
+  int(2)
+  ["var3":protected]=>
+  int(3)
+  ["var4":protected]=>
+  int(4)
   ["start"]=>
-  object(DateTimeImmutable)#5 (3) {
+  object(DateTimeImmutable)#%d (%d) {
     ["date"]=>
     string(26) "2023-03-03 16:24:00.000000"
     ["timezone_type"]=>
@@ -39,7 +47,7 @@ object(I)#1 (11) {
   ["current"]=>
   NULL
   ["end"]=>
-  object(DateTimeImmutable)#6 (3) {
+  object(DateTimeImmutable)#%d (%d) {
     ["date"]=>
     string(26) "2023-03-09 16:24:00.000000"
     ["timezone_type"]=>
@@ -48,7 +56,7 @@ object(I)#1 (11) {
     string(3) "UTC"
   }
   ["interval"]=>
-  object(DateInterval)#7 (10) {
+  object(DateInterval)#%d (%d) {
     ["y"]=>
     int(0)
     ["m"]=>
@@ -76,6 +84,9 @@ object(I)#1 (11) {
   bool(true)
   ["include_end_date"]=>
   bool(false)
+}
+string(631) "O:1:"I":11:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2023-03-03 16:24:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:3:"UTC";}s:7:"current";N;s:3:"end";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2023-03-09 16:24:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:3:"UTC";}s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:1;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:1;s:18:"include_start_date";b:1;s:16:"include_end_date";b:0;s:7:"!I!var1";i:1;s:7:"!I!var2";i:2;s:7:"!*!var3";i:3;s:7:"!*!var4";i:4;}"
+object(I)#%d (%d) {
   ["var1":"I":private]=>
   int(1)
   ["var2":"I":private]=>
@@ -84,11 +95,8 @@ object(I)#1 (11) {
   int(3)
   ["var4":protected]=>
   int(4)
-}
-string(631) "O:1:"I":11:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2023-03-03 16:24:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:3:"UTC";}s:7:"current";N;s:3:"end";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2023-03-09 16:24:00.000000";s:13:"timezone_type";i:3;s:8:"timezone";s:3:"UTC";}s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:1;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:1;s:18:"include_start_date";b:1;s:16:"include_end_date";b:0;s:7:"!I!var1";i:1;s:7:"!I!var2";i:2;s:7:"!*!var3";i:3;s:7:"!*!var4";i:4;}"
-object(I)#2 (11) {
   ["start"]=>
-  object(DateTimeImmutable)#9 (3) {
+  object(DateTimeImmutable)#%d (%d) {
     ["date"]=>
     string(26) "2023-03-03 16:24:00.000000"
     ["timezone_type"]=>
@@ -99,7 +107,7 @@ object(I)#2 (11) {
   ["current"]=>
   NULL
   ["end"]=>
-  object(DateTimeImmutable)#10 (3) {
+  object(DateTimeImmutable)#%d (%d) {
     ["date"]=>
     string(26) "2023-03-09 16:24:00.000000"
     ["timezone_type"]=>
@@ -108,7 +116,7 @@ object(I)#2 (11) {
     string(3) "UTC"
   }
   ["interval"]=>
-  object(DateInterval)#11 (10) {
+  object(DateInterval)#%d (%d) {
     ["y"]=>
     int(0)
     ["m"]=>
@@ -136,12 +144,4 @@ object(I)#2 (11) {
   bool(true)
   ["include_end_date"]=>
   bool(false)
-  ["var1":"I":private]=>
-  int(1)
-  ["var2":"I":private]=>
-  int(2)
-  ["var3":protected]=>
-  int(3)
-  ["var4":protected]=>
-  int(4)
 }