refactoring

This commit is contained in:
DavidBadura
2015-12-26 12:27:32 +00:00
parent 79f779e520
commit 7053cb5740
6 changed files with 70 additions and 38 deletions

View File

@@ -40,7 +40,7 @@ class CarbonHandler implements SubscribingHandlerInterface
public static function getSubscribingMethods()
{
$methods = array();
$types = array('Carbon\Carbon', 'Carbon');
$types = array(Carbon::class, 'Carbon');
foreach ($types as $type) {
$methods[] = array(

View File

@@ -140,11 +140,20 @@ class TaskManager
return new ArrayCollection($result);
}
/**
* @param string|string[] $filter
* @return int
*/
public function count($filter = null)
{
return $this->taskwarrior->count($filter);
}
/**
* @param string|array $filter
* @return Task[]|ArrayCollection
*/
public function filterPending($filter = null)
public function findPending($filter = null)
{
return $this->filter(array_merge((array)$filter, ['status:pending']));
}
@@ -275,7 +284,7 @@ class TaskManager
* @return Task[]|ArrayCollection
* @throws Exception\ConfigException
*/
public function filterByReport($report)
public function findByReport($report)
{
if (!$report instanceof Report) {
$report = $this->taskwarrior->config()->getReport($report);
@@ -292,9 +301,9 @@ class TaskManager
* @return Task[]|ArrayCollection
* @throws Exception\ConfigException
*/
public function filterByContext($context)
public function findByContext($context)
{
if (!$context instanceof Report) {
if (!$context instanceof Context) {
$context = $this->taskwarrior->config()->getContext($context);
}
@@ -330,7 +339,7 @@ class TaskManager
}
};
$task = $factory->createProxy('DavidBadura\Taskwarrior\Task', $initializer);
$task = $factory->createProxy(Task::class, $initializer);
return $this->tasks[$uuid] = $task;
}
@@ -358,7 +367,7 @@ class TaskManager
$json = $this->taskwarrior->export($filter);
/** @var Task[] $tasks */
$tasks = $this->getSerializer()->deserialize($json, 'array<DavidBadura\Taskwarrior\Task>', 'json');
$tasks = $this->getSerializer()->deserialize($json, 'array<' . Task::class . '>', 'json');
foreach ($tasks as $task) {
if (!$task->getDependencies()) {
@@ -426,8 +435,8 @@ class TaskManager
*/
private function setValue(Task $task, $attr, $value)
{
$refClass = new \ReflectionClass('DavidBadura\Taskwarrior\Task');
$refProp = $refClass->getProperty($attr);
$refClass = new \ReflectionClass(Task::class);
$refProp = $refClass->getProperty($attr);
$refProp->setAccessible(true);
$refProp->setValue($task, $value);
}

View File

@@ -212,6 +212,16 @@ class Taskwarrior
return $this->command('export', $filter);
}
/**
* @param string|string[] $filter
* @return int
* @throws CommandException
*/
public function count($filter = null)
{
return (int)$this->command('count', $filter);
}
/**
* @param string $command
* @param string|string[] $filter