From a12ea63848a1215ce08ab5b4e97d6c359eaa37f7 Mon Sep 17 00:00:00 2001
From: DavidBadura <d.badura@gmx.de>
Date: Fri, 6 Feb 2015 09:49:28 +0100
Subject: [PATCH] change filter

---
 src/Taskwarrior.php       |  8 ++++----
 tests/TaskwarriorTest.php | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Taskwarrior.php b/src/Taskwarrior.php
index a627dfc..3b197e5 100644
--- a/src/Taskwarrior.php
+++ b/src/Taskwarrior.php
@@ -62,7 +62,7 @@ class Taskwarrior
             return $this->tasks[$uuid];
         }
 
-        $tasks = $this->filter($uuid);
+        $tasks = $this->filterAll($uuid);
 
         if (count($tasks) == 0) {
             return null;
@@ -79,7 +79,7 @@ class Taskwarrior
      * @param $filter
      * @return Task[]
      */
-    public function filter($filter = '')
+    public function filterAll($filter = '')
     {
         $result = $this->export($filter);
 
@@ -101,9 +101,9 @@ class Taskwarrior
      * @param string $filter
      * @return Task[]
      */
-    public function filterPending($filter = '')
+    public function filter($filter = '')
     {
-        $tasks = $this->filter($filter . ' status:pending');
+        $tasks = $this->filterAll($filter . ' status:pending');
 
         return $this->sort($tasks);
     }
diff --git a/tests/TaskwarriorTest.php b/tests/TaskwarriorTest.php
index 0128ae2..0fe49a6 100644
--- a/tests/TaskwarriorTest.php
+++ b/tests/TaskwarriorTest.php
@@ -68,7 +68,7 @@ class TaskwarriorTest extends \PHPUnit_Framework_TestCase
 
         $this->taskwarrior->save($task);
 
-        $result = $this->taskwarrior->filter($task->getUuid());
+        $result = $this->taskwarrior->filterAll($task->getUuid());
 
         $this->assertSame($task, $result[0]);
     }
@@ -132,7 +132,7 @@ class TaskwarriorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(Task::STATUS_PENDING, $result->getStatus());
         $this->assertTrue($result->isPending());
 
-        $this->assertCount(1, $this->taskwarrior->filterPending());
+        $this->assertCount(1, $this->taskwarrior->filter());
     }
 
     public function testDelete()
@@ -143,14 +143,14 @@ class TaskwarriorTest extends \PHPUnit_Framework_TestCase
         $this->assertCount(0, $this->taskwarrior->filter());
 
         $this->taskwarrior->save($task1);
+        $this->assertCount(1, $this->taskwarrior->filterAll());
         $this->assertCount(1, $this->taskwarrior->filter());
-        $this->assertCount(1, $this->taskwarrior->filterPending());
         $this->assertFalse($task1->isDeleted());
         $this->assertEquals(Task::STATUS_PENDING, $task1->getStatus());
 
         $this->taskwarrior->delete($task1);
-        $this->assertCount(1, $this->taskwarrior->filter());
-        $this->assertCount(0, $this->taskwarrior->filterPending());
+        $this->assertCount(1, $this->taskwarrior->filterAll());
+        $this->assertCount(0, $this->taskwarrior->filter());
         $this->assertTrue($task1->isDeleted());
         $this->assertEquals(Task::STATUS_DELETED, $task1->getStatus());
     }
@@ -163,14 +163,14 @@ class TaskwarriorTest extends \PHPUnit_Framework_TestCase
         $this->assertCount(0, $this->taskwarrior->filter());
 
         $this->taskwarrior->save($task1);
+        $this->assertCount(1, $this->taskwarrior->filterAll());
         $this->assertCount(1, $this->taskwarrior->filter());
-        $this->assertCount(1, $this->taskwarrior->filterPending());
         $this->assertFalse($task1->isCompleted());
         $this->assertEquals(Task::STATUS_PENDING, $task1->getStatus());
 
         $this->taskwarrior->done($task1);
-        $this->assertCount(1, $this->taskwarrior->filter());
-        $this->assertCount(0, $this->taskwarrior->filterPending());
+        $this->assertCount(1, $this->taskwarrior->filterAll());
+        $this->assertCount(0, $this->taskwarrior->filter());
         $this->assertTrue($task1->isCompleted());
         $this->assertEquals(Task::STATUS_COMPLETED, $task1->getStatus());
     }
@@ -264,7 +264,7 @@ class TaskwarriorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(12, $task2->getUrgency());
         $this->assertEquals(0, $task3->getUrgency());
 
-        $tasks = $this->taskwarrior->filterPending();
+        $tasks = $this->taskwarrior->filter();
 
         $this->assertEquals(array($task2, $task1, $task3), $tasks);
     }