wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inject logger

Browse source
This commit is contained in:
Arthur Schiwon 2014-01-16 11:00:22 +01:00
parent 20bfbb0fd9
commit 32afdcbefe
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/share/searchresultsorter.php
View file

@ -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);

7
tests/lib/share/searchresultsorter.php
View file

@ -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');
}
}