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

fix: removed parseiCalDateTime 

fix: remove jms/serializer from dep
This commit is contained in:
Aerex 2018-10-28 11:16:46 -05:00
parent 6f7cc93c3a
commit d465f4481e
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -11,10 +11,10 @@
"sabre" "sabre"
], ],
"require": { "require": {
"php": ">=5.5",
"sabre/dav": "~3.1.2", "sabre/dav": "~3.1.2",
"davidbadura/taskwarrior": "^3.0", "davidbadura/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": {

27
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f1e3c1c3defb5c3015813049f3f3294a", "content-hash": "00583fd916fe2c7d997c69cef27b23e4",
"packages": [ "packages": [
{ {
"name": "davidbadura/taskwarrior", "name": "davidbadura/taskwarrior",
@ -870,16 +870,16 @@
}, },
{ {
"name": "sabre/dav", "name": "sabre/dav",
"version": "3.2.3", "version": "3.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sabre-io/dav.git", "url": "https://github.com/sabre-io/dav.git",
"reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80" "reference": "b5dbb56170fd4f0d8b8b1191f22950f05d306532"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sabre-io/dav/zipball/a9780ce4f35560ecbd0af524ad32d9d2c8954b80", "url": "https://api.github.com/repos/sabre-io/dav/zipball/b5dbb56170fd4f0d8b8b1191f22950f05d306532",
"reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80", "reference": "b5dbb56170fd4f0d8b8b1191f22950f05d306532",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -893,18 +893,15 @@
"ext-spl": "*", "ext-spl": "*",
"lib-libxml": ">=2.7.0", "lib-libxml": ">=2.7.0",
"php": ">=5.5.0", "php": ">=5.5.0",
"psr/log": "^1.0",
"sabre/event": ">=2.0.0, <4.0.0", "sabre/event": ">=2.0.0, <4.0.0",
"sabre/http": "^4.2.1", "sabre/http": "^4.2.1",
"sabre/uri": "^1.0.1", "sabre/uri": "~1.0",
"sabre/vobject": "^4.1.0", "sabre/vobject": "~4.0",
"sabre/xml": "^1.4.0" "sabre/xml": "~1.0"
}, },
"require-dev": { "require-dev": {
"evert/phpdoc-md": "~0.1.0", "evert/phpdoc-md": "~0.1.0",
"monolog/monolog": "^1.18", "phpunit/phpunit": "> 4.8, <6.0.0"
"phpunit/phpunit": "> 4.8, <6.0.0",
"sabre/cs": "^1.0.0"
}, },
"suggest": { "suggest": {
"ext-curl": "*", "ext-curl": "*",
@ -949,7 +946,7 @@
"framework", "framework",
"iCalendar" "iCalendar"
], ],
"time": "2018-10-19T09:58:27+00:00" "time": "2018-10-19T09:57:45+00:00"
}, },
{ {
"name": "sabre/event", "name": "sabre/event",
@ -3036,6 +3033,8 @@
"stability-flags": [], "stability-flags": [],
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": {
"php": ">=5.5"
},
"platform-dev": [] "platform-dev": []
} }

13
src/iCalEventProcessor.php
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);

6
tests/iCalEventProcessorTest.php
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);