webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

fix phpdoc; throw exception on error within phpunit - helps testing

Browse Source
This commit is contained in:
David Goodwin
2019-09-15 21:08:08 +01:00
parent f7c7e35b34
commit 4081267cb2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
functions.inc.php
View File

@@ -494,10 +494,9 @@ function get_domain_properties($domain) {
/** /**
* create_page_browser * create_page_browser
* Action: Get page browser for a long list of mailboxes, aliases etc. * Action: Get page browser for a long list of mailboxes, aliases etc.
* Call: $pagebrowser = create_page_browser('table.field', 'query', 50) # replaces $param = $_GET['param']
* *
* @param string $idxfield - database field name to use as title * @param string $idxfield - database field name to use as title e.g. alias.address
* @param string $querypart - core part of the query (starting at "FROM") * @param string $querypart - core part of the query (starting at "FROM") e.g. FROM alias WHERE address like ...
* @return array * @return array
*/ */
function create_page_browser($idxfield, $querypart, $sql_params = []) { function create_page_browser($idxfield, $querypart, $sql_params = []) {
@@ -1729,6 +1728,9 @@ function db_query($sql, array $values = array(), $ignore_errors = false) {
} catch (PDOException $e) { } catch (PDOException $e) {
$error_text = "Invalid query: " . $e->getMessage() . " caused by " . $sql ; $error_text = "Invalid query: " . $e->getMessage() . " caused by " . $sql ;
error_log($error_text); error_log($error_text);
if(defined('PHPUNIT_TEST')) {
throw new Exception("SQL query failed: {{{$sql}}} with " . json_encode($values) . ". Error message: " . $e->getMessage());
}
if (!$ignore_errors) { if (!$ignore_errors) {
throw new Exception("DEBUG INFORMATION: " . $e->getMessage() . "<br/> Check your error_log for the failed query"); throw new Exception("DEBUG INFORMATION: " . $e->getMessage() . "<br/> Check your error_log for the failed query");
} }