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

DB\IO phpdoc and phpstan fixes

Browse Source
This commit is contained in:
Clemens Schwaighofer
2022-12-14 14:18:33 +09:00
parent 9c7b3cea83
commit 6e59b63791
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/includes/edit_base.php
View File

@@ -116,6 +116,7 @@ $ADMIN_STYLESHEET = 'edit.css';
// define all needed smarty stuff for the general HTML/page building
$HEADER['CSS'] = CSS;
$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
/** @phpstan-ignore-next-line because ADMIN_STYLESHEET can be null */
$HEADER['STYLESHEET'] = $ADMIN_STYLESHEET ?? ADMIN_STYLESHEET;
if ($form->my_page_name == 'edit_order') {

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

@@ -1481,7 +1481,7 @@ class IO
* @param string $string string to escape
* @return string escaped string
*/
public function dbEscapeIdentifier($string): string
public function dbEscapeIdentifier(string $string): string
{
return $this->db_functions->__dbEscapeIdentifier($string);
}
@@ -1489,14 +1489,19 @@ class IO
/**
* escape data for writing to bytea type column field
* @param string $data data to escape to bytea
* @return string escaped bytea
* @return string escaped bytea string
*/
public function dbEscapeBytea($data)
public function dbEscapeBytea(string $data): string
{
return $this->db_functions->__dbEscapeBytea($data);
}
public function dbUnescapeBytea($bytea)
/**
* unescape bytea data back to normal binrary data
* @param string $bytea bytea data stream
* @return string binary data string
*/
public function dbUnescapeBytea(string $bytea): string
{
return $this->db_functions->__dbUnescapeBytea($bytea);
}
@@ -1816,6 +1821,7 @@ class IO
// if cursor exists ...
if ($this->cursor_ext[$query_hash]['cursor']) {
/** @phpstan-ignore-next-line claims this is always false, but can be true */
if ($first_call === true) {
$this->cursor_ext[$query_hash]['log'][] = 'First call';
// count the rows returned (if select)