Merge branch 'PHP-7.0' into PHP-7.1

Author: nikic

NEWS

@@ -8,6 +8,9 @@ PHP                                                                        NEWS
   . Fixed bug #73876 (Crash when exporting **= in expansion of assign op).
     (Sara)
 
+- Dom:
+  . Fixed bug #61858 (DOMAttr debug info generates E_WARNING). (Arnout Boks)
+
 - GD:
   . Fixed bug #73893 (A hidden danger of death cycle in a function of gd). (cmb)
 

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;
 }

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
+)

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
       }
     }
   }