From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 19 Sep 2019 09:36:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0RC3~53^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f53b8268d6085b6978e5897a4a313c085d664ebf;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

f53b8268d6085b6978e5897a4a313c085d664ebf
diff --cc ext/date/php_date.c
index d3fa0ddd41,0bde543032..1a1f6e2b35
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2920,14 -2919,17 +2920,14 @@@ PHP_METHOD(DateTimeImmutable, createFro
  static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht)
  {
  	zval             *z_date;
 -	zval             *z_timezone;
 -	zval             *z_timezone_type;
  	zval              tmp_obj;
  	timelib_tzinfo   *tzi;
 -	php_timezone_obj *tzobj;
  
- 	z_date = zend_hash_str_find(myht, "date", sizeof("data")-1);
+ 	z_date = zend_hash_str_find(myht, "date", sizeof("date")-1);
  	if (z_date && Z_TYPE_P(z_date) == IS_STRING) {
 -		z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1);
 +		zval *z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1);
  		if (z_timezone_type && Z_TYPE_P(z_timezone_type) == IS_LONG) {
 -			z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1);
 +			zval *z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1);
  			if (z_timezone && Z_TYPE_P(z_timezone) == IS_STRING) {
  				switch (Z_LVAL_P(z_timezone_type)) {
  					case TIMELIB_ZONETYPE_OFFSET: