Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/spl/spl_observer.c

1 files changed, 5 insertions, 5 deletions

diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 76b98a51d0..c189205879 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -230,11 +230,6 @@ static zend_object *spl_object_storage_new_ex(zend_class_entry *class_type, zval
 
 	intern->std.handlers = &spl_handler_SplObjectStorage;
 
-	if (orig) {
-		spl_SplObjectStorage *other = Z_SPLOBJSTORAGE_P(orig);
-		spl_object_storage_addall(intern, orig, other);
-	}
-
 	while (parent) {
 		if (parent == spl_ce_SplObjectStorage) {
 			if (class_type != spl_ce_SplObjectStorage) {
@@ -249,6 +244,11 @@ static zend_object *spl_object_storage_new_ex(zend_class_entry *class_type, zval
 		parent = parent->parent;
 	}
 
+	if (orig) {
+		spl_SplObjectStorage *other = Z_SPLOBJSTORAGE_P(orig);
+		spl_object_storage_addall(intern, orig, other);
+	}
+
 	return &intern->std;
 }
 /* }}} */