CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for phpstan 1.0 level 8, fix spaces in config.master.php, add phpunit tets for math, email; update email class with more check methods

Browse Source
This commit is contained in:
Clemens Schwaighofer
2021-11-02 09:16:23 +09:00
parent 4c859ada01
commit 08bbc913a9
22 changed files with 692 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
www/lib/CoreLibs/DB/IO.php
View File

@@ -302,8 +302,6 @@ class IO extends \CoreLibs\Basic
private $insert_id_arr; // always return as array, even if only one
/** @var string */
private $insert_id_pk_name; // primary key name for insert recovery from insert_id_arr
/** @var string */
private $temp_sql;
// other vars
/** @var string */
private $nbsp = ''; // used by print_array recursion function
@@ -932,10 +930,7 @@ class IO extends \CoreLibs\Basic
$this->warning_id = 31;
$this->__dbError($cursor, '[dbExec]');
}
} elseif (
$stm_name === null ||
($stm_name !== null && !empty($cursor))
) {
} else { // was stm_name null or not null and cursor
// we have returning, now we need to check if we get one or many returned
// we'll need to loop this, if we have multiple insert_id returns
while (
@@ -2202,14 +2197,12 @@ class IO extends \CoreLibs\Basic
$q = 'UPDATE ' . $table . ' SET ';
$q .= $q_sub_data . ' ';
$q .= 'WHERE ' . $primary_key['row'] . ' = ' . $primary_key['value'];
$this->temp_sql = $q_sub_data;
} else {
$q = 'INSERT INTO ' . $table . ' (';
$q .= $q_sub_value;
$q .= ') VALUES (';
$q .= $q_sub_data;
$q .= ')';
$this->temp_sql = $q;
}
if (!$this->dbExec($q)) {
return false;
@@ -2426,7 +2419,7 @@ class IO extends \CoreLibs\Basic
*/
public function dbGetNumRows()
{
return $this->num_rows ?? null;
return $this->num_rows;
}
/**
@@ -2440,6 +2433,17 @@ class IO extends \CoreLibs\Basic
return $this->had_error;
}
/**
* Sets warning number that was last
* So we always have the last warning number stored even if a new one is created
*
* @return int last error number
*/
public function getHadWarning()
{
return $this->had_warning;
}
// DEPEREACTED CALLS
/**

6
www/lib/CoreLibs/DB/SQL/PgSQL.php
View File

@@ -295,7 +295,11 @@ class PgSQL
if (!is_resource($q)) {
return false;
}
list($id) = $this->__dbFetchArray($q) ?: [];
if (is_array($res = $this->__dbFetchArray($q))) {
list($id) = $res;
} else {
return false;
}
} else {
$id = [-1, $q];
}