From 205a8e96b3a54205433aa4978adf59416f779b49 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 1 Apr 2025 10:14:20 +0200
Subject: [PATCH] Syntax update

---
 xExtension-ReadingTime/configure.phtml | 12 ++++++------
 xExtension-ReadingTime/extension.php   | 27 ++++++++++++++++----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/xExtension-ReadingTime/configure.phtml b/xExtension-ReadingTime/configure.phtml
index 5679c53..337d93f 100644
--- a/xExtension-ReadingTime/configure.phtml
+++ b/xExtension-ReadingTime/configure.phtml
@@ -2,16 +2,16 @@
 declare(strict_types=1);
 /** @var ReadingTimeExtension $this */
 ?>
-<form action="<?php echo _url('extension', 'configure', 'e', urlencode($this->getName())); ?>" method="post">
-	<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
+<form action="<?= _url('extension', 'configure', 'e', urlencode($this->getName())) ?>" method="post">
+	<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 	<div class="form-group">
-		<label class="group-name" for="reading_time_speed"><?php echo _t('ext.reading_time.speed.label'); ?></label>
+		<label class="group-name" for="reading_time_speed"><?= _t('ext.reading_time.speed.label') ?></label>
 		<div class="group-controls">
 			<input type="number" id="reading_time_speed" name="reading_time_speed" value="<?= $this->getSpeed() ?>" min="1">
 			<p class="help"><?= _i('help') ?> <?= _t('ext.reading_time.speed.help') ?></p>
 		</div>
 
-		<label class="group-name" for="reading_time_speed"><?php echo _t('ext.reading_time.metrics.label'); ?></label>
+		<label class="group-name" for="reading_time_speed"><?= _t('ext.reading_time.metrics.label') ?></label>
 		<div class="group-controls">
 			<select name="reading_time_metrics" id="reading_time_metrics" data-leave-validation="<?= $this->getMetrics() ?>">
 				<option value="words"<?= $this->getMetrics() === 'words' ? ' selected="selected"' : '' ?>><?= _t('ext.reading_time.metrics.words') ?></option>
@@ -23,8 +23,8 @@ declare(strict_types=1);
 
 	<div class="form-group form-actions">
 		<div class="group-controls">
-			<button type="submit" class="btn btn-important"><?php echo _t('gen.action.submit'); ?></button>
-			<button type="reset" class="btn"><?php echo _t('gen.action.cancel'); ?></button>
+			<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
+			<button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button>
 		</div>
 	</div>
 </form>
diff --git a/xExtension-ReadingTime/extension.php b/xExtension-ReadingTime/extension.php
index 7c07ac7..e3c331e 100644
--- a/xExtension-ReadingTime/extension.php
+++ b/xExtension-ReadingTime/extension.php
@@ -6,6 +6,9 @@ final class ReadingTimeExtension extends Minz_Extension {
 	private int $speed = 300;
 	private string $metrics = 'words';
 
+	/**
+	 * @throws FreshRSS_Context_Exception
+	 */
 	#[\Override]
 	public function init(): void {
 		$this->registerTranslates();
@@ -13,20 +16,20 @@ final class ReadingTimeExtension extends Minz_Extension {
 			return;
 		}
 		// Defaults
-		$speed = FreshRSS_Context::userConf()->attributeInt('reading_time_speed');	// @phpstan-ignore missingType.checkedException
+		$speed = FreshRSS_Context::userConf()->attributeInt('reading_time_speed');
 		if ($speed === null) {
-			FreshRSS_Context::userConf()->_attribute('reading_time_speed', $this->speed);	// @phpstan-ignore missingType.checkedException
+			FreshRSS_Context::userConf()->_attribute('reading_time_speed', $this->speed);
 		} else {
 			$this->speed = $speed;
 		}
-		$metrics = FreshRSS_Context::userConf()->attributeString('reading_time_metrics');	// @phpstan-ignore missingType.checkedException
+		$metrics = FreshRSS_Context::userConf()->attributeString('reading_time_metrics');
 		if ($metrics === null) {
-			FreshRSS_Context::userConf()->_attribute('reading_time_metrics', $this->metrics);	// @phpstan-ignore missingType.checkedException
+			FreshRSS_Context::userConf()->_attribute('reading_time_metrics', $this->metrics);
 		} else {
 			$this->metrics = $metrics;
 		}
 		if (in_array(null, [$speed, $metrics], true)) {
-			FreshRSS_Context::userConf()->save();	// @phpstan-ignore missingType.checkedException
+			FreshRSS_Context::userConf()->save();
 		}
 		$this->registerHook('js_vars', [$this, 'getParams']);
 		Minz_View::appendScript($this->getFileUrl('readingtime.js', 'js'));
@@ -55,16 +58,20 @@ final class ReadingTimeExtension extends Minz_Extension {
 		return $vars;
 	}
 
+	/**
+	 * @throws FreshRSS_Context_Exception
+	 * @throws Minz_ActionException
+	 */
 	#[\Override]
 	public function handleConfigureAction(): void {
 		$this->registerTranslates();
 
 		if (Minz_Request::isPost()) {
-			$speed = $this->validateSpeed(Minz_Request::paramInt('reading_time_speed'));	// @phpstan-ignore missingType.checkedException
-			FreshRSS_Context::userConf()->_attribute('reading_time_speed', $speed);	// @phpstan-ignore missingType.checkedException
-			$metrics = $this->validateMetrics(Minz_Request::paramString('reading_time_metrics'));	// @phpstan-ignore missingType.checkedException
-			FreshRSS_Context::userConf()->_attribute('reading_time_metrics', $metrics);	// @phpstan-ignore missingType.checkedException
-			FreshRSS_Context::userConf()->save();	// @phpstan-ignore missingType.checkedException
+			$speed = $this->validateSpeed(Minz_Request::paramInt('reading_time_speed'));
+			FreshRSS_Context::userConf()->_attribute('reading_time_speed', $speed);
+			$metrics = $this->validateMetrics(Minz_Request::paramString('reading_time_metrics'));
+			FreshRSS_Context::userConf()->_attribute('reading_time_metrics', $metrics);
+			FreshRSS_Context::userConf()->save();
 		}
 	}