diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-02 18:52:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-06 11:27:34 +0200 |
| commit | 122d759618a42bff105971b923fbbb5be02e34b9 (patch) | |
| tree | fd4487414ffa3f120c77b19b9eb7dc409659c57e /ext/pdo_mysql/tests | |
| parent | 884b0365dbe718f667d048dbc3d1cd9d9f12ab84 (diff) | |
| download | php-git-122d759618a42bff105971b923fbbb5be02e34b9.tar.gz | |
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.
Diffstat (limited to 'ext/pdo_mysql/tests')
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql___construct.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt index 2a890c963d..f0048ff305 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt @@ -31,7 +31,7 @@ MySQLPDOTest::skip(); try { if (NULL !== ($db = @new PDO())) printf("[001] Too few parameters\n"); - } catch (Exception $ex) { + } catch (TypeException $ex) { } print tryandcatch(2, '$db = new PDO(chr(0));'); diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt index 5166958d24..9a64f59fe2 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt @@ -70,7 +70,7 @@ MySQLPDOTest::skip(); try { if (NULL !== ($db = @new PDO($dsn, $user, $pass, 'wrong type'))) printf("[001] Expecting NULL got %s/%s\n", gettype($db), $db); - } catch (Exception $e) { + } catch (TypeException $e) { } if (!is_object($db = new PDO($dsn, $user, $pass, array()))) |