Compare commits

...

2 Commits

Author SHA1 Message Date
Clemens Schwaighofer
6e59b63791 DB\IO phpdoc and phpstan fixes 2022-12-14 14:18:33 +09:00
Clemens Schwaighofer
9c7b3cea83 SQL Interface docstring fix 2022-12-14 13:53:54 +09:00
3 changed files with 12 additions and 5 deletions

View File

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

View File

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

View File

@@ -214,7 +214,7 @@ interface SqlFunctions
/** /**
* Undocumented function * Undocumented function
* *
* @param string $bytea * @param string $data
* @return string * @return string
*/ */
public function __dbEscapeBytea(string $data): string; public function __dbEscapeBytea(string $data): string;