Promote warnings to exceptions in ext/simplexml

Author: kocsismate

ext/simplexml/simplexml.c

@@ -400,7 +400,7 @@ static void change_node_zval(xmlNodePtr node, zval *value)
 			}
 			break;
 		default:
-			php_error_docref(NULL, E_WARNING, "It is not possible to assign complex types to nodes");
+			zend_type_error("It's not possible to assign a complex type to nodes, %s given", zend_zval_type_name(value));
 			break;
 	}
 }
@@ -457,7 +457,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
 			}
 
 			if (!Z_STRLEN_P(member)) {
-				php_error_docref(NULL, E_WARNING, "Cannot write or create unnamed %s", attribs ? "attribute" : "element");
+				zend_value_error("Cannot create or write %s with an empty name", attribs ? "attributes" : "elements");
 				if (member == &tmp_zv) {
 					zval_ptr_dtor_str(&tmp_zv);
 				}
@@ -485,7 +485,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
 			 * and could also be E_PARSE, but we use this only during parsing
 			 * and this is during runtime.
 			 */
-			zend_throw_error(NULL, "Cannot create unnamed attribute");
+			zend_value_error("Cannot create or write attributes with an empty name");
 			return &EG(error_zval);
 		}
 		if (attribs && !node && sxe->iter.type == SXE_ITER_ELEMENT) {
@@ -527,7 +527,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
 				if (member == &tmp_zv) {
 					zval_ptr_dtor_str(&tmp_zv);
 				}
-				zend_error(E_WARNING, "It is not yet possible to assign complex types to %s", attribs ? "attributes" : "properties");
+				zend_type_error("It's not possible to assign a complex type to %s, %s given", attribs ? "attributes" : "properties", zend_zval_type_name(value));
 				return &EG(error_zval);
 		}
 	}
@@ -1710,8 +1710,8 @@ SXE_METHOD(addChild)
 	}
 
 	if (qname_len == 0) {
-		php_error_docref(NULL, E_WARNING, "Element name is required");
-		return;
+		zend_argument_value_error(1, "cannot be empty");
+		RETURN_THROWS();
 	}
 
 	sxe = Z_SXEOBJ_P(ZEND_THIS);
@@ -1775,8 +1775,8 @@ SXE_METHOD(addAttribute)
 	}
 
 	if (qname_len == 0) {
-		php_error_docref(NULL, E_WARNING, "Attribute name is required");
-		return;
+		zend_argument_value_error(1, "cannot be empty");
+		RETURN_THROWS();
 	}
 
 	sxe = Z_SXEOBJ_P(ZEND_THIS);
@@ -2300,8 +2300,8 @@ PHP_FUNCTION(simplexml_load_file)
 	}
 
 	if (ZEND_LONG_EXCEEDS_INT(options)) {
-		php_error_docref(NULL, E_WARNING, "Invalid options");
-		RETURN_FALSE;
+		zend_argument_value_error(3, "is too large");
+		RETURN_THROWS();
 	}
 
 	docp = xmlReadFile(filename, NULL, (int)options);
@@ -2345,16 +2345,16 @@ PHP_FUNCTION(simplexml_load_string)
 	}
 
 	if (ZEND_SIZE_T_INT_OVFL(data_len)) {
-		php_error_docref(NULL, E_WARNING, "Data is too long");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "is too long");
+		RETURN_THROWS();
 	}
 	if (ZEND_SIZE_T_INT_OVFL(ns_len)) {
-		php_error_docref(NULL, E_WARNING, "Namespace is too long");
-		RETURN_FALSE;
+		zend_argument_value_error(4, "is too long");
+		RETURN_THROWS();
 	}
 	if (ZEND_LONG_EXCEEDS_INT(options)) {
-		php_error_docref(NULL, E_WARNING, "Invalid options");
-		RETURN_FALSE;
+		zend_argument_value_error(3, "is too large");
+		RETURN_THROWS();
 	}
 
 	docp = xmlReadMemory(data, (int)data_len, NULL, NULL, (int)options);

ext/simplexml/tests/012.phpt

@@ -14,8 +14,12 @@ EOF;
 
 $sxe = simplexml_load_string($xml);
 
+try {
+    $sxe[""] = "warning";
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
-$sxe[""] = "warning";
 $sxe["attr"] = "value";
 
 echo $sxe->asXML();
@@ -24,19 +28,19 @@ $sxe["attr"] = "new value";
 
 echo $sxe->asXML();
 
-$sxe[] = "error";
+try {
+    $sxe[] = "error";
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 __HALT_COMPILER();
 ?>
 ===DONE===
---EXPECTF--
-Warning: main(): Cannot write or create unnamed attribute in %s012.php on line %d
+--EXPECT--
+Cannot create or write attributes with an empty name
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <foo attr="value"/>
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <foo attr="new value"/>
-
-Fatal error: Uncaught Error: Cannot create unnamed attribute in %s012.php:%d
-Stack trace:
-#0 {main}
-  thrown in %s012.php on line %d
+Cannot create or write attributes with an empty name

ext/simplexml/tests/SimpleXMLElement_addAttribute_required_attribute_name.phpt

@@ -8,10 +8,16 @@ Havard Eide <[email protected]>
 --FILE--
 <?php
 $a = new SimpleXMLElement("<php>testfest</php>");
-$a->addAttribute( "", "" );
+
+try {
+    $a->addAttribute( "", "" );
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 echo $a->asXML();
 ?>
---EXPECTF--
-Warning: SimpleXMLElement::addAttribute(): Attribute name is required in %s on line %d
+--EXPECT--
+SimpleXMLElement::addAttribute(): Argument #1 ($qualifiedName) cannot be empty
 <?xml version="1.0"?>
 <php>testfest</php>

ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt

@@ -7,11 +7,14 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only");
 ?>
 --FILE--
 <?php
-$xml = simplexml_load_string("XXXXXXX^",$x,0x6000000000000001);
-var_dump($xml);
+
+try {
+    simplexml_load_string("XXXXXXX^", $x, 0x6000000000000001);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 ?>
 --EXPECTF--
 Warning: Undefined variable $x in %s on line %d
-
-Warning: simplexml_load_string(): Invalid options in %s on line %d
-bool(false)
+simplexml_load_string(): Argument #3 ($options) is too large

ext/simplexml/tests/bug37076_1.phpt

@@ -4,13 +4,18 @@ Bug #37076 (SimpleXML ignores .=) (appending to unnamed attribute)
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
+
 $xml = simplexml_load_string("<root><foo /></root>");
-$xml->{""} .= "bar";
+
+try {
+    $xml->{""} .= "bar";
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 print $xml->asXML();
 ?>
---EXPECTF--
-Warning: main(): Cannot write or create unnamed element in %s on line %d
-
-Warning: main(): Cannot write or create unnamed element in %s on line %d
+--EXPECT--
+Cannot create or write elements with an empty name
 <?xml version="1.0"?>
 <root><foo/></root>

ext/simplexml/tests/bug38406.phpt

@@ -13,7 +13,12 @@ $item->otherAttribute = $item->attribute;
 var_dump($item->otherAttribute);
 
 $a = array();
-$item->$a = new stdclass;
+
+try {
+    $item->$a = new stdclass;
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 echo "Done\n";
 ?>
@@ -28,6 +33,5 @@ object(SimpleXMLElement)#%d (1) {
 }
 
 Warning: Array to string conversion in %s on line %d
-
-Warning: It is not yet possible to assign complex types to properties in %s on line %d
+It's not possible to assign a complex type to properties, stdClass given
 Done