Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)

Author: laruence

ext/sqlite3/sqlite3.c

@@ -660,8 +660,10 @@ PHP_METHOD(sqlite3, querySingle)
 			break;
 		}
 		default:
+		if (!EG(exception)) {
 			php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
-			RETVAL_FALSE;
+		}
+		RETVAL_FALSE;
 	}
 	sqlite3_finalize(stmt);
 }

ext/sqlite3/tests/bug72668.phpt

@@ -0,0 +1,24 @@
+--TEST--
+Bug #72668 (Spurious warning when exception is thrown in user defined function)
+--SKIPIF--
+<?php
+if (!extension_loaded('sqlite3')) die('skip'); ?>
+--FILE--
+<?php
+function my_udf_md5($string) {
+	    throw new \Exception("test exception\n");
+}
+
+$db = new SQLite3(':memory:');
+$db->createFunction('my_udf_md5', 'my_udf_md5');
+
+try {
+	    $result = $db->querySingle('SELECT my_udf_md5("test")');
+		    var_dump($result);
+}
+catch(\Exception $e) {
+	    echo "Exception: ".$e->getMessage();
+}
+?>
+--EXPECT--
+Exception: test exception