commit 88102eae8f86045307e9d46ad900f91158227f2b
author Bo Yang <teboring@google.com> Tue Dec 12 13:57:49 2017 -0800
committer Bo Yang <teboring@google.com> Tue Dec 12 13:57:49 2017 -0800
tree 460f40dde0a53279d9722d6e712410e99e0f5e93
parent 9f6aceaa8ce8250d9e36225180c218035bd49fe9

Replace private timelib_update_ts with public date_timestamp_get

php/ext/google/protobuf/message.c

diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c
index 70080a3..5b654a7 100644
--- a/php/ext/google/protobuf/message.c
+++ b/php/ext/google/protobuf/message.c
@@ -1133,12 +1133,24 @@
     return;
   }
 
-  php_date_obj* dateobj = UNBOX(php_date_obj, datetime);
-  if (!dateobj->time->sse_uptodate) {
-    timelib_update_ts(dateobj->time, NULL);
+  // Get timestamp from Datetime object.
+  zval* retval_ptr;
+  zval* function_name;
+  int64_t timestamp;
+
+  MAKE_STD_ZVAL(retval_ptr);
+  MAKE_STD_ZVAL(function_name);
+
+  ZVAL_STRING(function_name, "date_timestamp_get", 1);
+
+  if (call_user_function(EG(function_table), NULL,
+                         function_name, retval_ptr, 1,
+                         &datetime TSRMLS_CC) == SUCCESS) {
+    protobuf_convert_to_int64(retval_ptr, &timestamp);
   }
 
-  int64_t timestamp = dateobj->time->sse;
+  zval_ptr_dtor(&retval_ptr);
+  zval_ptr_dtor(&function_name);
 
   // Set seconds
   MessageHeader* self = UNBOX(MessageHeader, getThis());
@@ -1146,13 +1158,15 @@
       upb_msgdef_ntofz(self->descriptor->msgdef, "seconds");
   void* storage = message_data(self);
   void* memory = slot_memory(self->descriptor->layout, storage, field);
-  *(int64_t*)memory = dateobj->time->sse;
+  *(int64_t*)memory = timestamp;
 
   // Set nanos
   field = upb_msgdef_ntofz(self->descriptor->msgdef, "nanos");
   storage = message_data(self);
   memory = slot_memory(self->descriptor->layout, storage, field);
   *(int32_t*)memory = 0;
+
+  RETURN_NULL();
 #else
   zend_error(E_USER_ERROR, "fromDateTime needs date extension.");
 #endif

php/tests/memory_leak_test.php

diff --git a/php/tests/memory_leak_test.php b/php/tests/memory_leak_test.php
index 8ea84f6..ce26883 100644
--- a/php/tests/memory_leak_test.php
+++ b/php/tests/memory_leak_test.php
@@ -126,6 +126,18 @@
 $from->setSeconds(1);
 assert(1, $from->getSeconds());
 
+$timestamp = new \Google\Protobuf\Timestamp();
+
+date_default_timezone_set('UTC');
+$from = new DateTime('2011-01-01T15:03:01.012345UTC');
+$timestamp->fromDateTime($from);
+assert($from->format('U'), $timestamp->getSeconds());
+assert(0, $timestamp->getNanos());
+
+$to = $timestamp->toDateTime();
+assert(\DateTime::class, get_class($to));
+assert($from->format('U'), $to->format('U'));
+
 $from = new \Google\Protobuf\Value();
 $from->setNumberValue(1);
 assert(1, $from->getNumberValue());