Fix merge conflicts

Author: TysonAndre

ext/spl/spl_cachediterable.c

@@ -851,7 +851,9 @@ PHP_METHOD(CachedIterable, toPairs)
 
 PHP_MINIT_FUNCTION(spl_cachediterable)
 {
-	REGISTER_SPL_STD_CLASS_EX(CachedIterable, spl_cachediterable_new, class_CachedIterable_methods);
+	spl_ce_CachedIterable = register_class_CachedIterable(zend_ce_aggregate, zend_ce_countable, php_json_serializable_ce);
+	spl_ce_CachedIterable->create_object = spl_cachediterable_new;
+
 	memcpy(&spl_handler_CachedIterable, &std_object_handlers, sizeof(zend_object_handlers));
 
 	spl_handler_CachedIterable.offset          = XtOffsetOf(spl_cachediterable_object, std);
@@ -862,10 +864,6 @@ PHP_MINIT_FUNCTION(spl_cachediterable)
 	spl_handler_CachedIterable.dtor_obj        = zend_objects_destroy_object;
 	spl_handler_CachedIterable.free_obj        = spl_cachediterable_object_free_storage;
 
-	REGISTER_SPL_IMPLEMENTS(CachedIterable, Aggregate);
-	REGISTER_SPL_IMPLEMENTS(CachedIterable, Countable);
-	REGISTER_SPL_IMPLEMENTS(CachedIterable, JsonSerializable);
-
 	spl_ce_CachedIterable->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES;
 	spl_ce_CachedIterable->get_iterator = spl_cachediterable_get_iterator;
 

ext/spl/spl_cachediterable.stub.php

@@ -1,6 +1,7 @@
 <?php
 
-/** @generate-function-entries */
+/** @generate-class-entries */
+
 final class CachedIterable implements IteratorAggregate, Countable, JsonSerializable
 {
     public function __construct(iterable $iterator) {}

ext/spl/spl_cachediterable_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f2487de3dcf99ed6017a07d57ba33c21b908b0c2 */
+ * Stub hash: d3090bb712370a96756fa04444ef292c4815640a */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_CachedIterable___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, iterator, IS_ITERABLE, 0)
@@ -66,3 +66,15 @@ static const zend_function_entry class_CachedIterable_methods[] = {
 	ZEND_ME(CachedIterable, jsonSerialize, arginfo_class_CachedIterable_jsonSerialize, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+static zend_class_entry *register_class_CachedIterable(zend_class_entry *class_entry_IteratorAggregate, zend_class_entry *class_entry_Countable, zend_class_entry *class_entry_JsonSerializable)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "CachedIterable", class_CachedIterable_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+	class_entry->ce_flags |= ZEND_ACC_FINAL;
+	zend_class_implements(class_entry, 3, class_entry_IteratorAggregate, class_entry_Countable, class_entry_JsonSerializable);
+
+	return class_entry;
+}