From 15745d42b779ad14efde2932ab116f45eee39246 Mon Sep 17 00:00:00 2001 From: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:11:04 +0100 Subject: Upgrade code to php 8.1 (#6748) * revert Fix code indentation Fix code Upgrade code to php 8.1 * fix remarques * code review * code review * code review * Apply suggestions from code review * code review * Fixes * Many remainging updates of array syntax * Lost case 'reading-list' * Uneeded PHPDoc --------- Co-authored-by: Luc Sanchez Co-authored-by: Alexandre Alapetite --- app/Exceptions/AlreadySubscribedException.php | 5 +---- app/Exceptions/BadUrlException.php | 1 - app/Exceptions/ZipException.php | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'app/Exceptions') diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php index 8e2eaa13a..977798ae4 100644 --- a/app/Exceptions/AlreadySubscribedException.php +++ b/app/Exceptions/AlreadySubscribedException.php @@ -3,11 +3,8 @@ declare(strict_types=1); class FreshRSS_AlreadySubscribed_Exception extends Minz_Exception { - private string $feedName = ''; - - public function __construct(string $url, string $feedName) { + public function __construct(string $url, private readonly string $feedName) { parent::__construct('Already subscribed! ' . $url, 2135); - $this->feedName = $feedName; } public function feedName(): string { diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php index c7111a41f..654d03c18 100644 --- a/app/Exceptions/BadUrlException.php +++ b/app/Exceptions/BadUrlException.php @@ -2,7 +2,6 @@ declare(strict_types=1); class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception { - public function __construct(string $url) { parent::__construct('`' . $url . '` is not a valid URL'); } diff --git a/app/Exceptions/ZipException.php b/app/Exceptions/ZipException.php index 57176ab5f..d876c296c 100644 --- a/app/Exceptions/ZipException.php +++ b/app/Exceptions/ZipException.php @@ -3,11 +3,8 @@ declare(strict_types=1); class FreshRSS_Zip_Exception extends Minz_Exception { - private int $zipErrorCode = 0; - - public function __construct(int $zipErrorCode) { + public function __construct(private readonly int $zipErrorCode) { parent::__construct('ZIP error!', 2141); - $this->zipErrorCode = $zipErrorCode; } public function zipErrorCode(): int { -- cgit v1.2.3