From f5028d30d047ae50ac2d89a9a66266de086ac718 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 07:53:45 -0500
Subject: Add required library

The lib_date.php library was missing in the Search object file. It is required to make date conversion in that object.
---
 app/Models/Search.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/Models/Search.php')

diff --git a/app/Models/Search.php b/app/Models/Search.php
index ef8fc883d..a22e242af 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once(LIB_PATH . '/lib_date.php');
+
 /**
  * Contains a search from the search form.
  *
-- 
cgit v1.2.3


From 50b6a02578c29c780e6fe36af712bdc7cfe81d3d Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 09:42:06 -0500
Subject: Add search default raw value

Before, the default value was undefined. Now it always has a value even when no value is provided.
---
 app/Models/Search.php           | 2 +-
 tests/app/Models/SearchTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Models/Search.php')

diff --git a/app/Models/Search.php b/app/Models/Search.php
index a22e242af..85340ff13 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -11,7 +11,7 @@ require_once(LIB_PATH . '/lib_date.php');
 class FreshRSS_Search {
 
 	// This contains the user input string
-	private $raw_input;
+	private $raw_input = '';
 	// The following properties are extracted from the raw input
 	private $intitle;
 	private $min_date;
diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
index 20ea09433..9e3ca6765 100644
--- a/tests/app/Models/SearchTest.php
+++ b/tests/app/Models/SearchTest.php
@@ -10,7 +10,7 @@ class SearchTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function test__construct_whenInputIsEmpty_getsOnlyNullValues($input) {
 		$search = new FreshRSS_Search($input);
-		$this->assertNull($search->getRawInput());
+		$this->assertEquals('', $search->getRawInput());
 		$this->assertNull($search->getIntitle());
 		$this->assertNull($search->getMinDate());
 		$this->assertNull($search->getMaxDate());
-- 
cgit v1.2.3


From 74c020edc846d0afdecb05ae1e1f30a516dee002 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 21 Feb 2015 09:44:02 -0500
Subject: Add a default string representation

In some part of the code, the search is displayed as is and crash since there is no way to display the search object as a string.
---
 app/Models/Search.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/Models/Search.php')

diff --git a/app/Models/Search.php b/app/Models/Search.php
index 85340ff13..84688be2e 100644
--- a/app/Models/Search.php
+++ b/app/Models/Search.php
@@ -36,6 +36,10 @@ class FreshRSS_Search {
 		$input = $this->parseTagsSeach($input);
 		$this->search = $this->cleanSearch($input);
 	}
+	
+	public function __toString() {
+		return $this->getRawInput();
+	}
 
 	public function getRawInput() {
 		return $this->raw_input;
-- 
cgit v1.2.3