aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2021-12-01 23:24:39 +0100
committerGravatar GitHub <noreply@github.com> 2021-12-01 23:24:39 +0100
commit28cff8a0df3af23f7acf01840da43c098c779313 (patch)
tree491cd077f3fbad8fecd57c3e80880d39b8c577d0 /lib
parentb21fe199ed19fcc08fe3ece2d9ab553dcc0e73c9 (diff)
Fix some PHP 8.1 warnings (#4012)
* Fix some PHP 8.1 warnings The proper fix will have to wait till be drop PHP7. #fix https://github.com/FreshRSS/FreshRSS/issues/4010 * Another PHP8.1 fix
Diffstat (limited to 'lib')
-rw-r--r--lib/Minz/Pdo.php8
-rw-r--r--lib/Minz/Request.php4
-rw-r--r--lib/lib_rss.php2
3 files changed, 11 insertions, 3 deletions
diff --git a/lib/Minz/Pdo.php b/lib/Minz/Pdo.php
index d334c0533..9c754be86 100644
--- a/lib/Minz/Pdo.php
+++ b/lib/Minz/Pdo.php
@@ -28,6 +28,8 @@ abstract class Minz_Pdo extends PDO {
return $this->autoPrefix($statement);
}
+ // PHP8+: PDO::lastInsertId(?string $name = null): string|false
+ #[\ReturnTypeWillChange]
public function lastInsertId($name = null) {
if ($name != null) {
$name = $this->preSql($name);
@@ -35,16 +37,22 @@ abstract class Minz_Pdo extends PDO {
return parent::lastInsertId($name);
}
+ // PHP8+: PDO::prepare(string $query, array $options = []): PDOStatement|false
+ #[\ReturnTypeWillChange]
public function prepare($statement, $driver_options = array()) {
$statement = $this->preSql($statement);
return parent::prepare($statement, $driver_options);
}
+ // PHP8+: PDO::exec(string $statement): int|false
+ #[\ReturnTypeWillChange]
public function exec($statement) {
$statement = $this->preSql($statement);
return parent::exec($statement);
}
+ // PHP8+: PDO::query(string $query, ?int $fetchMode = null, mixed ...$fetchModeArgs): PDOStatement|false
+ #[\ReturnTypeWillChange]
public function query($query, $fetch_mode = null, ...$fetch_mode_args) {
$query = $this->preSql($query);
return $fetch_mode ? parent::query($query, $fetch_mode, ...$fetch_mode_args) : parent::query($query);
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 232479191..08a5e9053 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -415,7 +415,7 @@ class Minz_Request {
* @return string
*/
private static function extractContentType() {
- return strtolower(trim(static::getHeader('CONTENT_TYPE')));
+ return strtolower(trim(static::getHeader('CONTENT_TYPE', '')));
}
/**
@@ -454,7 +454,7 @@ class Minz_Request {
* @return array
*/
public static function getPreferredLanguages() {
- if (preg_match_all('/(^|,)\s*(?P<lang>[^;,]+)/', static::getHeader('HTTP_ACCEPT_LANGUAGE'), $matches)) {
+ if (preg_match_all('/(^|,)\s*(?P<lang>[^;,]+)/', static::getHeader('HTTP_ACCEPT_LANGUAGE', ''), $matches)) {
return $matches['lang'];
}
return array('en');
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 4b2e2bc3d..6643dc757 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -165,7 +165,7 @@ function html_only_entity_decode($text) {
get_html_translation_table(HTML_SPECIALCHARS, ENT_NOQUOTES, 'UTF-8') //Preserve XML entities
));
}
- return strtr($text, $htmlEntitiesOnly);
+ return $text == '' ? '' : strtr($text, $htmlEntitiesOnly);
}
function customSimplePie($attributes = array()) {