diff --git a/.travis.yml b/.travis.yml index 8757e33..4cc4b59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,12 +26,12 @@ matrix: - php: 5.6 env: TASKWARRIOR=2.4.3 - php: 5.6 - env: TASKWARRIOR=2.5.0.beta1 + env: TASKWARRIOR=2.5.0.beta2 allow_failures: - php: 7 - php: hhvm - php: 5.6 - env: TASKWARRIOR=2.5.0.beta1 + env: TASKWARRIOR=2.5.0.beta2 before_install: - composer self-update diff --git a/build/taskwarrior-2.5.0.beta1 b/build/taskwarrior-2.5.0.beta1 deleted file mode 100755 index d849eee..0000000 Binary files a/build/taskwarrior-2.5.0.beta1 and /dev/null differ diff --git a/build/taskwarrior-2.5.0.beta2 b/build/taskwarrior-2.5.0.beta2 new file mode 100755 index 0000000..d0e3213 Binary files /dev/null and b/build/taskwarrior-2.5.0.beta2 differ diff --git a/src/Taskwarrior.php b/src/Taskwarrior.php index d8ae36b..26e1573 100644 --- a/src/Taskwarrior.php +++ b/src/Taskwarrior.php @@ -63,6 +63,7 @@ class Taskwarrior 'rc:' . $this->taskrc, 'rc.data.location=' . $this->taskData, 'rc.json.array=true', + 'rc.json.depends.array=false', 'rc.confirmation=no', ), $rcOptions @@ -152,7 +153,38 @@ class Taskwarrior $tags = $this->parseResult($result); return array_values(array_filter($tags, function ($value) { - return !in_array($value, ['next', 'nocal', 'nocolor', 'nonag']); + return !in_array($value, [ + "ACTIVE", + "ANNOTATED", + "BLOCKED", + "BLOCKING", + "CHILD", + "COMPLETED", + "DELETED", + "DUE", + "DUETODAY", + "MONTH", + "ORPHAN", + "OVERDUE", + "PARENT", + "PENDING", + "READY", + "SCHEDULED", + "TAGGED", + "TODAY", + "TOMORROW", + "UDA", + "UNBLOCKED", + "UNTIL", + "WAITING", + "WEEK", + "YEAR", + "YESTERDAY", + "next", + "nocal", + "nocolor", + "nonag" + ]); })); }