Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

krakjoe · krakjoe · commit 6d797630ab17 · 2017-01-11T08:12:40.000Z
* 'PHP-7.1' 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
  Fix #73893: A hidden danger of death cycle in a function of gd
  Missing %s
  Ok, maybe Nikita is right. We should default this on.
  Missed one. This needs gc as well
  These tests expect gc to be enabled
diff --git a/Zend/tests/bug63734.phpt b/Zend/tests/bug63734.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63734 (Garbage collector can free zvals that are still referenced)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 class C {
diff --git a/Zend/tests/bug69446.phpt b/Zend/tests/bug69446.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69446 (GC leak relating to removal of nested data after dtors run)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 $bar = NULL;
diff --git a/Zend/tests/bug69446_2.phpt b/Zend/tests/bug69446_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69446 (GC leak relating to removal of nested data after dtors run)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 $bar = NULL;
diff --git a/Zend/tests/bug69534.phpt b/Zend/tests/bug69534.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #69534 (Cycle leaks through declared properties on internal classes)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 class Node extends SplObjectStorage {
diff --git a/Zend/tests/bug70805_1.phpt b/Zend/tests/bug70805_1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Crash)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 class A {
diff --git a/Zend/tests/bug70805_2.phpt b/Zend/tests/bug70805_2.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #70805 (Segmentation faults whilst running Drupal 8 test suite) (Memleak)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 class A {
diff --git a/Zend/tests/bug71818.phpt b/Zend/tests/bug71818.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #71818 (Memory leak when array altered in destructor)
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 class MemoryLeak
diff --git a/Zend/tests/gc_033.phpt b/Zend/tests/gc_033.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GC 033: Crash in GC while run with phpspec
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 $a = new stdClass();
diff --git a/Zend/tests/gc_035.phpt b/Zend/tests/gc_035.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GC 035: Lost inner-cycles garbage
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 class A {
diff --git a/Zend/tests/generators/gc_with_yield_from.phpt b/Zend/tests/generators/gc_with_yield_from.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Verify yield from on generators being properly cycle collected
+--INI--
+zend.enable_gc = 1
 --FILE--
 <?php
 
diff --git a/ext/dom/attr.c b/ext/dom/attr.c
@@ -213,7 +213,7 @@ Since: DOM Level 3
 */
 int dom_attr_schema_type_info_read(dom_object *obj, zval *retval)
 {
-	php_error_docref(NULL, E_WARNING, "Not yet implemented");
+	/* TODO */
 	ZVAL_NULL(retval);
 	return SUCCESS;
 }
diff --git a/ext/dom/node.c b/ext/dom/node.c
@@ -549,7 +549,8 @@ int dom_node_next_sibling_read(dom_object *obj, zval *retval)
 
 	nextsib = nodep->next;
 	if (!nextsib) {
-		return FAILURE;
+		ZVAL_NULL(retval);
+		return SUCCESS;
 	}
 
 	php_dom_create_object(nextsib, retval, obj);
diff --git a/ext/dom/tests/bug61858.phpt b/ext/dom/tests/bug61858.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #61858 DOMAttr debug info generates E_WARNING
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--FILE--
+<?php
+$doc = new DOMDocument();
+$doc->loadXML('<example a="b">Test</example>');
+
+$example = $doc->getElementsByTagName('example')->item(0);
+$attr    = $example->getAttributeNode('a');
+
+var_dump($attr);
+print_r($attr);
+--EXPECTF--
+object(DOMAttr)#%d (%d) {
+%A
+}
+DOMAttr Object
+(
+%A
+)
diff --git a/ext/dom/tests/bug69846.phpt b/ext/dom/tests/bug69846.phpt
@@ -31,7 +31,7 @@ foreach ($dataNodes AS $node) {
 ===DONE===
 --EXPECTF--
 int(3)
-object(DOMText)#%d (18) {
+object(DOMText)#%d (19) {
   ["wholeText"]=>
   string(3) "
   "
@@ -57,6 +57,8 @@ object(DOMText)#%d (18) {
   NULL
   ["previousSibling"]=>
   NULL
+  ["nextSibling"]=>
+  NULL
   ["attributes"]=>
   NULL
   ["ownerDocument"]=>
@@ -73,7 +75,7 @@ object(DOMText)#%d (18) {
   string(3) "
   "
 }
-object(DOMElement)#%d (17) {
+object(DOMElement)#%d (18) {
   ["tagName"]=>
   string(5) "form1"
   ["schemaTypeInfo"]=>
@@ -98,6 +100,8 @@ object(DOMElement)#%d (17) {
   string(22) "(object value omitted)"
   ["previousSibling"]=>
   NULL
+  ["nextSibling"]=>
+  NULL
   ["attributes"]=>
   string(22) "(object value omitted)"
   ["ownerDocument"]=>
@@ -117,7 +121,7 @@ object(DOMElement)#%d (17) {
     Value C
   "
 }
-object(DOMText)#%d (18) {
+object(DOMText)#%d (19) {
   ["wholeText"]=>
   string(1) "
 "
@@ -143,6 +147,8 @@ object(DOMText)#%d (18) {
   NULL
   ["previousSibling"]=>
   NULL
+  ["nextSibling"]=>
+  NULL
   ["attributes"]=>
   NULL
   ["ownerDocument"]=>
diff --git a/ext/dom/tests/bug73907.phpt b/ext/dom/tests/bug73907.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #73907 nextSibling property not included in var_dump of DOMNode
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$xmlString = '<?xml version="1.0" encoding="utf-8" ?>
+<root>
+</root>';
+
+$doc = new DOMDocument();
+$doc->loadXML($xmlString);
+$attr = $doc->documentElement;
+
+var_dump($attr);
+--EXPECTF--
+object(DOMElement)#%d (%d) {%A
+  ["nextSibling"]=>
+  NULL
+%A}
diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt
@@ -61,9 +61,7 @@ object(DOMException)#%d (7) {
       ["args"]=>
       array(1) {
         [0]=>
-        
-Warning: var_dump(): %s
-DOMAttr
+        DOMAttr
       }
     }
   }
diff --git a/ext/dom/tests/domobject_debug_handler.phpt b/ext/dom/tests/domobject_debug_handler.phpt
@@ -47,6 +47,7 @@ DOMDocument Object
     [firstChild] => (object value omitted)
     [lastChild] => (object value omitted)
     [previousSibling] => 
+    [nextSibling] => 
     [attributes] => 
     [ownerDocument] => 
     [namespaceURI] => 
diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
@@ -693,8 +693,6 @@ void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, in
 gdImagePtr gdImageRotate90(gdImagePtr src, int ignoretransparent);
 gdImagePtr gdImageRotate180(gdImagePtr src, int ignoretransparent);
 gdImagePtr gdImageRotate270(gdImagePtr src, int ignoretransparent);
-gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
-gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int ignoretransparent);
 gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, int bgcolor);
 
 void gdImageSetBrush(gdImagePtr im, gdImagePtr brush);
diff --git a/ext/gd/libgd/gd_rotate.c b/ext/gd/libgd/gd_rotate.c
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
diff --git a/ext/mcrypt/tests/bug67707.phpt b/ext/mcrypt/tests/bug67707.phpt
diff --git a/ext/session/tests/session_set_save_handler_sid_002.phpt b/ext/session/tests/session_set_save_handler_sid_002.phpt
diff --git a/ext/standard/tests/streams/glob-wrapper.phpt b/ext/standard/tests/streams/glob-wrapper.phpt
diff --git a/run-tests.php b/run-tests.php

-Original file line number
+Diff line change
@@ @@ -1,5 +1,7 @@ @@
 --TEST--
 Verify yield from on generators being properly cycle collected
 +--INI--
 +zend.enable_gc = 1
 --FILE--
 <?php