From 98587d5d617f157ba57a260091c8e2c944f5163f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 17:57:22 +0200
Subject: Fix a set of TODO and bugs

- Context object raises correct Exception if get is invalid
- RSS feed is well-indicated on the home page
- State is better calculated
- Add some comments

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/Exceptions/ContextException.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 app/Exceptions/ContextException.php

(limited to 'app/Exceptions/ContextException.php')

diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
new file mode 100644
index 000000000..357751b7c
--- /dev/null
+++ b/app/Exceptions/ContextException.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * An exception raised when a context is invalid
+ */
+class FreshRSS_Context_Exception extends Exception {
+	public function __construct($message) {
+		parent::__construct($message);
+	}
+}
-- 
cgit v1.2.3


From aacd1ffd4052b04c724c2783b3ee2845ca4ada35 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 4 Mar 2015 23:32:20 -0500
Subject: Refactor exceptions

I removed unnecessary constructors and unnecessary inheritance
---
 app/Exceptions/BadUrlException.php        | 5 ++++-
 app/Exceptions/ContextException.php       | 6 ++----
 app/Exceptions/EntriesGetterException.php | 6 ++----
 app/Exceptions/FeedException.php          | 7 +++----
 4 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'app/Exceptions/ContextException.php')

diff --git a/app/Exceptions/BadUrlException.php b/app/Exceptions/BadUrlException.php
index 59574e1e5..406efb9b3 100644
--- a/app/Exceptions/BadUrlException.php
+++ b/app/Exceptions/BadUrlException.php
@@ -1,6 +1,9 @@
 <?php
-class FreshRSS_BadUrl_Exception extends FreshRSS_Feed_Exception {
+
+class FreshRSS_BadUrl_Exception extends \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/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 {
+
 }
-- 
cgit v1.2.3


From 214a5cc9a4c2b821961bc21f22b4b08e34b5be68 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 3 Jun 2015 20:21:32 +0200
Subject: PHP 5.2 compatiblity

Namespaces are not needed so far.

https://github.com/FreshRSS/FreshRSS/commit/aacd1ffd4052b04c724c2783b3ee2845ca4ada35#commitcomment-11503581
---
 app/Exceptions/ContextException.php       | 2 +-
 app/Exceptions/DAOException.php           | 2 +-
 app/Exceptions/EntriesGetterException.php | 2 +-
 app/Exceptions/FeedException.php          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/Exceptions/ContextException.php')

diff --git a/app/Exceptions/ContextException.php b/app/Exceptions/ContextException.php
index 8f05eccd6..00934cbfd 100644
--- a/app/Exceptions/ContextException.php
+++ b/app/Exceptions/ContextException.php
@@ -3,6 +3,6 @@
 /**
  * An exception raised when a context is invalid
  */
-class FreshRSS_Context_Exception extends \Exception {
+class FreshRSS_Context_Exception extends Exception {
 
 }
diff --git a/app/Exceptions/DAOException.php b/app/Exceptions/DAOException.php
index e48e521ab..14bee3403 100644
--- a/app/Exceptions/DAOException.php
+++ b/app/Exceptions/DAOException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_DAO_Exception extends \Exception {
+class FreshRSS_DAO_Exception extends Exception {
 
 }
diff --git a/app/Exceptions/EntriesGetterException.php b/app/Exceptions/EntriesGetterException.php
index 8aace1840..3b76195ee 100644
--- a/app/Exceptions/EntriesGetterException.php
+++ b/app/Exceptions/EntriesGetterException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_EntriesGetter_Exception extends \Exception {
+class FreshRSS_EntriesGetter_Exception extends Exception {
 
 }
diff --git a/app/Exceptions/FeedException.php b/app/Exceptions/FeedException.php
index 6c0cb3755..abfcbce79 100644
--- a/app/Exceptions/FeedException.php
+++ b/app/Exceptions/FeedException.php
@@ -1,5 +1,5 @@
 <?php
 
-class FreshRSS_Feed_Exception extends \Exception {
+class FreshRSS_Feed_Exception extends Exception {
 
 }
-- 
cgit v1.2.3