summaryrefslogtreecommitdiff
path: root/ext/libxml
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2016-06-16 02:32:02 +0300
committerDmitry Stogov <dmitry@zend.com>2016-06-16 02:32:02 +0300
commitff363e2e7c58353b7e2751d1ca4d7bf616862aae (patch)
tree318bcb9b453c607f1d49c114999895748903b3da /ext/libxml
parenta9512af8109e889eb2c6042c57797184930667cd (diff)
downloadphp-git-ff363e2e7c58353b7e2751d1ca4d7bf616862aae.tar.gz
Implemented RFC: Replace "Missing argument" warning with "Too few arguments" exception
Squashed commit of the following: commit 8b45fa2acb8cd92542a39e1e4720fe1f4fabc26c Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Jun 16 01:52:50 2016 +0300 Separate slow path of ZEND_RECV into a cold function. commit 9e18895ee59c64c93a96b1ba3061355c4663e962 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed Jun 15 23:26:28 2016 +0300 Required argument can't be IS_UNDEF anymore. commit 662db66e3943d4455c65e4f987bb54abf724ecb2 Author: Dmitry Stogov <dmitry@zend.com> Date: Tue May 31 17:14:50 2016 +0300 Replace "Missing argument" warning by "Too few arguments" exception.
Diffstat (limited to 'ext/libxml')
-rw-r--r--ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt10
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
index 5ed079d8dd..7f1adde613 100644
--- a/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
+++ b/ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt
@@ -17,7 +17,11 @@ var_dump(libxml_set_external_entity_loader());
var_dump(libxml_set_external_entity_loader(function() {}, 2));
var_dump(libxml_set_external_entity_loader(function($a, $b, $c, $d) {}));
-var_dump($dd->validate());
+try {
+ var_dump($dd->validate());
+} catch (Throwable $e) {
+ echo "Exception: " . $e->getMessage() . "\n";
+}
echo "Done.\n";
@@ -32,8 +36,6 @@ Warning: libxml_set_external_entity_loader() expects exactly 1 parameter, 2 give
NULL
bool(true)
-Warning: Missing argument 4 for {closure}() in %s on line %d
-
Warning: DOMDocument::validate(): Could not load the external subset "http://example.com/foobar" in %s on line %d
-bool(false)
+Exception: Too few arguments to function {closure}(), 3 passed and exactly 4 expected
Done.