From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 25 Aug 2017 20:02:49 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0RC1~8^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52e854f0abf6827818ac9bdaae7b0f335d85b6de;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

52e854f0abf6827818ac9bdaae7b0f335d85b6de
diff --cc ext/intl/calendar/calendar_class.cpp
index a2024c0712,94a2d5a199..e9c817af03
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@@ -467,19 -474,9 +467,8 @@@ void calendar_register_IntlCalendar_cla
  	Calendar_handlers.offset = XtOffsetOf(Calendar_object, zo);
  	Calendar_handlers.clone_obj = Calendar_clone_obj;
  	Calendar_handlers.get_debug_info = Calendar_get_debug_info;
 -	Calendar_handlers.dtor_obj = Calendar_objects_dtor;
  	Calendar_handlers.free_obj = Calendar_objects_free;
  
- 	/* Create and register 'IntlGregorianCalendar' class. */
- 	INIT_CLASS_ENTRY(ce, "IntlGregorianCalendar", GregorianCalendar_class_functions);
- 	GregorianCalendar_ce_ptr = zend_register_internal_class_ex(&ce,
- 		Calendar_ce_ptr);
- 	if (!GregorianCalendar_ce_ptr) {
- 		//can't happen know without bigger problems before
- 		php_error_docref0(NULL, E_ERROR,
- 			"IntlGregorianCalendar: class registration has failed.");
- 		return;
- 	}
- 
  	/* Declare 'IntlCalendar' class constants */
  #define CALENDAR_DECL_LONG_CONST(name, val) \
  	zend_declare_class_constant_long(Calendar_ce_ptr, name, sizeof(name) - 1, \