From f99c8d5f54c67e0abc3f3189b4f5e3e4571e114c Mon Sep 17 00:00:00 2001 From: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> Date: Wed, 5 Jun 2024 22:04:06 +0200 Subject: Modernize code to php7.4 (#6043) * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Modernize code to php7.4 * Consistency --------- Co-authored-by: Luc Co-authored-by: Alexandre Alapetite --- app/Controllers/feedController.php | 4 +--- app/Controllers/importExportController.php | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'app/Controllers') diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 231be0cba..131d58d5e 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -7,7 +7,7 @@ declare(strict_types=1); class FreshRSS_feed_Controller extends FreshRSS_ActionController { /** * This action is called before every other action in that class. It is - * the common boiler plate for every action. It is triggered by the + * the common boilerplate for every action. It is triggered by the * underlying framework. */ #[\Override] @@ -481,8 +481,6 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { } $feedIsNew = $feed->lastUpdate() <= 0; - $feedIsEmpty = false; - $feedIsUnchanged = false; try { if ($simplePiePush !== null) { diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index f92abf69d..b4be5dd73 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -243,10 +243,9 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { unset($table['article']); for ($i = count($table['items']) - 1; $i >= 0; $i--) { $item = (array)($table['items'][$i]); - $item = array_filter($item, static function ($v) { - // Filter out empty properties, potentially reported as empty objects - return (is_string($v) && trim($v) !== '') || !empty($v); - }); + $item = array_filter($item, static fn($v) => + // Filter out empty properties, potentially reported as empty objects + (is_string($v) && trim($v) !== '') || !empty($v)); $item['updated'] = isset($item['updated']) ? strtotime($item['updated']) : ''; $item['published'] = $item['updated']; $item['content'] = ['content' => $item['content'] ?? '']; -- cgit v1.2.3