Skip to content

Commit 836fc12

Browse files
committed
Fix DOM
1 parent 9c47492 commit 836fc12

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

ext/dom/node.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,8 @@ zend_result dom_node_owner_document_read(dom_object *obj, zval *retval)
469469

470470
xmlDocPtr docp = nodep->doc;
471471
if (!docp) {
472-
return FAILURE;
472+
ZVAL_NULL(retval);
473+
return SUCCESS;
473474
}
474475

475476
php_dom_create_object((xmlNodePtr) docp, retval, obj);

ext/dom/tests/DOMEntityReference_predefined_free.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $ref = new DOMEntityReference("amp");
88
var_dump($ref);
99
?>
1010
--EXPECTF--
11-
object(DOMEntityReference)#1 (17) {
11+
object(DOMEntityReference)#1 (18) {
1212
["nodeName"]=>
1313
string(3) "amp"
1414
["nodeValue"]=>
@@ -33,6 +33,8 @@ object(DOMEntityReference)#1 (17) {
3333
NULL
3434
["isConnected"]=>
3535
bool(false)
36+
["ownerDocument"]=>
37+
NULL
3638
["namespaceURI"]=>
3739
NULL
3840
["prefix"]=>

ext/dom/tests/delayed_freeing/without_contructor.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ try {
3131

3232
?>
3333
--EXPECT--
34-
object(DOMNode)#2 (0) {
35-
}
3634
Invalid State Error
3735
Couldn't fetch DOMNode
3836
Couldn't fetch DOMNode

ext/dom/tests/gh16316.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,5 @@ try {
2424

2525
?>
2626
--EXPECT--
27-
object(Demo)#1 (1) {
28-
["registerNodeNamespaces"]=>
29-
bool(true)
30-
}
3127
Invalid State Error
3228
Invalid State Error

ext/dom/tests/modern/spec/Document_implementation_createDocumentType.phpt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ foreach ($test_matrix as $test_item) {
2525

2626
?>
2727
--EXPECT--
28-
object(Dom\DocumentType)#3 (19) {
28+
object(Dom\DocumentType)#3 (20) {
2929
["name"]=>
3030
string(5) "qname"
3131
["entities"]=>
@@ -46,6 +46,8 @@ object(Dom\DocumentType)#3 (19) {
4646
NULL
4747
["isConnected"]=>
4848
bool(false)
49+
["ownerDocument"]=>
50+
NULL
4951
["parentNode"]=>
5052
NULL
5153
["parentElement"]=>
@@ -68,7 +70,7 @@ object(Dom\DocumentType)#3 (19) {
6870
<?xml version="1.0" encoding="UTF-8"?>
6971
<!DOCTYPE qname PUBLIC "public" "system">
7072

71-
object(Dom\DocumentType)#2 (19) {
73+
object(Dom\DocumentType)#2 (20) {
7274
["name"]=>
7375
string(5) "qname"
7476
["entities"]=>
@@ -89,6 +91,8 @@ object(Dom\DocumentType)#2 (19) {
8991
NULL
9092
["isConnected"]=>
9193
bool(false)
94+
["ownerDocument"]=>
95+
NULL
9296
["parentNode"]=>
9397
NULL
9498
["parentElement"]=>
@@ -111,7 +115,7 @@ object(Dom\DocumentType)#2 (19) {
111115
<?xml version="1.0" encoding="UTF-8"?>
112116
<!DOCTYPE qname PUBLIC "public" "">
113117

114-
object(Dom\DocumentType)#1 (19) {
118+
object(Dom\DocumentType)#1 (20) {
115119
["name"]=>
116120
string(5) "qname"
117121
["entities"]=>
@@ -132,6 +136,8 @@ object(Dom\DocumentType)#1 (19) {
132136
NULL
133137
["isConnected"]=>
134138
bool(false)
139+
["ownerDocument"]=>
140+
NULL
135141
["parentNode"]=>
136142
NULL
137143
["parentElement"]=>
@@ -154,7 +160,7 @@ object(Dom\DocumentType)#1 (19) {
154160
<?xml version="1.0" encoding="UTF-8"?>
155161
<!DOCTYPE qname SYSTEM "system">
156162

157-
object(Dom\DocumentType)#4 (19) {
163+
object(Dom\DocumentType)#4 (20) {
158164
["name"]=>
159165
string(5) "qname"
160166
["entities"]=>
@@ -175,6 +181,8 @@ object(Dom\DocumentType)#4 (19) {
175181
NULL
176182
["isConnected"]=>
177183
bool(false)
184+
["ownerDocument"]=>
185+
NULL
178186
["parentNode"]=>
179187
NULL
180188
["parentElement"]=>

ext/dom/tests/modern/xml/DTDNamedNodeMap.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ object(Dom\Entity)#3 (17) {
142142
["textContent"]=>
143143
NULL
144144
}
145-
object(Dom\Notation)#4 (13) {
145+
object(Dom\Notation)#4 (14) {
146146
["nodeType"]=>
147147
int(12)
148148
["nodeName"]=>
@@ -151,6 +151,8 @@ object(Dom\Notation)#4 (13) {
151151
NULL
152152
["isConnected"]=>
153153
bool(false)
154+
["ownerDocument"]=>
155+
NULL
154156
["parentNode"]=>
155157
NULL
156158
["parentElement"]=>

0 commit comments

Comments
 (0)