psalm fixes

pull/229/head
David Goodwin 6 years ago
parent 97528f3ebd
commit 173d5775cd

@ -33,18 +33,18 @@ abstract class PFAHandler {
* @var string (default) name of the database table * @var string (default) name of the database table
* (can be overridden by $CONF[database_prefix] and $CONF[database_tables][*] via table_by_key()) * (can be overridden by $CONF[database_prefix] and $CONF[database_tables][*] via table_by_key())
*/ */
protected $db_table = null; protected $db_table;
/** /**
* @var string field containing the ID * @var string field containing the ID
*/ */
protected $id_field = null; protected $id_field;
/** /**
* @var string field containing the label * @var string field containing the label
* defaults to $id_field if not set * defaults to $id_field if not set
*/ */
protected $label_field = null; protected $label_field;
/** /**
* field(s) to use in the ORDER BY clause * field(s) to use in the ORDER BY clause
@ -52,7 +52,7 @@ abstract class PFAHandler {
* defaults to $id_field if not set * defaults to $id_field if not set
* @var string * @var string
*/ */
protected $order_by = null; protected $order_by;
/** /**
* @var string * @var string
@ -896,7 +896,7 @@ abstract class PFAHandler {
} }
/** /**
* @return return value of previously called method * @return mixed return value of previously called method
*/ */
public function result() { public function result() {
return $this->result; return $this->result;

@ -36,7 +36,8 @@ class Shell {
* @var object * @var object
* @access public * @access public
*/ */
public $Dispatch = null; public $Dispatch;
/** /**
* If true, the script will ask for permission to perform actions. * If true, the script will ask for permission to perform actions.
* *
@ -64,28 +65,28 @@ class Shell {
* @var string * @var string
* @access public * @access public
*/ */
public $shell = null; public $shell;
/** /**
* The class name of the shell that was invoked. * The class name of the shell that was invoked.
* *
* @var string * @var string
* @access public * @access public
*/ */
public $className = null; public $className;
/** /**
* The command called if public methods are available. * The command called if public methods are available.
* *
* @var string * @var string
* @access public * @access public
*/ */
public $command = null; public $command;
/** /**
* The name of the shell in camelized. * The name of the shell in camelized.
* *
* @var string * @var string
* @access public * @access public
*/ */
public $name = null; public $name;
/** /**
* Constructs this Shell instance. * Constructs this Shell instance.

@ -199,18 +199,18 @@ class VacationHandler extends PFAHandler {
$boolean = ($row['active'] == db_get_boolean(true)); $boolean = ($row['active'] == db_get_boolean(true));
# TODO: only return true and store the db result array in $this->whatever for consistency with the other classes # TODO: only return true and store the db result array in $this->whatever for consistency with the other classes
return array( return array(
'subject' => $row['subject'], 'subject' => isset($row['subject']) ? $row['subject'] : null,
'body' => $row['body'], 'body' => isset($row['body']) ? $row['body'] : null,
'active' => $boolean , 'active' => $boolean,
'interval_time' => $row['interval_time'], 'interval_time' => isset($row['interval_time']) ? $row['interval_time'] : null,
'activeFrom' => $row['activefrom'], 'activeFrom' => isset($row['activefrom']) ? $row['activefrom'] : null,
'activeUntil' => $row['activeuntil'], 'activeUntil' => isset($row['activeuntil']) ? $row['activeuntil'] : null
); );
} }
/** /**
* @param string $subject * @param string $subject
* @param string $body * @param string $body
* @param string $interval_time * @param int $interval_time
* @param string $activeFrom - something strtotime understands * @param string $activeFrom - something strtotime understands
* @param string $activeUntil - something strtotime understands * @param string $activeUntil - something strtotime understands
* @return boolean * @return boolean

Loading…
Cancel
Save