diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-09-06 09:06:46 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-09-06 09:06:46 +0200 |
| commit | a81656c3ed5b8fe0f31794a4fbe0d1a907fca8e8 (patch) | |
| tree | 8bf49bd876aaebc985a9fb1214863190a799cbee /app/Controllers/importExportController.php | |
| parent | 8f7c3473a76809efc88814253722c76f0cc8eb04 (diff) | |
Upgrade to PHP 8.1 (#6711)
* Upgrade to PHP 8.1
As discussed in https://github.com/FreshRSS/FreshRSS/discussions/5474
https://www.php.net/releases/8.0/en.php
https://www.php.net/releases/8.1/en.php
Upgrade to available native type declarations
https://php.net/language.types.declarations
Upgrade to https://phpunit.de/announcements/phpunit-10.html which requires PHP 8.1+ (good timing, as version 9 was not maintained anymore)
Upgrade `:oldest` Docker dev image to oldest Alpine version supporting PHP 8.1: Alpine 3.16, which includes PHP 8.1.22.
* Include 6736
https://github.com/FreshRSS/FreshRSS/pull/6736
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 2dc25fa2f..c4f64337b 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -33,10 +33,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { FreshRSS_View::prependTitle(_t('sub.import_export.title') . ' ยท '); } - /** - * @return float|int|string - */ - private static function megabytes(string $size_str) { + private static function megabytes(string $size_str): float|int|string { switch (substr($size_str, -1)) { case 'M': case 'm': @@ -51,10 +48,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { return $size_str; } - /** - * @param string|int $mb - */ - private static function minimumMemory($mb): void { + private static function minimumMemory(int|string $mb): void { $mb = (int)$mb; $ini = self::megabytes(ini_get('memory_limit') ?: '0'); if ($ini < $mb) { @@ -240,11 +234,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { return 'unknown'; } - /** - * @return false|string - */ - private function ttrssXmlToJson(string $xml) { - $table = (array)simplexml_load_string($xml, null, LIBXML_NOBLANKS | LIBXML_NOCDATA); + private function ttrssXmlToJson(string $xml): string|false { + $table = (array)simplexml_load_string($xml, options: LIBXML_NOBLANKS | LIBXML_NOCDATA); $table['items'] = $table['article'] ?? []; unset($table['article']); for ($i = count($table['items']) - 1; $i >= 0; $i--) { |