mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 16:25:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix DAO exception

Browse Source 
Change the name and messages
This commit is contained in:
Alexis Degrugillier
2015-03-05 06:45:00 -05:00
committed by Marien Fressinaud
parent 5b90e1f4a0
commit 96d5d9d034
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/DAOException.php
View File

@@ -1,5 +1,5 @@
<?php
class FreshRSS_DAOException extends \Exception {
class FreshRSS_DAO_Exception extends \Exception {
}

8
app/Models/UserQuery.php
View File

@@ -104,11 +104,11 @@ class FreshRSS_UserQuery {
* Parse the query string when it is a "category" query
*
* @param integer $id
* @throws FreshRSS_DAOException
* @throws FreshRSS_DAO_Exception
*/
private function parseCategory($id) {
if (is_null($this->category_dao)) {
throw new FreshRSS_DAOException('Category DAO is not loaded i UserQuery');
throw new FreshRSS_DAO_Exception('Category DAO is not loaded in UserQuery');
}
$category = $this->category_dao->searchById($id);
if ($category) {
@@ -123,11 +123,11 @@ class FreshRSS_UserQuery {
* Parse the query string when it is a "feed" query
*
* @param integer $id
* @throws FreshRSS_DAOException
* @throws FreshRSS_DAO_Exception
*/
private function parseFeed($id) {
if (is_null($this->feed_dao)) {
throw new FreshRSS_DAOException('Feed DAO is not loaded i UserQuery');
throw new FreshRSS_DAO_Exception('Feed DAO is not loaded in UserQuery');
}
$feed = $this->feed_dao->searchById($id);
if ($feed) {

4
tests/app/Models/UserQueryTest.php
View File

@@ -20,7 +20,7 @@ class UserQueryTest extends \PHPUnit_Framework_TestCase {
}
/**
* @expectedException Exceptions/FreshRSS_DAOException
* @expectedException Exceptions/FreshRSS_DAO_Exception
* @expectedExceptionMessage Category DAO is not loaded in UserQuery
*/
public function test__construct_whenCategoryQueryAndNoDao_throwsException() {
@@ -48,7 +48,7 @@ class UserQueryTest extends \PHPUnit_Framework_TestCase {
}
/**
* @expectedException Exceptions/FreshRSS_DAOException
* @expectedException Exceptions/FreshRSS_DAO_Exception
* @expectedExceptionMessage Feed DAO is not loaded in UserQuery
*/
public function test__construct_whenFeedQueryAndNoDao_throwsException() {