Skip to content

Commit cf897bc

Browse files
krakjoekrakjoe
committed
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src: Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning Add support for "xfail" to phpt SKIPIF sections Fixed #73907 (nextSibling property not included in var_dump of DOMNode) Fixed bug #61858 (DOMAttr debug info generates E_WARNING) Fix glob-wrapper.phpt to not fail in Windows Set a session path for this test Set a session path for this test Fix #73893: A hidden danger of death cycle in a function of gd Missing %s Missing %s More missing gc inis Ok, maybe Nikita is right. We should default this on. Missed one. This needs gc as well Missed one. This needs gc as well These tests rely on gc being enabled These tests expect gc to be enabled
2 parents 2118dcb + 63b36be commit cf897bc

22 files changed

+90
-197
lines changed

‎Zend/tests/bug63734.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #63734 (Garbage collector can free zvals that are still referenced)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
class C {

‎Zend/tests/bug69446.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #69446 (GC leak relating to removal of nested data after dtors run)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
$bar = NULL;

‎Zend/tests/bug69446_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #69446 (GC leak relating to removal of nested data after dtors run)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
$bar = NULL;

‎Zend/tests/bug69534.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #69534 (Cycle leaks through declared properties on internal classes)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
class Node extends SplObjectStorage {

‎Zend/tests/bug70805_1.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Crash)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
class A {

‎Zend/tests/bug70805_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Memleak)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
class A {

‎Zend/tests/bug71818.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #71818 (Memory leak when array altered in destructor)
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
class MemoryLeak

‎Zend/tests/gc_033.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
GC 033: Crash in GC while run with phpspec
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
$a = new stdClass();

‎Zend/tests/gc_035.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
GC 035: Lost inner-cycles garbage
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57
class A {

‎Zend/tests/generators/gc_with_yield_from.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Verify yield from on generators being properly cycle collected
3+
--INI--
4+
zend.enable_gc = 1
35
--FILE--
46
<?php
57

‎ext/dom/attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Since: DOM Level 3
213213
*/
214214
int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
215215
{
216-
php_error_docref(NULL, E_WARNING, "Not yet implemented");
216+
/* TODO */
217217
ZVAL_NULL(retval);
218218
return SUCCESS;
219219
}

‎ext/dom/node.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,8 @@ int dom_node_next_sibling_read(dom_object *obj, zval *retval)
549549

550550
nextsib = nodep->next;
551551
if (!nextsib) {
552-
return FAILURE;
552+
ZVAL_NULL(retval);
553+
return SUCCESS;
553554
}
554555

555556
php_dom_create_object(nextsib, retval, obj);

‎ext/dom/tests/bug61858.phpt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--TEST--
2+
Bug #61858 DOMAttr debug info generates E_WARNING
3+
--SKIPIF--
4+
<?php
5+
require_once('skipif.inc');
6+
?>
7+
--FILE--
8+
<?php
9+
$doc = new DOMDocument();
10+
$doc->loadXML('<example a="b">Test</example>');
11+
12+
$example = $doc->getElementsByTagName('example')->item(0);
13+
$attr = $example->getAttributeNode('a');
14+
15+
var_dump($attr);
16+
print_r($attr);
17+
--EXPECTF--
18+
object(DOMAttr)#%d (%d) {
19+
%A
20+
}
21+
DOMAttr Object
22+
(
23+
%A
24+
)

‎ext/dom/tests/bug69846.phpt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ foreach ($dataNodes AS $node) {
3131
===DONE===
3232
--EXPECTF--
3333
int(3)
34-
object(DOMText)#%d (18) {
34+
object(DOMText)#%d (19) {
3535
["wholeText"]=>
3636
string(3) "
3737
"
@@ -57,6 +57,8 @@ object(DOMText)#%d (18) {
5757
NULL
5858
["previousSibling"]=>
5959
NULL
60+
["nextSibling"]=>
61+
NULL
6062
["attributes"]=>
6163
NULL
6264
["ownerDocument"]=>
@@ -73,7 +75,7 @@ object(DOMText)#%d (18) {
7375
string(3) "
7476
"
7577
}
76-
object(DOMElement)#%d (17) {
78+
object(DOMElement)#%d (18) {
7779
["tagName"]=>
7880
string(5) "form1"
7981
["schemaTypeInfo"]=>
@@ -98,6 +100,8 @@ object(DOMElement)#%d (17) {
98100
string(22) "(object value omitted)"
99101
["previousSibling"]=>
100102
NULL
103+
["nextSibling"]=>
104+
NULL
101105
["attributes"]=>
102106
string(22) "(object value omitted)"
103107
["ownerDocument"]=>
@@ -117,7 +121,7 @@ object(DOMElement)#%d (17) {
117121
Value C
118122
"
119123
}
120-
object(DOMText)#%d (18) {
124+
object(DOMText)#%d (19) {
121125
["wholeText"]=>
122126
string(1) "
123127
"
@@ -143,6 +147,8 @@ object(DOMText)#%d (18) {
143147
NULL
144148
["previousSibling"]=>
145149
NULL
150+
["nextSibling"]=>
151+
NULL
146152
["attributes"]=>
147153
NULL
148154
["ownerDocument"]=>

‎ext/dom/tests/bug73907.phpt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--TEST--
2+
Bug #73907 nextSibling property not included in var_dump of DOMNode
3+
--SKIPIF--
4+
<?php require_once('skipif.inc'); ?>
5+
--FILE--
6+
<?php
7+
$xmlString = '<?xml version="1.0" encoding="utf-8" ?>
8+
<root>
9+
</root>';
10+
11+
$doc = new DOMDocument();
12+
$doc->loadXML($xmlString);
13+
$attr = $doc->documentElement;
14+
15+
var_dump($attr);
16+
--EXPECTF--
17+
object(DOMElement)#%d (%d) {%A
18+
["nextSibling"]=>
19+
NULL
20+
%A}

‎ext/dom/tests/dom_set_attr_node.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ object(DOMException)#%d (7) {
6161
["args"]=>
6262
array(1) {
6363
[0]=>
64-
65-
Warning: var_dump(): %s
66-
DOMAttr
64+
DOMAttr
6765
}
6866
}
6967
}

‎ext/dom/tests/domobject_debug_handler.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ DOMDocument Object
4747
[firstChild] => (object value omitted)
4848
[lastChild] => (object value omitted)
4949
[previousSibling] =>
50+
[nextSibling] =>
5051
[attributes] =>
5152
[ownerDocument] =>
5253
[namespaceURI] =>

‎ext/gd/libgd/gd.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,6 @@ void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, in
694694
gdImagePtr gdImageRotate90(gdImagePtr src, int ignoretransparent);
695695
gdImagePtr gdImageRotate180(gdImagePtr src, int ignoretransparent);
696696
gdImagePtr gdImageRotate270(gdImagePtr src, int ignoretransparent);
697-
gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
698-
gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
699697
gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, int bgcolor);
700698

701699
void gdImageSetBrush(gdImagePtr im, gdImagePtr brush);

0 commit comments

Comments
 (0)