From 06d00995049db9c7b915f67cfd4a5708aace458f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 30 Oct 2023 20:47:27 +0100
Subject: Require PHP 7.4+ (#5720)

* Require PHP 7.4+
https://github.com/FreshRSS/FreshRSS/discussions/5474

* Update Docker oldest
Alpine 3.13 with PHP 7.4.26

* Add missing packets to Docker oldest

* Update to typed properties
https://php.net/migration74.new-features#migration74.new-features.core.typed-properties

* More types
---
 cli/i18n/I18nCompletionValidator.php | 13 +++++--------
 cli/i18n/I18nData.php                |  2 +-
 cli/i18n/I18nUsageValidator.php      | 13 +++++--------
 cli/i18n/I18nValue.php               |  6 ++----
 4 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'cli/i18n')

diff --git a/cli/i18n/I18nCompletionValidator.php b/cli/i18n/I18nCompletionValidator.php
index 3903e18cd..6240580c4 100644
--- a/cli/i18n/I18nCompletionValidator.php
+++ b/cli/i18n/I18nCompletionValidator.php
@@ -5,15 +5,12 @@ require_once __DIR__ . '/I18nValidatorInterface.php';
 class I18nCompletionValidator implements I18nValidatorInterface {
 
 	/** @var array<string,array<string,I18nValue>> */
-	private $reference;
+	private array $reference;
 	/** @var array<string,array<string,I18nValue>> */
-	private $language;
-	/** @var int */
-	private $totalEntries = 0;
-	/** @var int */
-	private $passEntries = 0;
-	/** @var string */
-	private $result = '';
+	private array $language;
+	private int $totalEntries = 0;
+	private int $passEntries = 0;
+	private string $result = '';
 
 	/**
 	 * @param array<string,array<string,I18nValue>> $reference
diff --git a/cli/i18n/I18nData.php b/cli/i18n/I18nData.php
index 9eb67406c..957ec2887 100644
--- a/cli/i18n/I18nData.php
+++ b/cli/i18n/I18nData.php
@@ -5,7 +5,7 @@ class I18nData {
 	public const REFERENCE_LANGUAGE = 'en';
 
 	/** @var array<string,array<string,array<string,I18nValue>>> */
-	private $data;
+	private array $data;
 
 	/** @param array<string,array<string,array<string,I18nValue>>> $data */
 	public function __construct(array $data) {
diff --git a/cli/i18n/I18nUsageValidator.php b/cli/i18n/I18nUsageValidator.php
index f8e3c6051..49cc266f9 100644
--- a/cli/i18n/I18nUsageValidator.php
+++ b/cli/i18n/I18nUsageValidator.php
@@ -5,15 +5,12 @@ require_once __DIR__ . '/I18nValidatorInterface.php';
 class I18nUsageValidator implements I18nValidatorInterface {
 
 	/** @var array<string> */
-	private $code;
+	private array $code;
 	/** @var array<string,array<string,string>> */
-	private $reference;
-	/** @var int */
-	private $totalEntries = 0;
-	/** @var int */
-	private $failedEntries = 0;
-	/** @var string */
-	private $result = '';
+	private array $reference;
+	private int $totalEntries = 0;
+	private int $failedEntries = 0;
+	private string $result = '';
 
 	/**
 	 * @param array<string,array<string,string>> $reference
diff --git a/cli/i18n/I18nValue.php b/cli/i18n/I18nValue.php
index 295e5473e..4a1ddaeee 100644
--- a/cli/i18n/I18nValue.php
+++ b/cli/i18n/I18nValue.php
@@ -10,10 +10,8 @@ class I18nValue {
 		self::STATE_TODO,
 	];
 
-	/** @var string */
-	private $value;
-	/**	@var string|null */
-	private $state;
+	private string $value;
+	private ?string $state = null;
 
 	public function __construct(string $data) {
 		$data = explode(' -> ', $data);
-- 
cgit v1.2.3