Compare commits

..

2 Commits

Author SHA1 Message Date
84e96940ed fix: use 2.0.0 jms serializer 2018-10-28 12:55:35 -05:00
d465f4481e fix: removed parseiCalDateTime
fix: remove jms/serializer from dep
2018-10-28 12:23:27 -05:00
4 changed files with 869 additions and 159 deletions

View File

@ -1,7 +1,6 @@
{ {
"name": "aerex/taskwarrior", "name": "aerex/taskwarrior-baikal-plugin",
"description": "A Baikal plugin for taskwarrior", "description": "A Baikal plugin for taskwarrior",
"version": "1.0.0",
"type": "library", "type": "library",
"keywords": [ "keywords": [
"task", "task",
@ -10,11 +9,15 @@
"Baikal", "Baikal",
"sabre" "sabre"
], ],
"repositories": [{"type": "vcs", "url": "https://aerex.me/git/Aerex/Taskwarrior"}],
"require": { "require": {
"php": ">=5.5",
"sabre/dav": "~3.1.2", "sabre/dav": "~3.1.2",
"davidbadura/taskwarrior": "^3.0", "jms/serializer": "2.0.0-RC1",
"jms/metadata": "^2.0@RC",
"aerex/taskwarrior": "^3.0",
"sabre/vobject": "^4.0", "sabre/vobject": "^4.0",
"jms/serializer": "^1.13",
"easycorp/easy-log-handler": "^1.0" "easycorp/easy-log-handler": "^1.0"
}, },
"require-dev": { "require-dev": {

998
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -76,10 +76,15 @@ class iCalEventProcessor {
// parse iCalendar event times to DateTime objects // parse iCalendar event times to DateTime objects
$entry = $this->taskwarrior->parseiCalDateTime($ToDoComponent->DSTAMP); //$entry = $this->taskwarrior->parseiCalDateTime($ToDoComponent->DSTAMP);
$start = $this->taskwarrior->parseiCalDateTime($ToDoComponent->DSTART); //$start = $this->taskwarrior->parseiCalDateTime($ToDoComponent->DSTART);
$modified = $this->taskwarrior->parseiCalDateTime($ToDoComponent->{'LAST-MODIFIED'}); //$modified = $this->taskwarrior->parseiCalDateTime($ToDoComponent->{'LAST-MODIFIED'});
$end = $this->taskwarrior->parseiCalDateTime($ToDoComponent->DTEND); //$end = $this->taskwarrior->parseiCalDateTime($ToDoComponent->DTEND);
$start = $ToDoComponent->DSTART;
$entry = $ToDoComponent->DSTAMP;
$modified = $ToDoComponent->{'LAST-MODIFIED'};
$end = $ToDoComponent->DTEND;
$task = $this->taskwarrior->createTask($ToDoComponent->UID); $task = $this->taskwarrior->createTask($ToDoComponent->UID);

View File

@ -64,9 +64,9 @@ class iCalEventProcessorTest extends \PHPUnit\Framework\TestCase {
$mockVTodo->add('DESCRIPTION', $description); $mockVTodo->add('DESCRIPTION', $description);
$mockVTodo->add('CATEGORIES', $categories); $mockVTodo->add('CATEGORIES', $categories);
$this->mockTaskwarrior->expects($this->exactly(4)) // $this->mockTaskwarrior->expects($this->exactly(4))
->method('parseiCalDateTime') // ->method('parseiCalDateTime')
->will($this->onConsecutiveCalls($startTime, $startTime, $modifiedTime, $endTime)); // ->will($this->onConsecutiveCalls($startTime, $startTime, $modifiedTime, $endTime));
$this->mockTaskwarrior->expects($this->once())->method('createTask')->with($this->equalTo($uuid)) $this->mockTaskwarrior->expects($this->once())->method('createTask')->with($this->equalTo($uuid))
->willReturn($this->mockTask); ->willReturn($this->mockTask);