[Pkg-owncloud-commits] [owncloud] 89/145: Inject logger

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 1cf599d494e046e0b5a71c08c6f054b91174e142
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu Jan 16 11:00:22 2014 +0100

    Inject logger
---
 lib/private/share/searchresultsorter.php | 9 ++++++---
 tests/lib/share/searchresultsorter.php   | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php
index 4f87994..f81a94c 100644
--- a/lib/private/share/searchresultsorter.php
+++ b/lib/private/share/searchresultsorter.php
@@ -12,16 +12,19 @@ class SearchResultSorter {
 	private $search;
 	private $encoding;
 	private $key;
+	private $log;
 
 	/**
 	 * @param $search the search term as was given by the user
 	 * @param $key the array key containing the value that should be compared
 	 * against
 	 * @param $encoding optional, encoding to use, defaults to UTF-8
+	 * @param $log optional, an \OC\Log instance
 	 */
-	public function __construct($search, $key, $encoding = 'UTF-8') {
+	public function __construct($search, $key, $encoding = 'UTF-8', \OC\Log $log = null) {
 		$this->encoding = $encoding;
 		$this->key = $key;
+		$this->log = is_null($log) ? new \OC\Log() : $log;
 		$this->search = mb_strtolower($search, $this->encoding);
 	}
 
@@ -32,8 +35,8 @@ class SearchResultSorter {
 	 */
 	public function sort($a, $b) {
 		if(!isset($a[$this->key]) || !isset($b[$this->key])) {
-			\OCP\Util::writeLog('core', 'Sharing: cannot sort due to missing'.
-										'array key', \OC_Log::ERROR);
+			$this->log->error('Sharing dialogue: cannot sort due to missing array key',
+							  array('app' => 'core'));
 			return 0;
 		}
 		$nameA = mb_strtolower($a[$this->key], $this->encoding);
diff --git a/tests/lib/share/searchresultsorter.php b/tests/lib/share/searchresultsorter.php
index f24e40e..efc3e1b 100644
--- a/tests/lib/share/searchresultsorter.php
+++ b/tests/lib/share/searchresultsorter.php
@@ -37,4 +37,11 @@ class Test_Share_Search extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($result[2]['foobar'] === 'Bicyclerepairwoman');
 		$this->assertTrue($result[3]['foobar'] === 'woot');
 	}
+
+	/**
+     * @expectedException PHPUnit_Framework_Error
+     */
+	public function testSortWrongLog() {
+		$sorter = new \OC\Share\SearchResultSorter('foo', 'bar', 'UTF-8', 'foobar');
+	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git