summaryrefslogtreecommitdiff
path: root/ext/sqlite3/tests
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-07-27 16:47:09 +0200
committerChristoph M. Becker <cmb@php.net>2016-07-27 16:48:29 +0200
commit23c359c27614a8b30afd860f2543912d1b297d08 (patch)
tree6b12f605c3df382816c98c35eb27d958e4068003 /ext/sqlite3/tests
parent0d2c4f822c614c544df736a30dffc00104fdbd57 (diff)
parentcc125f277b50e0f90fc8033fe7f47d2446389a15 (diff)
downloadphp-git-23c359c27614a8b30afd860f2543912d1b297d08.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts: # ext/sqlite3/sqlite3.c
Diffstat (limited to 'ext/sqlite3/tests')
-rw-r--r--ext/sqlite3/tests/sqlite3_open_empty_string.phpt9
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
index 86868eeed1..940056bf0a 100644
--- a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
+++ b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
@@ -7,13 +7,8 @@ Thijs Feryn <thijs@feryn.eu>
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
--FILE--
<?php
-try{
- $db = new SQLite3('');
-} catch(Exception $e) {
- echo $e->getMessage().PHP_EOL;
-}
+$db = new SQLite3('');
echo "Done\n";
?>
---EXPECTF--
-Unable to expand filepath
+--EXPECT--
Done