webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00
Code Activity

php7.4 / psalm fixes

Browse Source
This commit is contained in:
David Goodwin
2020-01-31 16:30:46 +00:00
parent 882b6835ed
commit 1ad184641d
9 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
model/PFAHandler.php
View File

@@ -168,10 +168,10 @@ abstract class PFAHandler {
*/
public function __construct($new = 0, $username = "", $is_admin = 1) {
# set label_field if not explicitely set
if (!isset($this->id_field)) {
if (empty($this->id_field)) {
throw new \InvalidArgumentException("id_field must be defined");
}
if (!isset($this->db_table)) {
if (empty($this->db_table)) {
throw new \InvalidArgumentException("db_table must be defined");
}
if (empty($this->label_field)) {
@@ -237,9 +237,6 @@ abstract class PFAHandler {
);
}
if (empty($this->db_table)) {
throw new Exception("db_table not defined");
}
$struct_hook = Config::read_string($this->db_table . '_struct_hook');
if (!empty($struct_hook) && is_string($struct_hook) && $struct_hook != 'NO' && function_exists($struct_hook)) {
$this->struct = $struct_hook($this->struct);