From 1335a0e3cf11a0d4248e9eaaf748b89e6df741ef Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 4 Jan 2022 13:59:09 +0100
Subject: PHPStan level 5 (#4110)

* Fix most PHPDocs errors
Contributes to https://github.com/FreshRSS/FreshRSS/issues/4103
https://phpstan.org/writing-php-code/phpdoc-types

* Avoid func_get_args
Use variadic syntax instead https://php.net/manual/functions.arguments#functions.variable-arg-list
And avoid dynamic functions names when possible to more easily identify calls and unused functions.
Contributes to https://github.com/FreshRSS/FreshRSS/issues/4103

* PHPStan level 3

* PHPStand level 4

* Update default to PHPStan level 4

* Towards level 5

* Fix level 4 regression

* Towards level 5

* Pass PHPStan level 5

* Towards level 6

* Remove erronenous regression from changelog
https://github.com/FreshRSS/FreshRSS/pull/4116
---
 cli/i18n/I18nCompletionValidator.php | 3 +++
 cli/i18n/I18nData.php                | 2 +-
 cli/i18n/I18nValidatorInterface.php  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'cli')

diff --git a/cli/i18n/I18nCompletionValidator.php b/cli/i18n/I18nCompletionValidator.php
index 2cb71acd5..3287a2500 100644
--- a/cli/i18n/I18nCompletionValidator.php
+++ b/cli/i18n/I18nCompletionValidator.php
@@ -23,6 +23,9 @@ class I18nCompletionValidator implements I18nValidatorInterface {
 		return $this->result;
 	}
 
+	/**
+	 * @param array<string>|null $ignore
+	 */
 	public function validate($ignore) {
 		foreach ($this->reference as $file => $data) {
 			foreach ($data as $key => $value) {
diff --git a/cli/i18n/I18nData.php b/cli/i18n/I18nData.php
index 7e17c6c3c..2e5e373f8 100644
--- a/cli/i18n/I18nData.php
+++ b/cli/i18n/I18nData.php
@@ -130,7 +130,7 @@ class I18nData {
 		if (array_key_exists($language, $this->data)) {
 			throw new Exception('The selected language already exist.');
 		}
-		if (!is_string($reference) && !array_key_exists($reference, $this->data)) {
+		if (!is_string($reference) || !array_key_exists($reference, $this->data)) {
 			$reference = static::REFERENCE_LANGUAGE;
 		}
 		$this->data[$language] = $this->data[$reference];
diff --git a/cli/i18n/I18nValidatorInterface.php b/cli/i18n/I18nValidatorInterface.php
index edfe7aac0..80fcb22ad 100644
--- a/cli/i18n/I18nValidatorInterface.php
+++ b/cli/i18n/I18nValidatorInterface.php
@@ -19,7 +19,7 @@ interface I18nValidatorInterface {
 	/**
 	 * Display the validation report.
 	 *
-	 * @return array
+	 * @return string
 	 */
 	public function displayReport();
 
-- 
cgit v1.2.3