Fix some PHP8.1 issues if possible
This commit is contained in:
parent
3b03da3259
commit
477bec1977
|
@ -130,7 +130,7 @@ class Page implements ArrayAccess
|
||||||
* The return value will be casted to boolean if non-boolean was returned.
|
* The return value will be casted to boolean if non-boolean was returned.
|
||||||
* @since 5.0.0
|
* @since 5.0.0
|
||||||
*/
|
*/
|
||||||
public function offsetExists($offset)
|
public function offsetExists($offset): bool
|
||||||
{
|
{
|
||||||
return isset($this->page[$offset]);
|
return isset($this->page[$offset]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -188,10 +188,10 @@ class L10n
|
||||||
{
|
{
|
||||||
$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
|
$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
|
||||||
|
|
||||||
$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
|
if (empty($lang_variable)) {
|
||||||
|
|
||||||
if (empty($acceptedLanguages)) {
|
|
||||||
$acceptedLanguages = [];
|
$acceptedLanguages = [];
|
||||||
|
} else {
|
||||||
|
$acceptedLanguages = preg_split('/,\s*/', $lang_variable);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add get as absolute quality accepted language (except this language isn't valid)
|
// Add get as absolute quality accepted language (except this language isn't valid)
|
||||||
|
|
|
@ -485,11 +485,11 @@ class Network
|
||||||
$get('host') .
|
$get('host') .
|
||||||
($port ? ":$port" : '');
|
($port ? ":$port" : '');
|
||||||
|
|
||||||
return (strlen($scheme) ? $scheme . ':' : '') .
|
return (!empty($scheme) ? $scheme . ':' : '') .
|
||||||
(strlen($authority) ? '//' . $authority : '') .
|
(!empty($authority) ? '//' . $authority : '') .
|
||||||
$get('path') .
|
$get('path') .
|
||||||
(strlen($query) ? '?' . $query : '') .
|
(!empty($query) ? '?' . $query : '') .
|
||||||
(strlen($fragment) ? '#' . $fragment : '');
|
(!empty($fragment) ? '#' . $fragment : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -60,7 +60,7 @@ class ReversedFileReader implements \Iterator
|
||||||
$this->fh = fopen($filename, 'r');
|
$this->fh = fopen($filename, 'r');
|
||||||
if (!$this->fh) {
|
if (!$this->fh) {
|
||||||
// this should use a custom exception.
|
// this should use a custom exception.
|
||||||
throw \Exception("Unable to open $filename");
|
throw new \Exception("Unable to open $filename");
|
||||||
}
|
}
|
||||||
$this->filesize = filesize($filename);
|
$this->filesize = filesize($filename);
|
||||||
$this->pos = -1;
|
$this->pos = -1;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user