From 314077a457f04cc2f0472e036af029e2676fbf02 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 15 Jan 2024 10:36:30 +0100
Subject: PHPStan prepare exceptions (#6037)

Take advantage of
https://phpstan.org/blog/bring-your-exceptions-under-control

Minimum changes to pass `tooWideThrowType` and `implicitThrows`.

Revert some mistakes from:
https://github.com/FreshRSS/FreshRSS/pull/5504
Preparation needed before new PRs of the same type:
https://github.com/FreshRSS/FreshRSS/pull/5962

Fix several wrong PHPDocs and catches:

> Method ... has ...Exception in PHPDoc @throws tag but it's not thrown.

> Dead catch - ...Exception is never thrown in the try block.
---
 app/Exceptions/AlreadySubscribedException.php | 2 +-
 app/Exceptions/ContextException.php           | 2 +-
 app/Exceptions/DAOException.php               | 6 ------
 app/Exceptions/EntriesGetterException.php     | 2 +-
 app/Exceptions/FeedException.php              | 2 +-
 app/Exceptions/FeedNotAddedException.php      | 2 +-
 app/Exceptions/ZipException.php               | 2 +-
 app/Exceptions/ZipMissingException.php        | 2 +-
 8 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 app/Exceptions/DAOException.php

(limited to 'app/Exceptions')

diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php
index 3802e7d65..8e2eaa13a 100644
--- a/app/Exceptions/AlreadySubscribedException.php
+++ b/app/Exceptions/AlreadySubscribedException.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-class FreshRSS_AlreadySubscribed_Exception extends Exception {
+class FreshRSS_AlreadySubscribed_Exception extends Minz_Exception {
 
 	private string $feedName = '';
 
diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
index 5d06baf35..90b2e5f85 100644
--- a/app/Exceptions/ContextException.php
+++ b/app/Exceptions/ContextException.php
@@ -4,6 +4,6 @@ declare(strict_types=1);
 /**
  * An exception raised when a context is invalid
  */
-class FreshRSS_Context_Exception extends Exception {
+class FreshRSS_Context_Exception extends Minz_Exception {
 
 }
diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
deleted file mode 100644
index 3f689f318..000000000
--- a/app/Exceptions/DAOException.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-declare(strict_types=1);
-
-class FreshRSS_DAO_Exception extends Exception {
-
-}
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index a9f29e034..8d8a880c6 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
 
-class FreshRSS_EntriesGetter_Exception extends Exception {
+class FreshRSS_EntriesGetter_Exception extends Minz_Exception {
 
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 343aca5d6..26d042f6f 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
 
-class FreshRSS_Feed_Exception extends Exception {
+class FreshRSS_Feed_Exception extends Minz_Exception {
 
 }
diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
index 921cd985b..cec8397e4 100644
--- a/app/Exceptions/FeedNotAddedException.php
+++ b/app/Exceptions/FeedNotAddedException.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-class FreshRSS_FeedNotAdded_Exception extends Exception {
+class FreshRSS_FeedNotAdded_Exception extends Minz_Exception {
 
 	private string $url = '';
 
diff --git a/app/Exceptions/ZipException.php b/app/Exceptions/ZipException.php
index a0664f913..57176ab5f 100644
--- a/app/Exceptions/ZipException.php
+++ b/app/Exceptions/ZipException.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-class FreshRSS_Zip_Exception extends Exception {
+class FreshRSS_Zip_Exception extends Minz_Exception {
 
 	private int $zipErrorCode = 0;
 
diff --git a/app/Exceptions/ZipMissingException.php b/app/Exceptions/ZipMissingException.php
index c33c1bcb8..1ed8c7626 100644
--- a/app/Exceptions/ZipMissingException.php
+++ b/app/Exceptions/ZipMissingException.php
@@ -1,5 +1,5 @@
 <?php
 declare(strict_types=1);
 
-class FreshRSS_ZipMissing_Exception extends Exception {
+class FreshRSS_ZipMissing_Exception extends Minz_Exception {
 }
-- 
cgit v1.2.3