From 324c83348ca44f3c13f4e0efeea25bbc96ed3b05 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 24 Sep 2016 23:29:49 +0200
Subject: Refactor controller add feed

---
 app/Exceptions/FeedNotAddedException.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 app/Exceptions/FeedNotAddedException.php

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

diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
new file mode 100644
index 000000000..02a8bc6be
--- /dev/null
+++ b/app/Exceptions/FeedNotAddedException.php
@@ -0,0 +1,14 @@
+<?php
+
+class FreshRSS_FeedNotAdded_Exception extends Exception {
+	private $feedName = '';
+
+	public function __construct($url, $feedName) {
+		parent::__construct('Feed not added! ' . $url, 2147);
+		$this->$feedName = $feedName;
+	}
+
+	public function feedName() {
+		return $this->feedName();
+	}
+}
-- 
cgit v1.2.3


From 4d6fdc589e89c2a7d4072b497d9dfd8504a1cb5c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
Date: Sat, 22 Oct 2016 22:04:00 +0200
Subject: Fix syntax error in new exceptions

Bug from https://github.com/FreshRSS/FreshRSS/pull/1261
---
 app/Exceptions/AlreadySubscribedException.php | 4 ++--
 app/Exceptions/FeedNotAddedException.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/app/Exceptions/AlreadySubscribedException.php b/app/Exceptions/AlreadySubscribedException.php
index f85d51300..33b9f9555 100644
--- a/app/Exceptions/AlreadySubscribedException.php
+++ b/app/Exceptions/AlreadySubscribedException.php
@@ -5,10 +5,10 @@ class FreshRSS_AlreadySubscribed_Exception extends Exception {
 
 	public function __construct($url, $feedName) {
 		parent::__construct('Already subscribed! ' . $url, 2135);
-		$this->$feedName = $feedName;
+		$this->feedName = $feedName;
 	}
 
 	public function feedName() {
-		return $this->feedName();
+		return $this->feedName;
 	}
 }
diff --git a/app/Exceptions/FeedNotAddedException.php b/app/Exceptions/FeedNotAddedException.php
index 02a8bc6be..350a17c56 100644
--- a/app/Exceptions/FeedNotAddedException.php
+++ b/app/Exceptions/FeedNotAddedException.php
@@ -5,10 +5,10 @@ class FreshRSS_FeedNotAdded_Exception extends Exception {
 
 	public function __construct($url, $feedName) {
 		parent::__construct('Feed not added! ' . $url, 2147);
-		$this->$feedName = $feedName;
+		$this->feedName = $feedName;
 	}
 
 	public function feedName() {
-		return $this->feedName();
+		return $this->feedName;
 	}
 }
-- 
cgit v1.2.3