From 122d759618a42bff105971b923fbbb5be02e34b9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 2 Apr 2015 18:52:32 +0200 Subject: Always throw TypeException on throwing zpp failures Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors. --- ext/spl/tests/arrayObject___construct_error2.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/spl/tests/arrayObject___construct_error2.phpt') diff --git a/ext/spl/tests/arrayObject___construct_error2.phpt b/ext/spl/tests/arrayObject___construct_error2.phpt index 850a2cb3fc..d075516725 100644 --- a/ext/spl/tests/arrayObject___construct_error2.phpt +++ b/ext/spl/tests/arrayObject___construct_error2.phpt @@ -13,10 +13,10 @@ Class C implements Iterator { try { var_dump(new ArrayObject(new stdClass, 0, "C", "extra")); -} catch (InvalidArgumentException $e) { +} catch (TypeException $e) { echo $e->getMessage() . "(" . $e->getLine() . ")\n"; } ?> --EXPECTF-- Too many arguments: -ArrayObject::__construct() expects at most 3 parameters, 4 given(12) \ No newline at end of file +ArrayObject::__construct() expects at most 3 parameters, 4 given(12) -- cgit v1.2.1