[Pkg-owncloud-commits] [php-sabredav] 20/220: Coding standards
David Prévot
taffit at moszumanska.debian.org
Thu May 12 01:21:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit bd2f60f73cff572632d111a4430536b85f5b4714
Author: Evert Pot <me at evertpot.com>
Date: Sun Oct 18 18:24:26 2015 -0400
Coding standards
---
bin/migrateto31.php | 22 +-
lib/CalDAV/Backend/PDO.php | 4 +-
lib/CalDAV/Backend/SimplePDO.php | 2 -
lib/DAV/CorePlugin.php | 2 +-
tests/Sabre/CalDAV/Backend/AbstractPDOTest.php | 510 ++++++++++++-------------
tests/Sabre/CalDAV/ICSExportPluginTest.php | 316 +++++++--------
6 files changed, 427 insertions(+), 429 deletions(-)
diff --git a/bin/migrateto31.php b/bin/migrateto31.php
index 0052c6d..dde95f5 100755
--- a/bin/migrateto31.php
+++ b/bin/migrateto31.php
@@ -3,7 +3,7 @@
echo "SabreDAV migrate script for version 3.1\n";
-if ($argc<2) {
+if ($argc < 2) {
echo <<<HELLO
@@ -47,7 +47,7 @@ $paths = [
__DIR__ . '/../../../autoload.php',
];
-foreach($paths as $path) {
+foreach ($paths as $path) {
if (file_exists($path)) {
include $path;
break;
@@ -55,8 +55,8 @@ foreach($paths as $path) {
}
$dsn = $argv[1];
-$user = isset($argv[2])?$argv[2]:null;
-$pass = isset($argv[3])?$argv[3]:null;
+$user = isset($argv[2]) ? $argv[2] : null;
+$pass = isset($argv[3]) ? $argv[3] : null;
$backupPostfix = time();
@@ -68,7 +68,7 @@ $pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
$driver = $pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
-switch($driver) {
+switch ($driver) {
case 'mysql' :
echo "Detected MySQL.\n";
@@ -90,7 +90,7 @@ try {
} catch (Exception $e) {
echo "calendar_instances does not yet exist. Creating table and migrating data.\n";
- switch($driver) {
+ switch ($driver) {
case 'mysql' :
$pdo->exec(<<<SQL
CREATE TABLE calendar_instances (
@@ -133,7 +133,7 @@ SELECT
calendarcolor,
transparent
FROM calendars
-");
+");
break;
case 'sqlite' :
$pdo->exec(<<<SQL
@@ -176,7 +176,7 @@ SELECT
calendarcolor,
transparent
FROM calendars
-");
+");
break;
}
@@ -188,7 +188,7 @@ try {
if (!$row) {
echo "Source table is empty.\n";
$migrateCalendars = true;
- }
+ }
$columnCount = count($row);
if ($columnCount === 3) {
@@ -209,7 +209,7 @@ if ($migrateCalendars) {
$calendarBackup = 'calendars_3_0_' . $backupPostfix;
echo "Backing up 'calendars' to '", $calendarBackup, "'\n";
- switch($driver) {
+ switch ($driver) {
case 'mysql' :
$pdo->exec('RENAME TABLE calendars TO ' . $calendarBackup);
break;
@@ -220,7 +220,7 @@ if ($migrateCalendars) {
}
echo "Creating new calendars table.\n";
- switch($driver) {
+ switch ($driver) {
case 'mysql' :
$pdo->exec(<<<SQL
CREATE TABLE calendars (
diff --git a/lib/CalDAV/Backend/PDO.php b/lib/CalDAV/Backend/PDO.php
index 65ff7ac..3a2741a 100644
--- a/lib/CalDAV/Backend/PDO.php
+++ b/lib/CalDAV/Backend/PDO.php
@@ -199,7 +199,7 @@ SQL
$stmt2->execute([$row['id']]);
$calendar['owner_principal'] = $stmt2->fetchColumn();
- $calendar['read-only'] = $row['access']===3;
+ $calendar['read-only'] = $row['access'] === 3;
}
foreach ($this->propertyMap as $xmlName => $dbName) {
@@ -356,7 +356,7 @@ SQL
/**
* If the user is the owner of the calendar, we delete all data and all
* instances.
- **/
+ **/
$stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ?');
$stmt->execute([$calendarId]);
diff --git a/lib/CalDAV/Backend/SimplePDO.php b/lib/CalDAV/Backend/SimplePDO.php
index fc009ec..d34d082 100644
--- a/lib/CalDAV/Backend/SimplePDO.php
+++ b/lib/CalDAV/Backend/SimplePDO.php
@@ -2,10 +2,8 @@
namespace Sabre\CalDAV\Backend;
-use Sabre\VObject;
use Sabre\CalDAV;
use Sabre\DAV;
-use Sabre\DAV\Exception\Forbidden;
/**
* Simple PDO CalDAV backend.
diff --git a/lib/DAV/CorePlugin.php b/lib/DAV/CorePlugin.php
index 6d2039c..973c13f 100644
--- a/lib/DAV/CorePlugin.php
+++ b/lib/DAV/CorePlugin.php
@@ -846,7 +846,7 @@ class CorePlugin extends ServerPlugin {
if ($node instanceof IProperties && $propertyNames = $propFind->get404Properties()) {
$nodeProperties = $node->getProperties($propertyNames);
- foreach ($nodeProperties as $propertyName=>$propertyValue) {
+ foreach ($nodeProperties as $propertyName => $propertyValue) {
$propFind->set($propertyName, $propertyValue, 200);
}
diff --git a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
index ef094d1..5c127f8 100644
--- a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+++ b/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
@@ -24,7 +24,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend = new PDO($this->pdo);
$calendars = $backend->getCalendarsForUser('principals/user2');
- $this->assertEquals(array(),$calendars);
+ $this->assertEquals([], $calendars);
}
@@ -34,27 +34,27 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarAndFetch() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array(
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(array('VEVENT')),
- '{DAV:}displayname' => 'Hello!',
- '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
- ));
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', [
+ '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VEVENT']),
+ '{DAV:}displayname' => 'Hello!',
+ '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
+ ]);
$calendars = $backend->getCalendarsForUser('principals/user2');
- $elementCheck = array(
- 'uri' => 'somerandomid',
- '{DAV:}displayname' => 'Hello!',
- '{urn:ietf:params:xml:ns:caldav}calendar-description' => '',
+ $elementCheck = [
+ 'uri' => 'somerandomid',
+ '{DAV:}displayname' => 'Hello!',
+ '{urn:ietf:params:xml:ns:caldav}calendar-description' => '',
'{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
- );
+ ];
- $this->assertInternalType('array',$calendars);
- $this->assertEquals(1,count($calendars));
+ $this->assertInternalType('array', $calendars);
+ $this->assertEquals(1, count($calendars));
- foreach($elementCheck as $name=>$value) {
+ foreach ($elementCheck as $name => $value) {
$this->assertArrayHasKey($name, $calendars[0]);
- $this->assertEquals($value,$calendars[0][$name]);
+ $this->assertEquals($value, $calendars[0][$name]);
}
@@ -68,10 +68,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend = new PDO($this->pdo);
//Creating a new calendar
- $newId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$propPatch = new PropPatch([
- '{DAV:}displayname' => 'myCalendar',
+ '{DAV:}displayname' => 'myCalendar',
'{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
]);
@@ -86,23 +86,23 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$calendars = $backend->getCalendarsForUser('principals/user2');
// Checking if all the information is still correct
- $elementCheck = array(
- 'id' => $newId,
- 'uri' => 'somerandomid',
- '{DAV:}displayname' => 'myCalendar',
- '{urn:ietf:params:xml:ns:caldav}calendar-description' => '',
- '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => '',
- '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/2',
+ $elementCheck = [
+ 'id' => $newId,
+ 'uri' => 'somerandomid',
+ '{DAV:}displayname' => 'myCalendar',
+ '{urn:ietf:params:xml:ns:caldav}calendar-description' => '',
+ '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => '',
+ '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/2',
'{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
- );
+ ];
- $this->assertInternalType('array',$calendars);
- $this->assertEquals(1,count($calendars));
+ $this->assertInternalType('array', $calendars);
+ $this->assertEquals(1, count($calendars));
- foreach($elementCheck as $name=>$value) {
+ foreach ($elementCheck as $name => $value) {
$this->assertArrayHasKey($name, $calendars[0]);
- $this->assertEquals($value,$calendars[0][$name]);
+ $this->assertEquals($value, $calendars[0][$name]);
}
@@ -116,7 +116,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend = new PDO($this->pdo);
//Creating a new calendar
- $newId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$propPatch = new PropPatch([
'{DAV:}displayname' => 'myCalendar',
@@ -129,7 +129,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
// Verifying the result of the update
$this->assertEquals([
- '{DAV:}yourmom' => 403,
+ '{DAV:}yourmom' => 403,
'{DAV:}displayname' => 424,
], $propPatch->getResult());
@@ -141,15 +141,15 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testDeleteCalendar() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array(
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(array('VEVENT')),
- '{DAV:}displayname' => 'Hello!',
- ));
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', [
+ '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VEVENT']),
+ '{DAV:}displayname' => 'Hello!',
+ ]);
$backend->deleteCalendar($returnedId);
$calendars = $backend->getCalendarsForUser('principals/user2');
- $this->assertEquals(array(),$calendars);
+ $this->assertEquals([], $calendars);
}
@@ -162,36 +162,36 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend = new PDO($this->pdo);
//Creating a new calendar
- $newId = $backend->createCalendar('principals/user2','somerandomid',array(
+ $newId = $backend->createCalendar('principals/user2', 'somerandomid', [
'{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => 'blabla',
- ));
+ ]);
}
function testCreateCalendarObject() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => strtotime('20120101'),
- 'lastoccurence' => strtotime('20120101')+(3600*24),
- 'componenttype' => 'VEVENT',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => strtotime('20120101') + (3600 * 24),
+ 'componenttype' => 'VEVENT',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
function testGetMultipleObjects() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
@@ -200,18 +200,18 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$check = [
[
- 'id' => 1,
- 'etag' => '"' . md5($object) . '"',
- 'uri' => 'id-1',
- 'size' => strlen($object),
+ 'id' => 1,
+ 'etag' => '"' . md5($object) . '"',
+ 'uri' => 'id-1',
+ 'size' => strlen($object),
'calendardata' => $object,
'lastmodified' => null,
],
[
- 'id' => 2,
- 'etag' => '"' . md5($object) . '"',
- 'uri' => 'id-2',
- 'size' => strlen($object),
+ 'id' => 2,
+ 'etag' => '"' . md5($object) . '"',
+ 'uri' => 'id-2',
+ 'size' => strlen($object),
'calendardata' => $object,
'lastmodified' => null,
],
@@ -219,11 +219,11 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$result = $backend->getMultipleCalendarObjects($returnedId, [ 'id-1', 'id-2' ]);
- foreach($check as $index => $props) {
+ foreach ($check as $index => $props) {
- foreach($props as $key=>$value) {
+ foreach ($props as $key => $value) {
- if ($key!=='lastmodified') {
+ if ($key !== 'lastmodified') {
$this->assertEquals($value, $result[$index][$key]);
} else {
$this->assertTrue(isset($result[$index][$key]));
@@ -242,7 +242,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectNoComponent() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nEND:VCALENDAR\r\n";
@@ -256,21 +256,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectDuration() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nDURATION:P2D\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => strtotime('20120101'),
- 'lastoccurence' => strtotime('20120101')+(3600*48),
- 'componenttype' => 'VEVENT',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => strtotime('20120101') + (3600 * 48),
+ 'componenttype' => 'VEVENT',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
@@ -280,21 +280,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectNoDTEND() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE-TIME:20120101T100000Z\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => strtotime('2012-01-01 10:00:00'),
- 'lastoccurence' => strtotime('2012-01-01 10:00:00'),
- 'componenttype' => 'VEVENT',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => strtotime('2012-01-01 10:00:00'),
+ 'componenttype' => 'VEVENT',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
@@ -304,21 +304,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectWithDTEND() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE-TIME:20120101T100000Z\r\nDTEND:20120101T110000Z\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => strtotime('2012-01-01 10:00:00'),
- 'lastoccurence' => strtotime('2012-01-01 11:00:00'),
- 'componenttype' => 'VEVENT',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => strtotime('2012-01-01 11:00:00'),
+ 'componenttype' => 'VEVENT',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
@@ -328,21 +328,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectInfiniteReccurence() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE-TIME:20120101T100000Z\r\nRRULE:FREQ=DAILY\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => strtotime('2012-01-01 10:00:00'),
- 'lastoccurence' => strtotime(PDO::MAX_DATE),
- 'componenttype' => 'VEVENT',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => strtotime(PDO::MAX_DATE),
+ 'componenttype' => 'VEVENT',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
@@ -352,21 +352,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectEndingReccurence() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE-TIME:20120101T100000Z\r\nDTEND;VALUE=DATE-TIME:20120101T110000Z\r\nUID:foo\r\nRRULE:FREQ=DAILY;COUNT=1000\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => strtotime('2012-01-01 10:00:00'),
- 'lastoccurence' => strtotime('2012-01-01 11:00:00') + (3600 * 24 * 999),
- 'componenttype' => 'VEVENT',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => strtotime('2012-01-01 11:00:00') + (3600 * 24 * 999),
+ 'componenttype' => 'VEVENT',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
@@ -376,21 +376,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCreateCalendarObjectTask() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nDUE;VALUE=DATE-TIME:20120101T100000Z\r\nEND:VTODO\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
- $this->assertEquals(array(
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
+ $this->assertEquals([
+ 'etag' => md5($object),
+ 'size' => strlen($object),
+ 'calendardata' => $object,
'firstoccurence' => null,
- 'lastoccurence' => null,
- 'componenttype' => 'VTODO',
- ), $result->fetch(\PDO::FETCH_ASSOC));
+ 'lastoccurence' => null,
+ 'componenttype' => 'VTODO',
+ ], $result->fetch(\PDO::FETCH_ASSOC));
}
@@ -400,18 +400,18 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testGetCalendarObjects() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
- $data = $backend->getCalendarObjects($returnedId,'random-id');
+ $data = $backend->getCalendarObjects($returnedId, 'random-id');
$this->assertEquals(1, count($data));
$data = $data[0];
$this->assertEquals('random-id', $data['uri']);
- $this->assertEquals(strlen($object),$data['size']);
+ $this->assertEquals(strlen($object), $data['size']);
}
@@ -421,7 +421,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testGetCalendarObjectByUID() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',[]);
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
@@ -442,14 +442,14 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testUpdateCalendarObject() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$object2 = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20130101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$backend->updateCalendarObject($returnedId, 'random-id', $object2);
- $data = $backend->getCalendarObject($returnedId,'random-id');
+ $data = $backend->getCalendarObject($returnedId, 'random-id');
$this->assertEquals($object2, $data['calendardata']);
$this->assertEquals('random-id', $data['uri']);
@@ -463,13 +463,13 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testDeleteCalendarObject() {
$backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2','somerandomid',array());
+ $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
$object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
$backend->createCalendarObject($returnedId, 'random-id', $object);
$backend->deleteCalendarObject($returnedId, 'random-id');
- $data = $backend->getCalendarObject($returnedId,'random-id');
+ $data = $backend->getCalendarObject($returnedId, 'random-id');
$this->assertNull($data);
}
@@ -477,104 +477,104 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCalendarQueryNoResult() {
$abstract = new PDO($this->pdo);
- $filters = array(
- 'name' => 'VCALENDAR',
- 'comp-filters' => array(
- array(
- 'name' => 'VJOURNAL',
- 'comp-filters' => array(),
- 'prop-filters' => array(),
+ $filters = [
+ 'name' => 'VCALENDAR',
+ 'comp-filters' => [
+ [
+ 'name' => 'VJOURNAL',
+ 'comp-filters' => [],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- ),
- ),
- 'prop-filters' => array(),
+ 'time-range' => null,
+ ],
+ ],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- );
+ 'time-range' => null,
+ ];
- $this->assertEquals(array(
- ), $abstract->calendarQuery([1,1], $filters));
+ $this->assertEquals([
+ ], $abstract->calendarQuery([1, 1], $filters));
}
function testCalendarQueryTodo() {
$backend = new PDO($this->pdo);
- $backend->createCalendarObject([1,1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $filters = array(
- 'name' => 'VCALENDAR',
- 'comp-filters' => array(
- array(
- 'name' => 'VTODO',
- 'comp-filters' => array(),
- 'prop-filters' => array(),
+ $filters = [
+ 'name' => 'VCALENDAR',
+ 'comp-filters' => [
+ [
+ 'name' => 'VTODO',
+ 'comp-filters' => [],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- ),
- ),
- 'prop-filters' => array(),
+ 'time-range' => null,
+ ],
+ ],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- );
+ 'time-range' => null,
+ ];
- $this->assertEquals(array(
+ $this->assertEquals([
"todo",
- ), $backend->calendarQuery([1,1], $filters));
+ ], $backend->calendarQuery([1, 1], $filters));
}
function testCalendarQueryTodoNotMatch() {
$backend = new PDO($this->pdo);
- $backend->createCalendarObject([1,1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $filters = array(
- 'name' => 'VCALENDAR',
- 'comp-filters' => array(
- array(
- 'name' => 'VTODO',
- 'comp-filters' => array(),
- 'prop-filters' => array(
- array(
- 'name' => 'summary',
- 'text-match' => null,
- 'time-range' => null,
- 'param-filters' => array(),
+ $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+
+ $filters = [
+ 'name' => 'VCALENDAR',
+ 'comp-filters' => [
+ [
+ 'name' => 'VTODO',
+ 'comp-filters' => [],
+ 'prop-filters' => [
+ [
+ 'name' => 'summary',
+ 'text-match' => null,
+ 'time-range' => null,
+ 'param-filters' => [],
'is-not-defined' => false,
- ),
- ),
+ ],
+ ],
'is-not-defined' => false,
- 'time-range' => null,
- ),
- ),
- 'prop-filters' => array(),
+ 'time-range' => null,
+ ],
+ ],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- );
+ 'time-range' => null,
+ ];
- $this->assertEquals(array(
- ), $backend->calendarQuery([1,1], $filters));
+ $this->assertEquals([
+ ], $backend->calendarQuery([1, 1], $filters));
}
function testCalendarQueryNoFilter() {
$backend = new PDO($this->pdo);
- $backend->createCalendarObject([1,1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $filters = array(
- 'name' => 'VCALENDAR',
- 'comp-filters' => array(),
- 'prop-filters' => array(),
+ $filters = [
+ 'name' => 'VCALENDAR',
+ 'comp-filters' => [],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- );
+ 'time-range' => null,
+ ];
- $result = $backend->calendarQuery([1,1], $filters);
+ $result = $backend->calendarQuery([1, 1], $filters);
$this->assertTrue(in_array('todo', $result));
$this->assertTrue(in_array('event', $result));
@@ -583,63 +583,63 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testCalendarQueryTimeRange() {
$backend = new PDO($this->pdo);
- $backend->createCalendarObject([1,1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $filters = array(
- 'name' => 'VCALENDAR',
- 'comp-filters' => array(
- array(
- 'name' => 'VEVENT',
- 'comp-filters' => array(),
- 'prop-filters' => array(),
+ $filters = [
+ 'name' => 'VCALENDAR',
+ 'comp-filters' => [
+ [
+ 'name' => 'VEVENT',
+ 'comp-filters' => [],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => array(
+ 'time-range' => [
'start' => new \DateTime('20120103'),
'end' => new \DateTime('20120104'),
- ),
- ),
- ),
- 'prop-filters' => array(),
+ ],
+ ],
+ ],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- );
+ 'time-range' => null,
+ ];
- $this->assertEquals(array(
+ $this->assertEquals([
"event2",
- ), $backend->calendarQuery([1,1], $filters));
+ ], $backend->calendarQuery([1, 1], $filters));
}
function testCalendarQueryTimeRangeNoEnd() {
$backend = new PDO($this->pdo);
- $backend->createCalendarObject([1,1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject([1,1], "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+ $backend->createCalendarObject([1, 1], "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $filters = array(
- 'name' => 'VCALENDAR',
- 'comp-filters' => array(
- array(
- 'name' => 'VEVENT',
- 'comp-filters' => array(),
- 'prop-filters' => array(),
+ $filters = [
+ 'name' => 'VCALENDAR',
+ 'comp-filters' => [
+ [
+ 'name' => 'VEVENT',
+ 'comp-filters' => [],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => array(
+ 'time-range' => [
'start' => new \DateTime('20120102'),
- 'end' => null,
- ),
- ),
- ),
- 'prop-filters' => array(),
+ 'end' => null,
+ ],
+ ],
+ ],
+ 'prop-filters' => [],
'is-not-defined' => false,
- 'time-range' => null,
- );
+ 'time-range' => null,
+ ];
- $this->assertEquals(array(
+ $this->assertEquals([
"event2",
- ), $backend->calendarQuery([1,1], $filters));
+ ], $backend->calendarQuery([1, 1], $filters));
}
@@ -655,9 +655,9 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals([
'syncToken' => 1,
- 'modified' => [],
- 'deleted' => [],
- 'added' => [],
+ 'modified' => [],
+ 'deleted' => [],
+ 'added' => [],
], $result);
$currentToken = $result['syncToken'];
@@ -683,19 +683,19 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals([
'syncToken' => 6,
- 'modified' => [],
- 'deleted' => [],
- 'added' => ["todo1.ics", "todo3.ics"],
+ 'modified' => [],
+ 'deleted' => [],
+ 'added' => ["todo1.ics", "todo3.ics"],
], $result);
}
function testCreateSubscriptions() {
$props = [
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
- '{DAV:}displayname' => 'cal',
- '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
+ '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+ '{DAV:}displayname' => 'cal',
+ '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
+ '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => true,
//'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
@@ -715,7 +715,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$expected['source'] = 'http://example.org/cal.ics';
$this->assertEquals(1, count($subs));
- foreach($expected as $k=>$v) {
+ foreach ($expected as $k => $v) {
$this->assertEquals($subs[0][$k], $expected[$k]);
}
@@ -737,10 +737,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testUpdateSubscriptions() {
$props = [
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
- '{DAV:}displayname' => 'cal',
- '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
+ '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+ '{DAV:}displayname' => 'cal',
+ '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
+ '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => true,
//'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
@@ -750,7 +750,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend->createSubscription('principals/user1', 'sub1', $props);
$newProps = [
- '{DAV:}displayname' => 'new displayname',
+ '{DAV:}displayname' => 'new displayname',
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
];
@@ -771,7 +771,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$expected['source'] = 'http://example.org/cal2.ics';
$this->assertEquals(1, count($subs));
- foreach($expected as $k=>$v) {
+ foreach ($expected as $k => $v) {
$this->assertEquals($subs[0][$k], $expected[$k]);
}
@@ -780,10 +780,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testUpdateSubscriptionsFail() {
$props = [
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
- '{DAV:}displayname' => 'cal',
- '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
+ '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+ '{DAV:}displayname' => 'cal',
+ '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
+ '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => true,
//'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
@@ -793,17 +793,17 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend->createSubscription('principals/user1', 'sub1', $props);
$propPatch = new DAV\PropPatch([
- '{DAV:}displayname' => 'new displayname',
+ '{DAV:}displayname' => 'new displayname',
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
- '{DAV:}unknown' => 'foo',
+ '{DAV:}unknown' => 'foo',
]);
$backend->updateSubscription(1, $propPatch);
$propPatch->commit();
$this->assertEquals([
- '{DAV:}unknown' => 403,
- '{DAV:}displayname' => 424,
+ '{DAV:}unknown' => 403,
+ '{DAV:}displayname' => 424,
'{http://calendarserver.org/ns/}source' => 424,
], $propPatch->getResult());
@@ -812,10 +812,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
function testDeleteSubscriptions() {
$props = [
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
- '{DAV:}displayname' => 'cal',
- '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
+ '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics', false),
+ '{DAV:}displayname' => 'cal',
+ '{http://apple.com/ns/ical/}refreshrate' => 'P1W',
+ '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => true,
//'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
@@ -825,7 +825,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$backend->createSubscription('principals/user1', 'sub1', $props);
$newProps = [
- '{DAV:}displayname' => 'new displayname',
+ '{DAV:}displayname' => 'new displayname',
'{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
];
@@ -849,13 +849,13 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$expected = [
'calendardata' => $calData,
- 'uri' => 'schedule1.ics',
- 'etag' => '"' . md5($calData) . '"',
- 'size' => strlen($calData)
+ 'uri' => 'schedule1.ics',
+ 'etag' => '"' . md5($calData) . '"',
+ 'size' => strlen($calData)
];
$result = $backend->getSchedulingObject('principals/user1', 'schedule1.ics');
- foreach($expected as $k=>$v) {
+ foreach ($expected as $k => $v) {
$this->assertArrayHasKey($k, $result);
$this->assertEquals($v, $result[$k]);
}
@@ -864,7 +864,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(1, count($results));
$result = $results[0];
- foreach($expected as $k=>$v) {
+ foreach ($expected as $k => $v) {
$this->assertEquals($v, $result[$k]);
}
diff --git a/tests/Sabre/CalDAV/ICSExportPluginTest.php b/tests/Sabre/CalDAV/ICSExportPluginTest.php
index e1f2903..0788b03 100644
--- a/tests/Sabre/CalDAV/ICSExportPluginTest.php
+++ b/tests/Sabre/CalDAV/ICSExportPluginTest.php
@@ -32,14 +32,14 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$props = [
- 'uri'=>'UUID-123467',
- 'principaluri' => 'admin',
- 'id' => [1,1],
- '{DAV:}displayname' => 'Hello!',
+ 'uri' => 'UUID-123467',
+ 'principaluri' => 'admin',
+ 'id' => [1,1],
+ '{DAV:}displayname' => 'Hello!',
'{http://apple.com/ns/ical/}calendar-color' => '#AA0000FF',
];
$tree = [
- new Calendar($cbackend,$props),
+ new Calendar($cbackend, $props),
];
$p = new ICSExportPlugin();
@@ -49,7 +49,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export',
+ 'REQUEST_URI' => '/UUID-123467?export',
'REQUEST_METHOD' => 'GET',
]);
@@ -65,13 +65,13 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(7,count($obj->children()));
- $this->assertEquals(1,count($obj->VERSION));
- $this->assertEquals(1,count($obj->CALSCALE));
- $this->assertEquals(1,count($obj->PRODID));
- $this->assertTrue(strpos((string)$obj->PRODID, DAV\Version::VERSION)!==false);
- $this->assertEquals(1,count($obj->VTIMEZONE));
- $this->assertEquals(1,count($obj->VEVENT));
+ $this->assertEquals(7, count($obj->children()));
+ $this->assertEquals(1, count($obj->VERSION));
+ $this->assertEquals(1, count($obj->CALSCALE));
+ $this->assertEquals(1, count($obj->PRODID));
+ $this->assertTrue(strpos((string)$obj->PRODID, DAV\Version::VERSION) !== false);
+ $this->assertEquals(1, count($obj->VTIMEZONE));
+ $this->assertEquals(1, count($obj->VEVENT));
$this->assertEquals("Hello!", $obj->{"X-WR-CALNAME"});
$this->assertEquals("#AA0000FF", $obj->{"X-APPLE-CALENDAR-COLOR"});
@@ -82,12 +82,12 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$props = [
- 'uri'=>'UUID-123467',
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
+ 'id' => [1,1],
];
$tree = [
- new Calendar($cbackend,$props),
+ new Calendar($cbackend, $props),
];
$p = new ICSExportPlugin();
@@ -98,7 +98,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export',
+ 'REQUEST_URI' => '/UUID-123467?export',
'REQUEST_METHOD' => 'GET',
]);
@@ -116,13 +116,13 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(5,count($obj->children()));
- $this->assertEquals(1,count($obj->VERSION));
- $this->assertEquals(1,count($obj->CALSCALE));
- $this->assertEquals(1,count($obj->PRODID));
- $this->assertFalse(strpos((string)$obj->PRODID, DAV\Version::VERSION)!==false);
- $this->assertEquals(1,count($obj->VTIMEZONE));
- $this->assertEquals(1,count($obj->VEVENT));
+ $this->assertEquals(5, count($obj->children()));
+ $this->assertEquals(1, count($obj->VERSION));
+ $this->assertEquals(1, count($obj->CALSCALE));
+ $this->assertEquals(1, count($obj->PRODID));
+ $this->assertFalse(strpos((string)$obj->PRODID, DAV\Version::VERSION) !== false);
+ $this->assertEquals(1, count($obj->VTIMEZONE));
+ $this->assertEquals(1, count($obj->VEVENT));
}
@@ -134,7 +134,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin($p);
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467',
+ 'REQUEST_URI' => '/UUID-123467',
'REQUEST_METHOD' => 'GET',
]);
$this->assertNull($p->httpGet($h, $s->httpResponse));
@@ -145,14 +145,14 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
- );
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
+ ];
$p = new ICSExportPlugin();
@@ -182,15 +182,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -199,14 +199,14 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin($p);
$s->addPlugin(new Plugin());
$s->addPlugin(new DAVACL\Plugin());
- $s->addPlugin(new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock(),'SabreDAV'));
+ $s->addPlugin(new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock(), 'SabreDAV'));
// Forcing login
- $s->getPlugin('acl')->adminPrincipals = array('principals/admin');
+ $s->getPlugin('acl')->adminPrincipals = ['principals/admin'];
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export',
+ 'REQUEST_URI' => '/UUID-123467?export',
'REQUEST_METHOD' => 'GET',
]);
@@ -215,20 +215,20 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
- $this->assertEquals(array(
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
+ $this->assertEquals([
'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['text/calendar'],
- ), $s->httpResponse->getHeaders());
+ 'Content-Type' => ['text/calendar'],
+ ], $s->httpResponse->getHeaders());
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(5,count($obj->children()));
- $this->assertEquals(1,count($obj->VERSION));
- $this->assertEquals(1,count($obj->CALSCALE));
- $this->assertEquals(1,count($obj->PRODID));
- $this->assertEquals(1,count($obj->VTIMEZONE));
- $this->assertEquals(1,count($obj->VEVENT));
+ $this->assertEquals(5, count($obj->children()));
+ $this->assertEquals(1, count($obj->VERSION));
+ $this->assertEquals(1, count($obj->CALSCALE));
+ $this->assertEquals(1, count($obj->PRODID));
+ $this->assertEquals(1, count($obj->VTIMEZONE));
+ $this->assertEquals(1, count($obj->VEVENT));
}
@@ -237,15 +237,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => 1,
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => 1,
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -255,7 +255,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&start=foo',
+ 'REQUEST_URI' => '/UUID-123467?export&start=foo',
'REQUEST_METHOD' => 'GET',
]);
@@ -264,7 +264,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(400, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
}
@@ -273,15 +273,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -291,7 +291,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&end=foo',
+ 'REQUEST_URI' => '/UUID-123467?export&end=foo',
'REQUEST_METHOD' => 'GET',
]);
@@ -300,7 +300,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(400, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
}
@@ -309,15 +309,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -327,7 +327,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&start=1&end=2',
+ 'REQUEST_URI' => '/UUID-123467?export&start=1&end=2',
'REQUEST_METHOD' => 'GET',
]);
@@ -336,11 +336,11 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(0,count($obj->VTIMEZONE));
- $this->assertEquals(0,count($obj->VEVENT));
+ $this->assertEquals(0, count($obj->VTIMEZONE));
+ $this->assertEquals(0, count($obj->VEVENT));
}
@@ -349,15 +349,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -367,7 +367,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&expand=1&end=1',
+ 'REQUEST_URI' => '/UUID-123467?export&expand=1&end=1',
'REQUEST_METHOD' => 'GET',
]);
@@ -376,7 +376,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(400, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
}
@@ -385,15 +385,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -403,7 +403,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&start=1&end=2000000000&expand=1',
+ 'REQUEST_URI' => '/UUID-123467?export&start=1&end=2000000000&expand=1',
'REQUEST_METHOD' => 'GET',
]);
@@ -412,11 +412,11 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(0,count($obj->VTIMEZONE));
- $this->assertEquals(1,count($obj->VEVENT));
+ $this->assertEquals(0, count($obj->VTIMEZONE));
+ $this->assertEquals(1, count($obj->VEVENT));
}
@@ -425,15 +425,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -443,9 +443,9 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export',
+ 'REQUEST_URI' => '/UUID-123467?export',
'REQUEST_METHOD' => 'GET',
- 'HTTP_ACCEPT' => 'application/calendar+json',
+ 'HTTP_ACCEPT' => 'application/calendar+json',
]);
$s->httpRequest = $h;
@@ -453,7 +453,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$this->assertEquals('application/calendar+json', $s->httpResponse->getHeader('Content-Type'));
}
@@ -463,15 +463,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -481,7 +481,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&accept=jcal',
+ 'REQUEST_URI' => '/UUID-123467?export&accept=jcal',
'REQUEST_METHOD' => 'GET',
]);
@@ -490,7 +490,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$this->assertEquals('application/calendar+json', $s->httpResponse->getHeader('Content-Type'));
}
@@ -500,15 +500,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
- $tree = array(
- new Calendar($cbackend,$props),
+ 'id' => [1,1],
+ ];
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -518,9 +518,9 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export',
+ 'REQUEST_URI' => '/UUID-123467?export',
'REQUEST_METHOD' => 'GET',
- 'HTTP_ACCEPT' => 'text/plain',
+ 'HTTP_ACCEPT' => 'text/plain',
]);
$s->httpRequest = $h;
@@ -528,7 +528,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$this->assertEquals('text/calendar', $s->httpResponse->getHeader('Content-Type'));
}
@@ -538,18 +538,18 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$cbackend = TestUtil::getBackend();
$pbackend = new DAVACL\PrincipalBackend\Mock();
- $props = array(
- 'uri'=>'UUID-123467',
+ $props = [
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
- );
+ 'id' => [1,1],
+ ];
// add a todo to the calendar (see /tests/Sabre/TestUtil)
- $cbackend->createCalendarObject([1,1], 'UUID-3456', TestUtil::getTestTODO());
+ $cbackend->createCalendarObject([1, 1], 'UUID-3456', TestUtil::getTestTODO());
- $tree = array(
- new Calendar($cbackend,$props),
+ $tree = [
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
- );
+ ];
$p = new ICSExportPlugin();
@@ -559,7 +559,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&componentType=VEVENT',
+ 'REQUEST_URI' => '/UUID-123467?export&componentType=VEVENT',
'REQUEST_METHOD' => 'GET',
]);
@@ -568,12 +568,12 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(1,count($obj->VTIMEZONE));
- $this->assertEquals(1,count($obj->VEVENT));
- $this->assertEquals(0,count($obj->VTODO));
+ $this->assertEquals(1, count($obj->VTIMEZONE));
+ $this->assertEquals(1, count($obj->VEVENT));
+ $this->assertEquals(0, count($obj->VTODO));
}
@@ -583,15 +583,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$pbackend = new DAVACL\PrincipalBackend\Mock();
$props = [
- 'uri'=>'UUID-123467',
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
+ 'id' => [1,1],
];
// add a todo to the calendar (see /tests/Sabre/TestUtil)
- $cbackend->createCalendarObject([1,1], 'UUID-3456', TestUtil::getTestTODO());
+ $cbackend->createCalendarObject([1, 1], 'UUID-3456', TestUtil::getTestTODO());
$tree = [
- new Calendar($cbackend,$props),
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
];
@@ -603,7 +603,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&componentType=VTODO',
+ 'REQUEST_URI' => '/UUID-123467?export&componentType=VTODO',
'REQUEST_METHOD' => 'GET',
]);
@@ -612,12 +612,12 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(200, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
$obj = VObject\Reader::read($s->httpResponse->body);
- $this->assertEquals(0,count($obj->VTIMEZONE));
- $this->assertEquals(0,count($obj->VEVENT));
- $this->assertEquals(1,count($obj->VTODO));
+ $this->assertEquals(0, count($obj->VTIMEZONE));
+ $this->assertEquals(0, count($obj->VEVENT));
+ $this->assertEquals(1, count($obj->VTODO));
}
@@ -627,15 +627,15 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$pbackend = new DAVACL\PrincipalBackend\Mock();
$props = [
- 'uri'=>'UUID-123467',
+ 'uri' => 'UUID-123467',
'principaluri' => 'admin',
- 'id' => [1,1],
+ 'id' => [1,1],
];
// add a todo to the calendar (see /tests/Sabre/TestUtil)
- $cbackend->createCalendarObject([1,1], 'UUID-3456', TestUtil::getTestTODO());
+ $cbackend->createCalendarObject([1, 1], 'UUID-3456', TestUtil::getTestTODO());
$tree = [
- new Calendar($cbackend,$props),
+ new Calendar($cbackend, $props),
new DAVACL\PrincipalCollection($pbackend),
];
@@ -647,7 +647,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->addPlugin(new Plugin());
$h = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/UUID-123467?export&componentType=VVOODOO',
+ 'REQUEST_URI' => '/UUID-123467?export&componentType=VVOODOO',
'REQUEST_METHOD' => 'GET',
]);
@@ -656,7 +656,7 @@ class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
$s->exec();
- $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+ $this->assertEquals(400, $s->httpResponse->status, 'Invalid status received. Response body: ' . $s->httpResponse->body);
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-php/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list