From 9f6aceaa8ce8250d9e36225180c218035bd49fe9 Mon Sep 17 00:00:00 2001
From: Bo Yang <teboring@google.com>
Date: Tue, 12 Dec 2017 12:06:51 -0800
Subject: Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp
 util can be used at install time.

---
 php/ext/google/protobuf/message.c | 13 ++++++++++++-
 php/tests/test.sh                 |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'php')

diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c
index b14c1f0c..70080a3b 100644
--- a/php/ext/google/protobuf/message.c
+++ b/php/ext/google/protobuf/message.c
@@ -29,9 +29,12 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <php.h>
-#include <ext/date/php_date.h>
 #include <stdlib.h>
 
+#ifdef PROTOBUF_ENABLE_TIMESTAMP
+#include <ext/date/php_date.h>
+#endif
+
 #include "protobuf.h"
 #include "utf8.h"
 
@@ -1121,6 +1124,7 @@ PHP_PROTO_FIELD_ACCESSORS(Timestamp, timestamp, Seconds, "seconds")
 PHP_PROTO_FIELD_ACCESSORS(Timestamp, timestamp, Nanos,   "nanos")
 
 PHP_METHOD(Timestamp, fromDateTime) {
+#ifdef PROTOBUF_ENABLE_TIMESTAMP
   zval* datetime;
   zval member;
 
@@ -1149,9 +1153,13 @@ PHP_METHOD(Timestamp, fromDateTime) {
   storage = message_data(self);
   memory = slot_memory(self->descriptor->layout, storage, field);
   *(int32_t*)memory = 0;
+#else
+  zend_error(E_USER_ERROR, "fromDateTime needs date extension.");
+#endif
 }
 
 PHP_METHOD(Timestamp, toDateTime) {
+#ifdef PROTOBUF_ENABLE_TIMESTAMP
   zval datetime;
   php_date_instantiate(php_date_get_date_ce(), &datetime TSRMLS_CC);
   php_date_obj* dateobj = UNBOX(php_date_obj, &datetime);
@@ -1184,6 +1192,9 @@ PHP_METHOD(Timestamp, toDateTime) {
 
   zval* datetime_ptr = &datetime;
   PHP_PROTO_RETVAL_ZVAL(datetime_ptr);
+#else
+  zend_error(E_USER_ERROR, "toDateTime needs date extension.");
+#endif
 }
 
 // -----------------------------------------------------------------------------
diff --git a/php/tests/test.sh b/php/tests/test.sh
index c35372d3..a308a1d2 100755
--- a/php/tests/test.sh
+++ b/php/tests/test.sh
@@ -5,7 +5,7 @@ pushd ../ext/google/protobuf/
 make clean || true
 set -e
 # Add following in configure for debug: --enable-debug CFLAGS='-g -O0'
-phpize && ./configure CFLAGS='-g -O0' && make
+phpize && ./configure CFLAGS='-g -O0 -DPROTOBUF_ENABLE_TIMESTAMP' && make
 popd
 
 tests=( array_test.php encode_decode_test.php generated_class_test.php generated_phpdoc_test.php map_field_test.php well_known_test.php generated_service_test.php descriptors_test.php )
-- 
cgit v1.2.3