composer.json

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

src/iCalEventProcessor.php

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

tests/iCalEventProcessorTest.php

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