From 299e02c82a1d4626e209f978001bba6d66885c05 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Sun, 1 Jan 2017 06:49:42 +0000
Subject: [PATCH 1/4] news entry for PR #2263

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index d06b6c4ae3c..90be979b5c7 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ PHP                                                                        NEWS
   . Fixed bug #73679 (DOTNET read access violation using invalid codepage).
     (Anatol)
 
+- DOM:
+  . Fixed dom class cannot be inherited by internal class. (dreamsxin)
+
 - Mbstring:
   . Fixed bug #73646 (mb_ereg_search_init null pointer dereference).
     (Laruence)

From dbfbe6261d9b1c0928f6bd8bcb6c7aabb807ffcb Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Sun, 1 Jan 2017 06:52:41 +0000
Subject: [PATCH 2/4] Revert "Fix dom class can't be inherited by the internal
 class"

This reverts commit 705f60e481b891d009ec9bb4c88390545ff95880.
---
 ext/dom/php_dom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index a59e63a87c4..9879d81c1c7 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -1075,7 +1075,7 @@ static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool
 	dom_object *intern = ecalloc(1, sizeof(dom_object) + zend_object_properties_size(class_type));
 
 	zend_class_entry *base_class = class_type;
-	while ((base_class->type != ZEND_INTERNAL_CLASS || base_class->info.internal.module != &dom_module_entry) && base_class->parent != NULL) {
+	while (base_class->type != ZEND_INTERNAL_CLASS && base_class->parent != NULL) {
 		base_class = base_class->parent;
 	}
 

From e51f284c783dcca59d131df85d052f0ff43714e3 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Sun, 1 Jan 2017 06:52:59 +0000
Subject: [PATCH 3/4] Revert "news entry for PR #2263"

This reverts commit 299e02c82a1d4626e209f978001bba6d66885c05.
---
 NEWS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/NEWS b/NEWS
index 90be979b5c7..d06b6c4ae3c 100644
--- a/NEWS
+++ b/NEWS
@@ -21,9 +21,6 @@ PHP                                                                        NEWS
   . Fixed bug #73679 (DOTNET read access violation using invalid codepage).
     (Anatol)
 
-- DOM:
-  . Fixed dom class cannot be inherited by internal class. (dreamsxin)
-
 - Mbstring:
   . Fixed bug #73646 (mb_ereg_search_init null pointer dereference).
     (Laruence)

From 8467c5c9bff6f06f3aa79760fbd26684deb4bc11 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jan 2017 12:15:52 +0100
Subject: [PATCH 4/4] Fix year dependent test

---
 ext/date/tests/bug73426.phpt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/date/tests/bug73426.phpt b/ext/date/tests/bug73426.phpt
index c2a700ad950..6f3b19e05da 100644
--- a/ext/date/tests/bug73426.phpt
+++ b/ext/date/tests/bug73426.phpt
@@ -4,12 +4,12 @@ Bug #73426 (createFromFormat with 'z' format char results in incorrect time)
 date.timezone=UTC
 --FILE--
 <?php
-$date = '12:00:00 15';
-$format = 'H:i:s z';
+$date = '2016 12:00:00 15';
+$format = 'Y H:i:s z';
 var_dump(DateTime::createFromFormat($format, $date));
 
-$date = '16 12:00:00';
-$format = 'z H:i:s';
+$date = '16 12:00:00 2016';
+$format = 'z H:i:s Y';
 var_dump(DateTime::createFromFormat($format, $date));
 
 ?>