PHP 8 Compatibility

This commit is contained in:
Frédéric Guillot
2022-02-05 11:49:03 -08:00
committed by GitHub
parent 61e63ef9e0
commit f5bb55bdb8
558 changed files with 6262 additions and 21691 deletions

View File

@@ -175,7 +175,7 @@ class DateParser extends Base
*/
public function getTimestamp($value)
{
if (ctype_digit($value)) {
if (ctype_digit((string) $value)) {
return (int) $value;
}
@@ -263,7 +263,7 @@ class DateParser extends Base
*/
public function getTimestampFromIsoFormat($value)
{
return $this->removeTimeFromTimestamp(ctype_digit($value) ? $value : strtotime($value));
return $this->removeTimeFromTimestamp(ctype_digit((string) $value) ? $value : strtotime($value));
}
/**
@@ -291,7 +291,7 @@ class DateParser extends Base
{
foreach ($fields as $field) {
if (! empty($values[$field])) {
if (ctype_digit($values[$field])) {
if (ctype_digit((string) $values[$field])) {
$values[$field] = date($format, $values[$field]);
}
} else {

View File

@@ -112,7 +112,7 @@ class RememberMeCookie extends Base
'',
time() - 3600,
$this->helper->url->dir(),
null,
'',
$this->request->isHTTPS(),
true
);

View File

@@ -79,7 +79,7 @@ class Request extends Base
*/
public function getIntegerParam($name, $default_value = 0)
{
return isset($this->get[$name]) && ctype_digit($this->get[$name]) ? (int) $this->get[$name] : $default_value;
return isset($this->get[$name]) && ctype_digit((string) $this->get[$name]) ? (int) $this->get[$name] : $default_value;
}
/**

View File

@@ -318,7 +318,7 @@ class User
* @access public
* @return string
*/
public function getGroupAdminDn()
public function getGroupAdminDn(): string
{
return strtolower(LDAP_GROUP_ADMIN_DN);
}
@@ -329,7 +329,7 @@ class User
* @access public
* @return string
*/
public function getGroupManagerDn()
public function getGroupManagerDn(): string
{
return LDAP_GROUP_MANAGER_DN;
}

View File

@@ -24,32 +24,38 @@ class SessionHandler implements SessionHandlerInterface
$this->db = $db;
}
#[\ReturnTypeWillChange]
public function close()
{
return true;
}
#[\ReturnTypeWillChange]
public function destroy($sessionID)
{
return $this->db->table(self::TABLE)->eq('id', $sessionID)->remove();
}
#[\ReturnTypeWillChange]
public function gc($maxlifetime)
{
return $this->db->table(self::TABLE)->lt('expire_at', time())->remove();
}
#[\ReturnTypeWillChange]
public function open($savePath, $name)
{
return true;
}
#[\ReturnTypeWillChange]
public function read($sessionID)
{
$result = $this->db->table(self::TABLE)->eq('id', $sessionID)->findOneColumn('data');
return $result ?: '';
}
#[\ReturnTypeWillChange]
public function write($sessionID, $data)
{
$lifetime = time() + (ini_get('session.gc_maxlifetime') ?: 1440);

View File

@@ -61,7 +61,7 @@ class Translator
array_unshift($args, $this->get($identifier, $identifier));
foreach ($args as &$arg) {
$arg = htmlspecialchars($arg, ENT_QUOTES, 'UTF-8', false);
$arg = htmlspecialchars((string) $arg, ENT_QUOTES, 'UTF-8', false);
}
return call_user_func_array(