diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-08-15 09:36:45 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-08-15 09:36:45 +0200 |
| commit | ddb9e91bf2b16aa6f31ebdb3a2119056e971ba96 (patch) | |
| tree | 9c8366980860b83a30e129c84451ed45d3d9f82a | |
| parent | cc8afa77505fba66dc8f6de794228184c7e05e74 (diff) | |
Fix some PHP 8.5 deprecations (#7826)
https://github.com/php/php-src/blob/php-8.5.0beta1/NEWS
https://php.net/function.curl-close
> This function has no effect. Prior to PHP 8.0.0, this function was used to close the resource.
| -rw-r--r-- | app/Controllers/updateController.php | 1 | ||||
| -rw-r--r-- | app/views/importExport/sqlite.phtml | 2 | ||||
| -rw-r--r-- | lib/favicons.php | 1 | ||||
| -rw-r--r-- | lib/lib_rss.php | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index b76b528d8..d97b18c70 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -222,7 +222,6 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController { $result = curl_exec($curlResource); $curlGetinfo = curl_getinfo($curlResource, CURLINFO_HTTP_CODE); $curlError = curl_error($curlResource); - curl_close($curlResource); if ($curlGetinfo !== 200) { Minz_Log::warning( diff --git a/app/views/importExport/sqlite.phtml b/app/views/importExport/sqlite.phtml index fb24e8a92..f1d181a61 100644 --- a/app/views/importExport/sqlite.phtml +++ b/app/views/importExport/sqlite.phtml @@ -5,6 +5,6 @@ declare(strict_types=1); header('Content-Type: application/vnd.sqlite3'); header('Content-Disposition: attachment; filename="' . basename($this->sqlitePath) . '"'); header('Cache-Control: private, no-store, max-age=0'); -header('Last-Modified: ' . gmdate(DateTimeInterface::RFC7231, @filemtime($this->sqlitePath) ?: 0)); +header('Last-Modified: ' . gmdate('D, d M Y H:i:s \\G\\M\\T', @filemtime($this->sqlitePath) ?: 0)); header('Content-Length: ' . (@filesize($this->sqlitePath) ?: 0)); readfile($this->sqlitePath); diff --git a/lib/favicons.php b/lib/favicons.php index c28cdfc7f..3072874d7 100644 --- a/lib/favicons.php +++ b/lib/favicons.php @@ -18,7 +18,6 @@ function isImgMime(string $content): bool { } $content = finfo_buffer($fInfo, $content); $isImage = str_contains($content ?: '', 'image'); - finfo_close($fInfo); return $isImage; } diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 480152400..59e7abba0 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -642,7 +642,6 @@ function httpGet(string $url, string $cachePath, string $type = 'html', array $a $c_effective_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL); $c_redirect_count = curl_getinfo($ch, CURLINFO_REDIRECT_COUNT); $c_error = curl_error($ch); - curl_close($ch); $parser = new \SimplePie\HTTP\Parser(is_string($response) ? $response : ''); if ($parser->parse()) { |