Merge 1.1.1-dev into /beta

https://github.com/FreshRSS/FreshRSS/issues/845

5 files changed, 15 insertions, 12 deletions

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
index 59574e1e5..d2509e4ba 100644
--- a/app/Exceptions/BadUrlException.php
+++ b/app/Exceptions/BadUrlException.php
@@ -1,6 +1,9 @@
 <?php
+
 class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
+
 	public function __construct($url) {
 		parent::__construct('`' . $url . '` is not a valid URL');
 	}
+
 }
diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
index 357751b7c..8f05eccd6 100644
--- a/app/Exceptions/ContextException.php
+++ b/app/Exceptions/ContextException.php
@@ -3,8 +3,6 @@
 /**
  * An exception raised when a context is invalid
  */
-class FreshRSS_Context_Exception extends Exception {
-	public function __construct($message) {
-		parent::__construct($message);
-	}
+class FreshRSS_Context_Exception extends \Exception {
+
 }
diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
new file mode 100644
index 000000000..e48e521ab
--- /dev/null
+++ b/app/Exceptions/DAOException.php
@@ -0,0 +1,5 @@
+<?php
+
+class FreshRSS_DAO_Exception extends \Exception {
+
+}
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index 5f47c830b..8aace1840 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,7 +1,5 @@
 <?php
 
-class FreshRSS_EntriesGetter_Exception extends Exception {
-	public function __construct($message) {
-		parent::__construct($message);
-	}
+class FreshRSS_EntriesGetter_Exception extends \Exception {
+
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 2433b3964..6c0cb3755 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,6 +1,5 @@
 <?php
-class FreshRSS_Feed_Exception extends Exception {
-	public function __construct($message) {
-		parent::__construct($message);
-	}
+
+class FreshRSS_Feed_Exception extends \Exception {
+
 }