Fix some PHP 8.1 warnings (#4012)

Alkarex · web-flow · commit 28cff8a0df3a · 2021-12-01T23:24:39.000+01:00
* Fix some PHP 8.1 warnings The proper fix will have to wait till be drop PHP7. #fix #4010 * Another PHP8.1 fix
diff --git a/lib/Minz/Pdo.php b/lib/Minz/Pdo.php
@@ -28,23 +28,31 @@ protected function preSql($statement) {
 		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);
 		}
 		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
@@ -415,7 +415,7 @@ private static function initJSON() {
 	 * @return string
 	 */
 	private static function extractContentType() {
-		return strtolower(trim(static::getHeader('CONTENT_TYPE')));
+		return strtolower(trim(static::getHeader('CONTENT_TYPE', '')));
 	}
 
 	/**
@@ -454,7 +454,7 @@ public static function isPost() {
 	 * @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
@@ -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()) {

Original file line number	Diff line number	Diff line change
`@@ -28,23 +28,31 @@ protected function preSql($statement) {`
`28`	`28`	`return $this->autoPrefix($statement);`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ // PHP8+: PDO::lastInsertId(?string $name = null): string\|false`
	`32`	`+ #[\ReturnTypeWillChange]`
`31`	`33`	`public function lastInsertId($name = null) {`
`32`	`34`	`if ($name != null) {`
`33`	`35`	`$name = $this->preSql($name);`
`34`	`36`	`}`
`35`	`37`	`return parent::lastInsertId($name);`
`36`	`38`	`}`
`37`	`39`
	`40`	`+ // PHP8+: PDO::prepare(string $query, array $options = []): PDOStatement\|false`
	`41`	`+ #[\ReturnTypeWillChange]`
`38`	`42`	`public function prepare($statement, $driver_options = array()) {`
`39`	`43`	`$statement = $this->preSql($statement);`
`40`	`44`	`return parent::prepare($statement, $driver_options);`
`41`	`45`	`}`
`42`	`46`
	`47`	`+ // PHP8+: PDO::exec(string $statement): int\|false`
	`48`	`+ #[\ReturnTypeWillChange]`
`43`	`49`	`public function exec($statement) {`
`44`	`50`	`$statement = $this->preSql($statement);`
`45`	`51`	`return parent::exec($statement);`
`46`	`52`	`}`
`47`	`53`
	`54`	`+ // PHP8+: PDO::query(string $query, ?int $fetchMode = null, mixed ...$fetchModeArgs): PDOStatement\|false`
	`55`	`+ #[\ReturnTypeWillChange]`
`48`	`56`	`public function query($query, $fetch_mode = null, ...$fetch_mode_args) {`
`49`	`57`	`$query = $this->preSql($query);`
`50`	`58`	`return $fetch_mode ? parent::query($query, $fetch_mode, ...$fetch_mode_args) : parent::query($query);`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ function html_only_entity_decode($text) {`
`165`	`165`	`get_html_translation_table(HTML_SPECIALCHARS, ENT_NOQUOTES, 'UTF-8') //Preserve XML entities`
`166`	`166`	`));`
`167`	`167`	`}`
`168`		`- return strtr($text, $htmlEntitiesOnly);`
	`168`	`+ return $text == '' ? '' : strtr($text, $htmlEntitiesOnly);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`function customSimplePie($attributes = array()) {`