Aerex
/
Taskwarrior
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add path util

This commit is contained in:
DavidBadura 2015-07-02 08:17:56 +00:00
parent 7019d21a71
commit 6b4d1ae4e8
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -19,7 +19,8 @@
"jms/serializer": "0.16.*", "jms/serializer": "0.16.*",
"symfony/filesystem": "~2.3", "symfony/filesystem": "~2.3",
"nesbot/carbon": "~1.14", "nesbot/carbon": "~1.14",
"doctrine/collections": "~1.3" "doctrine/collections": "~1.3",
"webmozart/path-util": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",

7
src/Taskwarrior.php
View File

@ -7,6 +7,7 @@ use DavidBadura\Taskwarrior\Exception\CommandException;
use DavidBadura\Taskwarrior\Exception\TaskwarriorException; use DavidBadura\Taskwarrior\Exception\TaskwarriorException;
use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
use Webmozart\PathUtil\Path;
/** /**
* @author David Badura <d.a.badura@gmail.com> * @author David Badura <d.a.badura@gmail.com>
@ -42,11 +43,11 @@ class Taskwarrior
*/ */
public function __construct($taskrc = '~/.taskrc', $taskData = '~/.task', $rcOptions = [], $bin = 'task') public function __construct($taskrc = '~/.taskrc', $taskData = '~/.task', $rcOptions = [], $bin = 'task')
{ {
$this->bin = $bin; $this->bin = Path::canonicalize($bin);
$this->rcOptions = array_merge( $this->rcOptions = array_merge(
array( array(
'rc:' . $taskrc, 'rc:' . Path::canonicalize($taskrc),
'rc.data.location=' . $taskData, 'rc.data.location=' . Path::canonicalize($taskData),
'rc.json.array=true', 'rc.json.array=true',
'rc.confirmation=no', 'rc.confirmation=no',
), ),