From 174b874c56f99458759be6a18da7f8b792ce411b Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Thu, 17 Oct 2019 19:37:56 +0100 Subject: [PATCH] allow psalm to update phpdoc fix --- composer.json | 2 +- functions.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index d6cbf3bd..b9c00f29 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "php": ">7.2.0", "php-coveralls/php-coveralls" : "*", "phpunit/phpunit": "^6.0", - "vimeo/psalm":"3.0.8", + "vimeo/psalm":"3.*", "zendframework/zendframework1": "^1.12.0" }, "autoload": { diff --git a/functions.inc.php b/functions.inc.php index 308a0dfa..5407f7cd 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -333,7 +333,7 @@ function check_email($email) { * $sql = "SELECT * FROM foo WHERE x = '" . escape_string('fish') . "'"; * * - * @param int|string $string parameters to escape + * @param int|string $string_or_int parameters to escape * @return string cleaned data, suitable for use within an SQL statement. */ function escape_string($string_or_int) { @@ -1780,7 +1780,7 @@ function db_delete($table, $where, $delete, $additionalwhere='') { * @param string - table name * @param array $values - key/value map of data to insert into the table. * @param array $timestamp (optional) - array of fields to set to now() - default: array('created', 'modified') - * @param boolean $throw_errors + * @param boolean $throw_exceptions * @return int - number of inserted rows */ function db_insert($table, array $values, $timestamp = array('created', 'modified'), $throw_exceptions = false) {