X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.c;h=619559d0fe724d393d299b72b467c0b84cd5a673;hp=eb1ca97cdae75a4d3ef8df9e68f2063bb2dba604;hb=843fc4cf789fa12ef08e6beefc4653498fe73bfd;hpb=c753ebfed3a4b21409cfa46212fd2c55227c809f

diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c
index eb1ca97..619559d 100644
--- a/src/php_pq_misc.c
+++ b/src/php_pq_misc.c
@@ -24,8 +24,8 @@
 
 #include "php_pq.h"
 #include "php_pqexc.h"
-#include "php_pqconn_event.h"
 #include "php_pq_misc.h"
+#include "php_pqconn_event.h"
 #undef PHP_PQ_TYPE
 #include "php_pq_type.h"
 
@@ -139,7 +139,11 @@ static PHP_METHOD(pqdt, __toString)
 ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_create_from_format, 0, 0, 2)
 	ZEND_ARG_INFO(0, format)
 	ZEND_ARG_INFO(0, datetime)
+#if PHP_VERSION_ID >= 70200
+	ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1)
+#else
 	ZEND_ARG_INFO(0, timezone)
+#endif
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqdt, createFromFormat)
 {
@@ -314,6 +318,9 @@ static ZEND_RESULT_CODE parse_element(ArrayParserState *a, char delim)
 	case '{':
 		return parse_array(a);
 
+	case '}':
+		return SUCCESS;
+
 	case '"':
 		a->quotes = 1;
 		++a->ptr;
@@ -363,7 +370,7 @@ static ZEND_RESULT_CODE parse_element(ArrayParserState *a, char delim)
 
 static ZEND_RESULT_CODE parse_elements(ArrayParserState *a)
 {
-	char delims[] = {'}', PHP_PQ_DELIM_OF_ARRAY(a->typ), 0};
+	char delims[] = {'}', (char) PHP_PQ_DELIM_OF_ARRAY(a->typ), 0};
 
 	while (SUCCESS == parse_element(a, delims[1])) {
 		switch (caa(a, delims, 0)) {